June 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3691 - projects/wiki/skins/devmo/css.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-22 05:25:43 -0400 (Fri, 22 Jun 2007) New Revision: 3691 Modified: projects/wiki/skins/devmo/css/wiki.css Log: Overview table width Modified: projects/wiki/skins/devmo/css/wiki.css =================================================================== --- projects/wiki/skins/devmo/css/wiki.css 2007-06-22 09:10:17 UTC (rev 3690) +++ projects/wiki/skins/devmo/css/wiki.css 2007-06-22 09:25:43 UTC (rev 3691) @@ -672,7 +672,7 @@ } .topicpage-table { clear: both; - width: auto; + width: 100%; margin: -30px 0 0 0; }

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3690 - in projects/wiki/skins: devmo/css and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-22 05:10:17 -0400 (Fri, 22 Jun 2007) New Revision: 3690 Modified: projects/wiki/skins/Devmo.php projects/wiki/skins/devmo/css/base.css Log: Logo through css Modified: projects/wiki/skins/Devmo.php =================================================================== --- projects/wiki/skins/Devmo.php 2007-06-22 09:03:07 UTC (rev 3689) +++ projects/wiki/skins/Devmo.php 2007-06-22 09:10:17 UTC (rev 3690) @@ -87,10 +87,7 @@ <div id="header"> <div id="ORGheader"> - <div id="ORGLogo"> - <a href="/mediawiki/" accesskey="1"> - <img src="/css/images/jbossorg_logo.gif" alt="JBoss.org home" width="250" height="65" border="0"/></a> - </div> + <div id="ORGLogo"></div> </div>  Modified: projects/wiki/skins/devmo/css/base.css =================================================================== --- projects/wiki/skins/devmo/css/base.css 2007-06-22 09:03:07 UTC (rev 3689) +++ projects/wiki/skins/devmo/css/base.css 2007-06-22 09:10:17 UTC (rev 3690) @@ -7,17 +7,17 @@ line-height: 140%; background: #fff url("images/body_back.gif") repeat-x; font-size: 0.9em; -}*/ - -/* jboss.org*/ -body { - margin: 0 30px 2em 30px; - padding: 0px; - line-height: 140%; - background-color:#fff; - background-image:url("/css/images/bkgheader_left.gif"); - background-repeat:repeat-x; - font-size: 0.9em; +}*/ + +/* jboss.org*/ +body { + margin: 0 30px 2em 30px; + padding: 0px; + line-height: 140%; + background-color:#fff; + background-image:url("images/bkgheader_left.gif"); + background-repeat:repeat-x; + font-size: 0.9em; } body, td, th, h3, input { /* redundant rules for bad browsers */ @@ -68,20 +68,24 @@ } /* 4) Header ******************************************************************** */ - -#ORGheader { - margin: 0px auto; - width: 974px; - height:65px; - background-image:url(/file-access/default/theme/images/common/bkgheader_noleft.gif); - background-repeat:repeat-x; - background-color:#3b4f66; -} - -#ORGLogo { - float:left; -} +#ORGheader { + margin: 0px auto; + width: 974px; + height:65px; + background-image:url("images/bkgheader_noleft.gif"); + background-repeat:repeat-x; + background-color:#3b4f66; +} + +#ORGLogo { + float:left; + width: 250px; + height:65px; + background-image:url("images/jbossorg_logo.gif"); + background-repeat:repeat-x; +} + #header { clear: both; position: relative; @@ -95,7 +99,7 @@ left: 0; margin: 0; } - + /*#header h1 a,#header h1 a:hover { display: block; width: 294px; height: 46px; @@ -158,64 +162,64 @@ border: none; } - -/* ---------------- Primary Navigation (Tabbed Nav) ---------------------------- */ - -#primarynav { - clear:right; - float:right; - margin-top:14px; -} - -#primarynav ul { - margin: 0px; - padding:0px; -} - -#primarynav ul li { - display: inline; - list-style: none; - text-align:center; - float:left; - background-image: url(/css/images/navtabsbkg_norm.gif); - background-repeat: repeat-x; - background-position: right top; - -} - -#primarynav ul a { - display: inline; - float: left; - text-decoration: none; - font-size:12px; - font-weight:bold; - color: white; - padding: 5px 20px 3px 20px; - background-repeat: no-repeat; - background-position: top left; - border:1px solid #4a5d75; - -} - -#primarynav ul a:hover { - text-decoration: underline; - color: white; - background-image: url(/css/images/navtabsbkg_hover.gif); - background-repeat: repeat-x; - background-position: top left; -} - -#primarynav #current { - font-size: 12px; - font-weight: bold; -} - -#primarynav #current a, #primarynav a:hover { - background-image:none; - background-color: white; - color: #636464; - -} + +/* ---------------- Primary Navigation (Tabbed Nav) ---------------------------- */ + +#primarynav { + clear:right; + float:right; + margin-top:14px; +} + +#primarynav ul { + margin: 0px; + padding:0px; +} + +#primarynav ul li { + display: inline; + list-style: none; + text-align:center; + float:left; + background-image: url(images/navtabsbkg_norm.gif); + background-repeat: repeat-x; + background-position: right top; + +} + +#primarynav ul a { + display: inline; + float: left; + text-decoration: none; + font-size:12px; + font-weight:bold; + color: white; + padding: 5px 20px 3px 20px; + background-repeat: no-repeat; + background-position: top left; + border:1px solid #4a5d75; + +} + +#primarynav ul a:hover { + text-decoration: underline; + color: white; + background-image: url(images/navtabsbkg_hover.gif); + background-repeat: repeat-x; + background-position: top left; +} + +#primarynav #current { + font-size: 12px; + font-weight: bold; +} + +#primarynav #current a, #primarynav a:hover { + background-image:none; + background-color: white; + color: #636464; + +} /* 5) Navigation **************************************************************** */

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3689 - projects/wiki/skins.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-22 05:03:07 -0400 (Fri, 22 Jun 2007) New Revision: 3689 Modified: projects/wiki/skins/Devmo.php Log: Retrieve css from skin directory Modified: projects/wiki/skins/Devmo.php =================================================================== --- projects/wiki/skins/Devmo.php 2007-06-22 08:54:47 UTC (rev 3688) +++ projects/wiki/skins/Devmo.php 2007-06-22 09:03:07 UTC (rev 3689) @@ -58,9 +58,9 @@ <?php $this->html('headlinks') ?> <title><?php $this->text('pagetitle') ?></title> - <link rel="stylesheet" type="text/css" media="all" href="/css/base.css" /> - <link rel="stylesheet" type="text/css" media="all" href="/css/wiki.css" /> - <link rel="stylesheet" type="text/css" media="print" href="/css/wikiprint.css" /> + <link rel="stylesheet" type="text/css" media="all" href="<?php $this->text('stylepath' ) ?>/devmo/css/base.css" /> + <link rel="stylesheet" type="text/css" media="all" href="<?php $this->text('stylepath' ) ?>/devmo/css/wiki.css" /> + <link rel="stylesheet" type="text/css" media="print" href="<?php $this->text('stylepath' ) ?>/devmo/css/wikiprint.css" />   @@ -85,13 +85,15 @@ <p class="skipLink"><a href="#content" accesskey="2">Skip to main content</a></p> <div id="header"> + <div id="ORGheader"> <div id="ORGLogo"> <a href="/mediawiki/" accesskey="1"> <img src="/css/images/jbossorg_logo.gif" alt="JBoss.org home" width="250" height="65" border="0"/></a> </div> </div> -  + +  <form name="searchform" action="<?php $nutchPage =& Title::makeTitle(NS_SPECIAL, 'Nutch'); echo $nutchPage->getLocalURL(); ?>" id="searchform">

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3688 - in projects/wiki/skins/devmo: css and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-22 04:54:47 -0400 (Fri, 22 Jun 2007) New Revision: 3688 Added: projects/wiki/skins/devmo/css/ projects/wiki/skins/devmo/css/base.css projects/wiki/skins/devmo/css/blog.css projects/wiki/skins/devmo/css/blogprint.css projects/wiki/skins/devmo/css/images/ projects/wiki/skins/devmo/css/images/bkg_home_2ndcol.gif projects/wiki/skins/devmo/css/images/bkgblur_bottom.gif projects/wiki/skins/devmo/css/images/bkgblur_right.gif projects/wiki/skins/devmo/css/images/bkgheader_left.gif projects/wiki/skins/devmo/css/images/bkgheader_noleft.gif projects/wiki/skins/devmo/css/images/body_back.gif projects/wiki/skins/devmo/css/images/box-blue-bottom.gif projects/wiki/skins/devmo/css/images/box-blue-top.gif projects/wiki/skins/devmo/css/images/box-gray-bottom.gif projects/wiki/skins/devmo/css/images/box-gray-top.gif projects/wiki/skins/devmo/css/images/box-white-bottom-left.gif projects/wiki/skins/devmo/css/images/box-white-bottom-right.gif projects/wiki/skins/devmo/css/images/box-white-top-left.gif projects/wiki/skins/devmo/css/images/box-white-top-right.gif projects/wiki/skins/devmo/css/images/box-yellow-arrow.gif projects/wiki/skins/devmo/css/images/box-yellow-bottom.gif projects/wiki/skins/devmo/css/images/box-yellow-top.gif projects/wiki/skins/devmo/css/images/breadcrumbs.gif projects/wiki/skins/devmo/css/images/bullet.gif projects/wiki/skins/devmo/css/images/cheat.gif projects/wiki/skins/devmo/css/images/discussionitem_icon.gif projects/wiki/skins/devmo/css/images/err.png projects/wiki/skins/devmo/css/images/external.png projects/wiki/skins/devmo/css/images/file_icon.gif projects/wiki/skins/devmo/css/images/hdr_border_gradient.gif projects/wiki/skins/devmo/css/images/header_bl.png projects/wiki/skins/devmo/css/images/ico_12x_feed.gif projects/wiki/skins/devmo/css/images/ico_linkarrow_blue.gif projects/wiki/skins/devmo/css/images/ico_linkarrow_blue.gif.1 projects/wiki/skins/devmo/css/images/ico_linkarrow_blue.gif.2 projects/wiki/skins/devmo/css/images/ico_linkarrow_blue.gif.3 projects/wiki/skins/devmo/css/images/ico_linkarrow_left_blue.gif projects/wiki/skins/devmo/css/images/internal-back.png projects/wiki/skins/devmo/css/images/internal-note.png projects/wiki/skins/devmo/css/images/ip.png projects/wiki/skins/devmo/css/images/jbossorg_logo.gif projects/wiki/skins/devmo/css/images/link_icon.gif projects/wiki/skins/devmo/css/images/lock_icon.gif projects/wiki/skins/devmo/css/images/magnify-clip.png projects/wiki/skins/devmo/css/images/mail_icon.gif projects/wiki/skins/devmo/css/images/mdc-search.png projects/wiki/skins/devmo/css/images/mozilla-org.gif projects/wiki/skins/devmo/css/images/navigation-background.gif projects/wiki/skins/devmo/css/images/navigation-bottom-left.gif projects/wiki/skins/devmo/css/images/navigation-bottom-right.gif projects/wiki/skins/devmo/css/images/navigation-top-left.gif projects/wiki/skins/devmo/css/images/navigation-top-right.gif projects/wiki/skins/devmo/css/images/navtabsbkg_hover.gif projects/wiki/skins/devmo/css/images/navtabsbkg_norm.gif projects/wiki/skins/devmo/css/images/news_icon.png projects/wiki/skins/devmo/css/images/ok.png projects/wiki/skins/devmo/css/images/page-background.gif projects/wiki/skins/devmo/css/images/portlethdr_home.gif projects/wiki/skins/devmo/css/images/portlethdr_homeAnnounce.gif projects/wiki/skins/devmo/css/images/required.gif projects/wiki/skins/devmo/css/images/tab-left-selected.gif projects/wiki/skins/devmo/css/images/tab-left.gif projects/wiki/skins/devmo/css/images/tab-right-selected.gif projects/wiki/skins/devmo/css/images/tab-right.gif projects/wiki/skins/devmo/css/images/tbd.png projects/wiki/skins/devmo/css/images/title.gif projects/wiki/skins/devmo/css/images/user.gif projects/wiki/skins/devmo/css/images/wiki_header_logo.gif projects/wiki/skins/devmo/css/images/wizardhat-small.gif projects/wiki/skins/devmo/css/mdc-wiki.css projects/wiki/skins/devmo/css/wiki.css projects/wiki/skins/devmo/css/wikiprint.css Log: CSS and images Added: projects/wiki/skins/devmo/css/base.css =================================================================== --- projects/wiki/skins/devmo/css/base.css (rev 0) +++ projects/wiki/skins/devmo/css/base.css 2007-06-22 08:54:47 UTC (rev 3688) @@ -0,0 +1,456 @@ + +/* 1) Main ********************************************************************** */ + +/*body { + margin: 0 30px 2em 30px; + color: #333; + line-height: 140%; + background: #fff url("images/body_back.gif") repeat-x; + font-size: 0.9em; +}*/ + +/* jboss.org*/ +body { + margin: 0 30px 2em 30px; + padding: 0px; + line-height: 140%; + background-color:#fff; + background-image:url("/css/images/bkgheader_left.gif"); + background-repeat:repeat-x; + font-size: 0.9em; +} + +body, td, th, h3, input { /* redundant rules for bad browsers */ + font-family: verdana, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; +} + +#container { + width: 100%; + margin: 0px auto; +} +#page { + padding: 2.15em 0 0 0; +} +#content { + margin: 0 230px 0 0; + background: url(images/page-background.gif) repeat-x top left; +} + + +/* 2) Links********************************************************************** */ + +a:link { color: #0033aa; } +a:visited { color: #66A; } + +a:hover { color: #333; } +a:active { color: #000; } + + + +/* 3) Mozilla ******************************************************************* */ + +#mozilla-org { + position: relative; + height: 25px; +} +#mozilla-org a { + position: absolute; + right: 0; + top: 0; + display: block; + width: 110px; + height: 25px; + background: url(images/mozilla-org.gif) no-repeat; + text-decoration: none; + text-indent: -5000em; +} + +/* 4) Header ******************************************************************** */ + +#ORGheader { + margin: 0px auto; + width: 974px; + height:65px; + background-image:url(/file-access/default/theme/images/common/bkgheader_noleft.gif); + background-repeat:repeat-x; + background-color:#3b4f66; +} + +#ORGLogo { + float:left; +} + +#header { + clear: both; + position: relative; + margin: 0 0 0 0; + height: 46px; +} + +#header h1 { + position: absolute; + top: 0; + left: 0; + margin: 0; +} + +/*#header h1 a,#header h1 a:hover { + display: block; + width: 294px; height: 46px; + background: url("images/title.gif") no-repeat; + font-size: 1px; + text-indent: -7000em; + text-decoration: none; +}*/ + +#header form { + position: absolute; + top: 8px; + right: 0; + font-family: tahoma, arial, sans-serif; + font-size: 85%; +} +#header form label { + font-weight: bold; +} +#header form .searchButton, #submit { + font-size: 100%; + padding: 1px; + font-family: tahoma, arial, sans-serif; +} +#header form #searchInput, #s { + width: 90px; + font-size: 100%; + font-weight: normal; + border: 1px solid #9097A2; + padding: 2px; + font-family: tahoma, arial, sans-serif; +} + +/* Footer ****************************************************** */ +#footer { + clear: both; + background: url(images/page-background.gif) repeat-x top left; + margin: 10px 230px 0 auto; + width: auto; + text-align: center; + font-size: 0.8em; +} +#footer ul { + margin: 0; + padding: 0; +} +#footer li { + display: inline; + list-style: none; + padding-left: 5px; + padding-right: 5px; +} +#footer #stickers { + padding-top: 20px; +} +#footer #stickers div { + display: inline; +} +#footer #stickers img { + border: none; +} + + +/* ---------------- Primary Navigation (Tabbed Nav) ---------------------------- */ + +#primarynav { + clear:right; + float:right; + margin-top:14px; +} + +#primarynav ul { + margin: 0px; + padding:0px; +} + +#primarynav ul li { + display: inline; + list-style: none; + text-align:center; + float:left; + background-image: url(/css/images/navtabsbkg_norm.gif); + background-repeat: repeat-x; + background-position: right top; + +} + +#primarynav ul a { + display: inline; + float: left; + text-decoration: none; + font-size:12px; + font-weight:bold; + color: white; + padding: 5px 20px 3px 20px; + background-repeat: no-repeat; + background-position: top left; + border:1px solid #4a5d75; + +} + +#primarynav ul a:hover { + text-decoration: underline; + color: white; + background-image: url(/css/images/navtabsbkg_hover.gif); + background-repeat: repeat-x; + background-position: top left; +} + +#primarynav #current { + font-size: 12px; + font-weight: bold; +} + +#primarynav #current a, #primarynav a:hover { + background-image:none; + background-color: white; + color: #636464; + +} + + +/* 5) Navigation **************************************************************** */ + +#navigation { + margin: 0; + padding: 0; + /* background: url(images/header_bl.png) repeat-x bottom right; */ + /* background: url(images/header_bl.png) no-repeat;*/ + height: 2.7em; +} +#navigation div#bar { + padding: 0; + margin: 0; + /* background: url(images/navigation-top-right.gif) no-repeat top right;*/ + height: 2.7em; + white-space: nowrap; +} +#navigation div#bar div { + position: relative; + padding: 0; + margin: 0; + // background: url(images/navigation-top-left.gif) no-repeat top left; + height: 2.7em; +} + +/*#navigation #contenttypes { + position: absolute; + bottom: 0; + left: 0; + margin: 0; + padding: 0 0.7em 0 0.7em; + list-style-type: none; + background: url(images/navigation-bottom-left.gif) no-repeat bottom left; +} +#navigation #contenttypes li { + margin: 0 2px 0 0; padding: 0; + float: left; + background-image: url(images/tab-right.gif); + background-position: top right; + background-repeat: no-repeat; + height: 1.7em; +} +#navigation #contenttypes li.selected { + background-image: url(images/tab-right-selected.gif); +} +#navigation #contenttypes li a { + display: block; + float: left; + font-family: verdana, arial, sans-serif; + text-decoration: none; + font-size: 85%; + font-weight: bold; + color: #fff; + height: 2em; + line-height: 2em; + background-image: url(images/tab-left.gif); + background-position: top left; + background-repeat: no-repeat; + padding: 0px 6px; + _width: 1%; +} + +#navigation #contenttypes li.selected a { + color: #003366; + background-image: url(images/tab-left-selected.gif); +} + +#navigation #personal { + position: absolute; + bottom: 0; + right: 0; + margin: 0; + padding: 0 0.4em 0 0; + height: 1.8em; + list-style-type: none; + background: url(images/navigation-bottom-right.gif) no-repeat bottom right; +} +#navigation #personal li { + margin: 0 4px; + padding: 0; + float: left; + line-height: 2em; +} +#navigation #personal a { + font-family: tahoma, arial, sans-serif; + font-size: 80%; + font-weight: bold; + color: #fff; + display: block; + text-decoration: none; + margin: 0; + _width: 1%; +} +#navigation #personal a:hover { + text-decoration: underline; +}*/ + +/* 6) Ssdebar ******************************************************************* */ + +#sidebar { + position: absolute; + top: 143px; + right: 30px; + background: #fff; + width: 210px; + line-height: 120%; +} +#sidebar h3 { + font-weight: bold; + font-size: 0.9em; + margin: 1em 0 0.3em; +} +#sidebar h3:first-child { + margin: 0 0 0.3em; +} +#sidebar ul { + margin: 0; + padding: 0; +} +#sidebar p, +#sidebar li { + font-size: 0.85em; + margin: 0 0 0 2em; + padding: 0; +} +#sidebar li a:hover { + text-decoration: underline; +} +#sidebar p { + margin-bottom: 6px; +} +#sidebar p:last-child { + margin-bottom: 0; +} + + + + +/* 7) Related ******************************************************************* */ + +div#related { + background: #eff8ce url(images/box-yellow-bottom.gif) no-repeat bottom left; + margin: 0 0 16px 0; +} +div#related div { + background: url(images/box-yellow-top.gif) no-repeat top left; + padding: 8px; +} +div#related h3 { + color: #036; +} +div#related li { + list-style-image: url(images/box-yellow-arrow.gif); + color: #999; +} +div#related a { + color: #03a; + text-decoration: none; +} + +/* 8) Pagetools ***************************************************************** */ + +div.pagetools { + background: #e6e6e6 url(images/box-gray-bottom.gif) no-repeat bottom left; + margin: 0 0 16px; +} +div.pagetools div { + background: url(images/box-gray-top.gif) no-repeat top left; + padding: 8px; +} +div.pagetools h3 { + color: #666; +} +div.pagetools a { + color: #666; + text-decoration: none; +} +div.pagetools .new a { + color: #ba0000; +} + +/* 9) Breadcrumbs**************************************************************** */ + +#breadcrumbs { + margin: 11px 0 0 0; padding: 0; + font-size: 0.85em; + font-weight: bold; + width: 100%; + clear: both; +} +#breadcrumbs ul { + margin: 0; padding: 0; + display: block; +} +#breadcrumbs li { + float: left; + padding: 0; + margin-top: 0; + list-style-type: none; +} +#breadcrumbs a, +#breadcrumbs span { + color: #888; + text-decoration: none; + background-image: url(images/breadcrumbs.gif); + background-repeat: no-repeat; + background-position: center left; + padding: 0 6px 0 12px; +} +#breadcrumbs:first-child a { + background-image: none; + padding: 0 6px 0 0; +} +#breadcrumbs a:hover { + text-decoration: underline; +} +#breadcrumbs li span { + color: #3f5d89; +} + +/* ****************************************************************************** */ + +.skipLink { + position: absolute; + left: -1200px; + width: 990px; +} + +.hide { + display: none; +} + +#printheader { + display: none; +} + + Added: projects/wiki/skins/devmo/css/blog.css =================================================================== --- projects/wiki/skins/devmo/css/blog.css (rev 0) +++ projects/wiki/skins/devmo/css/blog.css 2007-06-22 08:54:47 UTC (rev 3688) @@ -0,0 +1,168 @@ +#content { + margin: 0px 230px 0 0; +} +#page { + padding: 0; +} +/* 1) Posts ********************************************************************* */ + +.post { + background: url(images/page-background.gif) repeat-x top left; + margin: 0 0 0 0; + padding: 2em 0 2em; +} +.post small { + float: right; + font-size: 0.7em; + color: #999; +} +.post h2 { + font-family: Arial, Helvetica, sans-serif; + font-weight: normal; + color: #036; + margin: 0; +} +.post h2 a { + color: #036; + text-decoration: none; +} +.post .entry { + font-size: 0.95em; +} +.post .postmetadata { + font-size: 0.8em; + color: #999; +} +.post .postmetadata a { + color: #999; +} + +/* Previous and Next Links ****************************************************** */ +#prevnextlinks { + width: 100%; + margin: 0 0 10px 0; +} +#prevnextlinks td { + font-size: 0.85em; + font-weight: bold; + width: 50%; + padding: 0; +} +#prevnextlinks td#prev { + text-align: left; +} +#prevnextlinks td#next { + text-align: right; +} + + +/* 2) Comment form ************************************************************** */ + +#commentform { + background: #fff url(images/box-white-bottom-right.gif) no-repeat bottom right; + margin: 0 0 2em 0; +} + +#commentform div { + background: url(images/box-white-bottom-left.gif) no-repeat bottom left; +} + +#commentform div div { + background: url(images/box-white-top-right.gif) no-repeat top right; +} + +#commentform div div form { + background: url(images/box-white-top-left.gif) no-repeat top left; + margin: 0; padding: 10px; +} +#commentform h3 { + margin: 0; + color: #888; + font-size: 0.9em; +} +#commentform p { + font-size: 0.9em; +} +#commentform p:last-child { + margin-bottom: 0; +} +#commentform label { + font-size: 0.95em; +} +#commentform textarea { + width: 99%; +} +#commentform input[type=text], +#commentform textarea { + font-family: verdana, sans-serif; + font-size: 0.95em; + border: 1px solid #ddd; + padding: 4px; +} +#commentform input#submit { + font-size: 0.95em; +} + + + +/* 3) Comment list ************************************************************** */ + +h3#comments { + color: #036; + font-size: 0.9em; +} + +ol.commentlist { + margin: 0 0 3em; + padding: 1em 0 0 1.5em; + border-top: 1px solid #ddd; +} +em.moderation { + font-size: 0.8em; + color: #999; +} +p.commentmetadata { + font-size: 0.8em; + color: #999; + margin: -1em 0 0; + text-align: right; +} +p.commentmetadata a { + color: #999; +} + + + +/* 4) More ********************************************************************** */ + +.more { + overflow: hidden; + margin: 0 0 2em; + padding: 1em 0 0; + font-size: 0.8em; + font-weight: bold; + border-top: 1px solid #ddd; +} +.more .previous { + float: left; +} +.more .next { + float: right; +} +.more a { +} + + + +/* 5) Errors ******************************************************************** */ + +.error { + clear: both; + margin-top: 3em; + font-size: 0.9em; + color: #666; +} +.error strong { + color: #900; +} + Added: projects/wiki/skins/devmo/css/blogprint.css =================================================================== --- projects/wiki/skins/devmo/css/blogprint.css (rev 0) +++ projects/wiki/skins/devmo/css/blogprint.css 2007-06-22 08:54:47 UTC (rev 3688) @@ -0,0 +1,43 @@ +body { + background: #fff; +} +#sidebar { + display: none; +} +#content { + background: #fff; + margin: 20px; +} +#mozilla-org { + display: none; +} +#header { + display: none; +} +#printheader { + display: block; +} +#printheader .subtitle { + font-size: 1.1em; + font-style: italic; + border-bottom: solid #BBB 1px; +} +#navigation { + display: none; +} +#breadcrumbs { + display: none; +} +#footer { + border-top: solid #BBB 1px; +} +#prevnextlinks { + display: none; +} +#commentform { + display: none; +} +.more { + display: none; +} + Added: projects/wiki/skins/devmo/css/images/bkg_home_2ndcol.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/bkg_home_2ndcol.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/bkgblur_bottom.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/bkgblur_bottom.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/bkgblur_right.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/bkgblur_right.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/bkgheader_left.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/bkgheader_left.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/bkgheader_noleft.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/bkgheader_noleft.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/body_back.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/body_back.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/box-blue-bottom.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/box-blue-bottom.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/box-blue-top.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/box-blue-top.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/box-gray-bottom.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/box-gray-bottom.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/box-gray-top.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/box-gray-top.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/box-white-bottom-left.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/box-white-bottom-left.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/box-white-bottom-right.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/box-white-bottom-right.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/box-white-top-left.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/box-white-top-left.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/box-white-top-right.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/box-white-top-right.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/box-yellow-arrow.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/box-yellow-arrow.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/box-yellow-bottom.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/box-yellow-bottom.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/box-yellow-top.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/box-yellow-top.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/breadcrumbs.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/breadcrumbs.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/bullet.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/bullet.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/cheat.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/cheat.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/discussionitem_icon.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/discussionitem_icon.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/err.png =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/err.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/external.png =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/external.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/file_icon.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/file_icon.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/hdr_border_gradient.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/hdr_border_gradient.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/header_bl.png =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/header_bl.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/ico_12x_feed.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/ico_12x_feed.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/ico_linkarrow_blue.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/ico_linkarrow_blue.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/ico_linkarrow_blue.gif.1 =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/ico_linkarrow_blue.gif.1 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/ico_linkarrow_blue.gif.2 =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/ico_linkarrow_blue.gif.2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/ico_linkarrow_blue.gif.3 =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/ico_linkarrow_blue.gif.3 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/ico_linkarrow_left_blue.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/ico_linkarrow_left_blue.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/internal-back.png =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/internal-back.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/internal-note.png =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/internal-note.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/ip.png =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/ip.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/jbossorg_logo.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/jbossorg_logo.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/link_icon.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/link_icon.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/lock_icon.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/lock_icon.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/magnify-clip.png =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/magnify-clip.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/mail_icon.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/mail_icon.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/mdc-search.png =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/mdc-search.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/mozilla-org.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/mozilla-org.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/navigation-background.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/navigation-background.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/navigation-bottom-left.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/navigation-bottom-left.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/navigation-bottom-right.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/navigation-bottom-right.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/navigation-top-left.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/navigation-top-left.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/navigation-top-right.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/navigation-top-right.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/navtabsbkg_hover.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/navtabsbkg_hover.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/navtabsbkg_norm.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/navtabsbkg_norm.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/news_icon.png =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/news_icon.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/ok.png =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/ok.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/page-background.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/page-background.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/portlethdr_home.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/portlethdr_home.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/portlethdr_homeAnnounce.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/portlethdr_homeAnnounce.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/required.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/required.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/tab-left-selected.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/tab-left-selected.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/tab-left.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/tab-left.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/tab-right-selected.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/tab-right-selected.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/tab-right.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/tab-right.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/tbd.png =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/tbd.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/title.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/title.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/user.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/user.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/wiki_header_logo.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/wiki_header_logo.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/images/wizardhat-small.gif =================================================================== (Binary files differ) Property changes on: projects/wiki/skins/devmo/css/images/wizardhat-small.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: projects/wiki/skins/devmo/css/mdc-wiki.css =================================================================== --- projects/wiki/skins/devmo/css/mdc-wiki.css (rev 0) +++ projects/wiki/skins/devmo/css/mdc-wiki.css 2007-06-22 08:54:47 UTC (rev 3688) @@ -0,0 +1,128 @@ +/* new MDC skin mods */ +#content { + margin: 0; +} + +#footer { + margin: 10px 0 0 auto; +} + +#toollinks { + float: left; +} + +#toollinks ul { + margin: 6px 0 0 0; + padding: 0; +} + +#toollinks li { + margin: 0 4px; + padding: 0; + float: left; + line-height: 2em; + list-style-type: none; +} + +#toollinks li a { + font-family: tahoma, arial, sans-serif; + font-size: 85%; + color: #666; + display: block; + text-decoration: none; + margin: 0; +} + +#toollinks li a:hover { + text-decoration: underline; +} + +#accountlinks ul { + margin: 6px 0 0 0; + padding: 0; + float: right; +} + +#accountlinks li { + margin: 0 4px; + padding: 0; + float: left; + line-height: 2em; + list-style-type: none; +} + +#accountlinks li a { + font-family: tahoma, arial, sans-serif; + font-size: 85%; + color: #666; + display: block; + text-decoration: none; + margin: 0; +} + +#accountlinks li a:hover { + text-decoration: underline; +} + +#toollinks #toollink-history { display: none; } +#toollinks #toollink-protect { display: none; } +#toollinks #toollink-delete { display: none; } +#toollinks #toollink-move { display: none; } +#toollinks #toollink-watch { display: none; } +#toollinks #toollink-addsection { display: none; } +#toollinks #toollink-unprotect { display: none; } +#toollinks #toollink-unwatch { display: none; } +#toollinks li.new a { color: #ba0000; } + +#toollinks .selected a { + color: #036; + } + +#footer #ca-addsection { display: none; } + +#footer .languagelinks { + margin: 0 0 15px 0; + padding-top: 5px; +} +#footer .languagelinks a { + text-decoration: none; + color: #888; + font-weight: bold; +} + +#footer .languagelinks a:hover { + text-decoration: underline; +} + +#footer .navigationlinks { +} + +#footer .navigationlinks #n-currentevents { display: none; } +#footer .navigationlinks #n-portal { display: none; } +#footer .navigationlinks #n-randompage { display: none; } +#footer .navigationlinks #n-sitesupport { display: none; } + +#footer .speciallinks #t-print { display: none; } + +#footer .stats { + padding-top: 15px; + color: #888; +} + +#footer .copyright { + padding-top: 10px; +} + +/* edit section link formatting */ + +.editsection { + font-weight: normal; + float: right; + margin-left: 5px; +} +h1 .editsection { font-size: 50% } +h2 .editsection { font-size: 66.7% } +h3 .editsection { font-size: 85.5% } +h5 .editsection { font-size: 120% } +h6 .editsection { font-size: 133% } + Added: projects/wiki/skins/devmo/css/wiki.css =================================================================== --- projects/wiki/skins/devmo/css/wiki.css (rev 0) +++ projects/wiki/skins/devmo/css/wiki.css 2007-06-22 08:54:47 UTC (rev 3688) @@ -0,0 +1,957 @@ +/* General */ + +.selected { + font-weight: bold; +} +.new { +} + +/* Special Slidebar Stuff */ + +#sidebarslidebox { + position: absolute; + width: 210px; +} +.sidebarslidecontrol { + text-align: right; + color: #BBB; + font-size: 0.8em; + width: 202px; + cursor: hand; + cursor: pointer; +} +#sidebar { + top: 8.63em; +} + +/* 1) Article ******************************************************************* */ + +.article { + background: url(images/page-background.gif) repeat-x top left; + margin: 0; + padding: 2em 0 2em; + font-size: 0.95em; +} +.article p { + margin: 10px 0 10px 0; padding: 0; +} +.article div.editsection { + margin: 20px 0 0 0; +} +.article h1, h2, h3, h4, h5, h6 { + font-family: Arial, Helvetica, sans-serif; + font-weight: normal; + color: #036; + margin: 30px 0 10px 0; + padding: 3px; +} +.article h1 { + font-size: 1.7em; + border-bottom: solid #CCC 1px; +} +.article h1.firstHeading { + border-bottom: none; + margin-top: 0; + font-size: 1.7em; +} +.article h2 { + font-size: 1.6em; + border-bottom: solid #CCC 1px; +} +.article h3 { + font-size: 1.5em; +} +.article h4 { + font-size: 1.4em; +} +.article h5 { + font-size: 1.3em; +} +.article h6 { + font-size: 1.1em; + font-weight: bold; +} +.article h1 a { + text-decoration: none; +} +.article h2 { + font-family: Arial, Helvetica, sans-serif; + font-weight: normal; + color: #036; +} +.article h2 a { + text-decoration: none; +} +.article h3 a { + text-decoration: none; +} +.article h4 a { + text-decoration: none; +} +.article h5 a { + text-decoration: none; +} +.article h6 a { + text-decoration: none; +} +.article .introduction { + float: right; + width: 210px; + background: #369 url(images/box-blue-bottom.gif) no-repeat bottom left; + margin: 16px 0 16px 16px; + color: #fff; +} +.article .introduction h3 { + background: url(images/box-blue-top.gif) no-repeat top left; + padding: 8px 12px 0 12px; + margin: 0; + font-size: 0.8em; +} +.article .introduction p { + padding: 0 12px 8px 12px; + margin: 0; + font-size: 0.8em; + line-height: 130%; +} +.article .selected { + font-weight: normal; +} +.article img { + border: none; +} + +/* List Styles ****************************************************************** */ +.article ul li { + list-style: square; +} +.article ol li { + list-style: decimal; +} + +/* Definition List Styles ******************************************************* */ +.article dl { +} +.article dl dt { + font-weight: bold; +} +.article dl dd { + margin-left: 1em; +} + +/* contentsub */ +#contentSub { + font-size: 0.8em; + font-style: italic; + color: #999; + margin: 10px 10px 10px 25px; padding: 0; +} + +/* TOC Styles ******************************************************************* */ + +#toc { + /*border:1px solid #2f6fab;*/ + /* clear: both; */ + border:1px solid #aaaaaa; + background-color:#f9f9f9; + padding:5px; + margin: 0 20px 10px 0; + /* float: left; */ + font-size: 0.90em; +} +#toc h2 { + margin: 0; padding: 0 0 2px 0; + font-size: 1.4em; +} +#toc .tocindent { margin-left: 1em; } +#toc .tocline { margin-bottom: 0px; } +#toc p { margin: 0; } +#toc .toctoggle { font-size: 90%; } +#toc .editsection { + margin-top: 0.7em; + font-size: 94%; + display: none; +} +#toc ul { + margin: 0; padding: 0; +} +#toc li { + list-style: none; + margin-left: 1.2em; +} + + + +/* Images and Thumbnails ******************************************************** */ + +div.floatright, table.floatright { + clear: right; + float: right; + position: relative; + margin: 0 0 0.5em 0.5em; + border: 0 +/* + border: 0.5em solid White; + border-width: 0.5em 0 0.8em 1.4em; +*/ +} +div.floatright p { font-style: italic; } +div.floatleft, table.floatleft { + float: left; + position: relative; + margin: 0 0.5em 0.5em 0; + border: 0 +/* + margin: 0.3em 0.5em 0.5em 0; + border: 0.5em solid White; + border-width: 0.5em 1.4em 0.8em 0; +*/ +} +div.floatleft p { font-style: italic; } + +div.thumb { + margin-bottom: 0.5em; + border-style: solid; border-color: White; + width: auto; +} +div.thumb div { + border:1px solid #cccccc; + padding: 3px !important; + background-color:#f9f9f9; + font-size: 94%; + text-align: center; + overflow: hidden; +} +div.thumb div a img { + border:1px solid #cccccc; +} +div.thumb div div.thumbcaption { + border: none; + text-align: left; + line-height: 1.4em; + padding: 0.3em 0 0.1em 0; +} +div.magnify { + float: right; + border: none !important; + background: none !important; +} +div.magnify a, div.magnify img { + display: block; + border: none !important; + background: none !important; +} +div.tright { + clear: right; + float: right; + border-width: 0.5em 0 0.8em 1.4em; +} +div.tleft { + float: left; + margin-right:0.5em; + border-width: 0.5em 1.4em 0.8em 0; +} + +/* External Link Styles ********************************************************* */ + +/* +** keep the whitespace in front of the ^=, hides rule from konqueror +** this is css3, the validator doesn't like it when validating as css2 +*/ +.article .exlink { + background: url("images/external.png") center right no-repeat; + padding-right: 13px; +} +.article a[href ^="http://"], +.article a[href ^="gopher://"] { + background: url("images/external.png") center right no-repeat; + padding-right: 13px; +} +.article a[href ^="https://"], +.link-https { + background: url("images/lock_icon.gif") center right no-repeat; + padding-right: 16px; +} +.article a[href ^="mailto:"], +.link-mailto { + background: url("images/mail_icon.gif") center right no-repeat; + padding-right: 18px; +} +.article a[href ^="news://"] { + background: url("images/news_icon.png") center right no-repeat; + padding-right: 18px; +} +.article a[href ^="ftp://"], +.link-ftp { + background: url("images/file_icon.gif") center right no-repeat; + padding-right: 18px; +} +.article a[href ^="irc://"], +.link-irc { + background: url("images/discussionitem_icon.gif") center right no-repeat; + padding-right: 18px; +} +.article .urlexpansion { + display: none; +} + +.article a.imagelink { + background: none; + padding-right: 0; +} + +/* Edit Form ******************************************************************** */ +#editform input { + border: solid #666 1px; +} +#editform form { + border: none; + margin: 0; +} +#editform textarea { + border: solid #666 1px; + background: #EEE; + width: 100%; +} +#editform .iebugfix { + width: 100%; +} +#editform #wpSave { + width: 125px; + background: #DDD; + border: solid #666 1px; +} +#editform #wpPreview { + width: 125px; + background: #DDD; + border: solid #666 1px; +} + +/* Category Links *************************************************************** */ + +div#catlinks { + clear: both; + font-size: 0.9em; + border: solid #bbb 1px; + background: #eee; + padding: 0; + margin: 40px 0 0 0; +} +div#catlinks p { + padding: 0 5px 2px 5px; margin: 0; +} +.catlink-table { + width: 100%; +} +.catlink-table td { + padding: 5px; +} +.catlink-table td h4 { + font-size: 1em; + font-weight: bold; + margin: 0; padding: 0; + border-bottom: solid #BBB 1px; +} +.catlink-table ul { + margin: 5px 0 5px 0; padding: 0; +} +.catlink-table li { + margin: 0 0 0 2em; + line-height: 1.45em; +} + +/* General Stuff */ + +#n-portal { display: none; } +#n-currentevents { display: none; } +#n-randompage { display: none; } +#n-sitesupport { display: none; } +#ca-addsection { display: none; } +#t-print { display: none; } + +.printfooter { + display: none; +} + +#siteSub { + display: none; +} + +a.new { + color: #ba0000; +} + +/* Custom classes from cavendish.css ******************************** */ + +.standard-table { + border: solid black 1px; + border-collapse: collapse; +} + +.standard-table td { + text-align: left; + vertical-align: top; + padding: 5px; + border: solid #BBB 1px; +} + +.standard-table td.header, .standard-table th { + font-weight: bold; + background: #DDD; + border: solid #BBB 1px; + text-align: left; + padding: 0px 5px 0px 5px; +} + +.fullwidth-table { + border: solid #666 1px; + border-collapse: collapse; + width: 100%; + margin-bottom: 10px; + background: #FFF; +} + +.fullwidth-table td { + text-align: left; + vertical-align: top; + padding: 5px 15px 5px 15px; + border: solid #BBB 1px; +} + +.fullwidth-table td.header, .fullwidth-table th { + background: #DDD; + border: solid #BBB 1px; + font-weight: bold; + font-size: 1.05em; + text-align: left; + padding: 0px 5px 0px 5px; +} + +div.breadcrumbs { + border: solid #BBB 1px; + padding: 0px 5px 0px 5px; + background: #EEE; + margin: 10px 0px 10px 0px; + font-size: 0.9em; +} + +div.breadcrumbs a.breadcrumbs { + text-decoration: none; +} + +div.breadcrumbs span.breadcrumbs { + font-weight: bold; +} + +pre { + background: #EEE; + font-size: 1.1em; + line-height: 1.1em; + border: dashed #666 1px; + padding: 15px 20px 15px 20px; + overflow: auto; +} + +.prewrong { + padding: 0; margin: 0; +} + +.prewrong pre { + background: #FDD; + border: dashed #644 1px; +} + +.wrong { + background: #FDD; + border: solid #644 1px; + padding: 5px; + margin: 5px 0 5px 0; +} +.wrong-inline { + background: #FDD; + border: solid #644 1px; + padding: 0 3px 0 3px; +} + +div.tip { + border: solid green 2px; + padding: 0px 10px 0px 10px; + margin: 10px 0px 10px 0px; + background: #DFD; +} + +div.bug, div.warning { + border: solid red 2px; + padding: 0px 10px 0px 10px; + margin: 10px 0px 10px 0px; + background: #FDD; +} + +div.note { + border: solid goldenrod 2px; + padding: 0px 10px 0px 10px; + margin: 10px 0px 10px 0px; + background: #FFD; + color: #000; +} + +div.note:before { + content: ""; +} + +.float-left { + float: left; + padding: 5px; +} + +.float-right { + float: right; + padding: 5px; +} + +.figure { + /* for future use */ +} + +.originaldocinfo { + font-size: 0.8em; + background: #FFD; + border: solid #CCE 1px; + width: auto; + padding: 0px 10px 0px 10px; + margin: 15px 0px 15px 0px; +} + +.originaldocinfo p { + line-height: 0.8em; +} + +.originaldocinfo h2 { + font-size: 1.3em; + font-weight: bold; +} + +.licenseblock { + border: dashed #888 1px; + background: #DDD; + font-size: 0.8em; + padding: 0px 10px 0px 10px; +} + +code { + font-size: 1.2em; +} +tt { + font-size: 1.2em; +} +.wrong-source-code { + color: #D00; +} + + +.right-source-code { + color: #0A0; +} + +.template-toc { + background: #DDD; + font-size: 0.9em; + border: solid black 1px; + padding: 0px 10px 0px 10px; + margin: 15px 0px 15px 0px; + width: auto; +} + +.prevnext { + font-size: 0.9em; + margin: 10px 0px 20px 0px; +} + +div.highlight { + border-left: solid blue 3px; + padding-left: 15px; +} + +span.highlightblue { + color: blue; +} + +span.highlightred { + color: red; +} + +span.highlightgreen { + color: green; +} + +.side-note { + width: auto; + padding: 0px 20px 0px 20px; + margin: 10px 0px 10px 0px; + border: solid #666 1px; + background: #EEE; +} + +.side-note-left { + float:left; + width: 40%; + padding: 0px 20px 0px 20px; + margin: 10px 10px 10px 0px; + border: solid #666 1px; + background: #EEE; +} + +.side-note-right { + float:right; + width: 40%; + padding: 0px 20px 0px 20px; + margin: 10px 0px 10px 10px; + border: solid #666 1px; + background: #EEE; +} + +/* new for devmo topic pages */ + +.callout-box { + float:right; + border: solid black 1px; + text-align: center; + width: 200px; + margin: 0px 0px 15px 15px; + padding: 10px; + background: #EEE; +} + +.mainpage h2 { + margin-top: 0px; +} + +.features-table { + width: 100%; + border-collapse: collapse; + margin-bottom: 20px; +} +.features-table td { + vertical-align: top; + padding: 20px 0 0 0; +} +.features-table td img { + float: left; + margin: -20px 15px 5px 0px; +} +.features-table td p { + margin: 0; padding: 0 3px 0 3px; + line-height: 1.6em; + font-size: 0.95em; +} +.features-table td h3 { + margin: 0; + font-size: 1.5em; +} +.features-table td h4 { + margin: 0; + font-size: 1.2em; +} +.mainpage-table { + width: 100%; + margin: 0 0 10px 0; + border-collapse: collapse; +} +.mainpage-table td { + vertical-align: top; + padding: 0 10px 10px 10px; +} +.mainpage-table td ul { + margin: 0 0 10px 0; padding: 0 25px 0 25px; +} +.mainpage-table td ul li { + margin: 0; padding: 0; +} +.mainpage-table td h3 { + margin: 0; + font-size: 1.4em; +} +.topicpage-table { + clear: both; + width: auto; + margin: -30px 0 0 0; +} + +.topicpage-table td { + width: 50%; + vertical-align: top; + padding: 10px; +} + +.topicpage-table h3 { + border-bottom: solid #BBB 1px; +} + +.topicpage-table h3 a { + color: #036; + text-decoration: none; +} + +.topicpage-table h3 a:hover { + text-decoration: underline; + color: #000; +} +.alllinks { + font-size: 10px; + float:right; +} + +.date { + color: #668; + font-style: italic; +} + +.disambig { + font-size: 0.9em; + border-top: solid #AAA 1px; + border-bottom: solid #AAA 1px; +} + +.notice { + font-size: 0.9em; + border: solid #AAA 1px; + padding: 5px; + margin: 5px 0px 5px 0px; +} + +/* Extra Styles brought in from cavendish/main.css for unhandled wiki stuff */ + +span.subpages { display: block; } + +/* user notification thing */ +.usermessage { + background-color: #ffce7b; + border: 1px solid #ffa500; + color: Black; + font-weight: bold; + margin: 2em 0em 1em 0em; + padding: 0.5em 1em; + vertical-align: middle; +} +.error { + color: red; + font-size: larger; +} + +.hiddenStructure { + display: none; +} + +img.tex { vertical-align: middle; } +span.texhtml { font-family: serif; } + +.special li { + line-height: 1.4em; + margin: 0; + padding: 0; +} + +/* Page history styling */ +/* the auto-generated edit comments */ +.autocomment { color: gray; } +#pagehistory span.user { + margin-left: 1.4em; + margin-right: 0.4em; +} +#pagehistory span.minor { font-weight: bold; } +#pagehistory li { border: 1px solid White; } +#pagehistory li.selected { + background-color:#f9f9f9; + border:1px dashed #aaaaaa; +} +/* +** Diff rendering +*/ +table.diff { background:white; + width: 100%; +} +td.diff-otitle { background:#ffffff; } +td.diff-ntitle { background:#ffffff; } +td.diff-addedline { + background:#ccffcc; + font-size: smaller; +} +td.diff-deletedline { + background:#ffffaa; + font-size: smaller; +} +td.diff-context { + background:#eeeeee; + font-size: smaller; +} +span.diffchange { color: red; font-weight: bold; } + +/* js pref toc */ +#preftoc { + float: left; + margin: 1em 1em 1em 1em; + width: 13em; +} +#preftoc li { border: 1px solid White; } +#preftoc li.selected { + background-color:#f9f9f9; + border:1px dashed #aaaaaa; +} +#preftoc a, +#preftoc a:active { + display: block; + color: #0014a6; +} +#prefcontrol { + clear: both; + float: left; + margin-top: 1em; +} +div.prefsectiontip { + font-size: 95%; + margin-top: 1em; +} +fieldset.operaprefsection { margin-left: 15em } + +.redirectText { + font-size:150%; + margin:5px; +} + +.printfooter { + display: none; +} + +.not_patrolled { + background-color: #ffa; +} +div.patrollink { + font-size: 75%; + text-align: right; +} +span.newpage, span.minor, span.searchmatch { + font-weight: bold; +} +span.unpatrolled { + font-weight:bold; + color:red; +} + +span.searchmatch { + color: red; +} +.sharedUploadNotice { + font-style: italic; +} + +span.updatedmarker { + color:black; + background-color:#00FF00; +} +span.newpageletter { + font-weight:bold; + color:black; + background-color:yellow; +} +span.minoreditletter { + color:black; + background-color:#C5FFE6; +} + +table.gallery { + border: 1px solid #cccccc; + margin: 2px; + padding: 2px; + background-color:#ffffff; +} + +table.gallery tr { + vertical-align:top; +} + +table.gallery td { + vertical-align:top; + background-color:#f9f9f9; + border: solid 2px white; +} + +div.gallerybox { + margin: 2px; + width: 150px; +} + +div.gallerybox div.thumb { + text-align: center; + border: 1px solid #cccccc; + margin: 2px; +} + +div.gallerytext { + font-size: 94%; + padding: 2px 4px; +} + +div.expert { + margin: 0 15px 0 0; + padding: 0 20px 0 47px; + background: #EFF url("images/wizardhat-small.gif") top left no-repeat; + border: solid #ABC 2px; + width: 35%; + float: left; +} + +/* added for beltzner/release status chart */ + +table.release { + font-family: gill sans mt, gill sans, helvetica, tahoma; + font-size: smaller; + border: black 1px; + width: 100%; +} + +table.release td { + border: 1px #CCC solid; + padding: 0 0 15px 25px; +} + +tr.releaseHeader td {font-size: 125%;} +tr.releaseHeader td.OK {background-color: green;} +tr.releaseHeader td.ERR {background-color: red;} +tr.releaseHeader td.IP {background-color: yellow;} +tr.releaseHeader td.TBD {background-color: grey;} + +tr.release td.OK {width: 22%; background: #CFC url("images/ok.png") top left no-repeat;} +tr.release td.ERR {width: 22%; background: #FCC url("images/err.png") top left no-repeat;} +tr.release td.IP {width: 22%; background: #FFC url("images/ip.png") top left no-repeat;} +tr.release td.TBD {width: 22%; background: #EEE url("images/tbd.png") top left no-repeat;} +tr.release td.stepLabel { + width: 12%; + text-align: right; + padding: 0 5px 15px 25px; +} + +/* additions for hwaara and accessibility docs */ +.OK { + background-color: rgb(153,255,153); +} + +.irrelevant { + color: rgb(153,153,153); +} + +.maybe { + background-color: rgb(255,255,204); +} + +/* edit section link formatting */ + +.editsection { + font-weight: normal; + float: right; + margin-left: 5px; +} +h1 .editsection { font-size: 50% } +h2 .editsection { font-size: 66.7% } +h3 .editsection { font-size: 85.5% } +h5 .editsection { font-size: 120% } +h6 .editsection { font-size: 133% } + Added: projects/wiki/skins/devmo/css/wikiprint.css =================================================================== --- projects/wiki/skins/devmo/css/wikiprint.css (rev 0) +++ projects/wiki/skins/devmo/css/wikiprint.css 2007-06-22 08:54:47 UTC (rev 3688) @@ -0,0 +1,64 @@ +body { + background: #fff; +} +#sidebar { + display: none; +} +#content { + background: #fff; + margin: 20px; +} +#mozilla-org { + display: none; +} +#header { + display: none; +} +#printheader { + display: block; +} +#printheader .subtitle { + font-size: 1.1em; + font-style: italic; + border-bottom: solid #BBB 1px; +} +#navigation { + display: none; +} +#breadcrumbs { + display: none; +} +.breadcrumbs { + display: none; +} +.article .urlexpansion { + display: inline; +} +#footer { + display: none; +} +.printfooter { + display: block; + margin: 10px; + font-style: italic; +} +.printfooter a { + text-decoration: none; + color: #000; +} +#siteSub { + display: block; + margin: 10px; + font-size: 1.2em; + font-style: italic; + color: #666; +} +#footer #f-about { + display: none; +} +#footer #f-disclaimer { + display: none; +} +#catlinks { + display: none; +}

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3687 - in projects/wiki: extensions/SpamBlacklist and 15 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-22 04:38:17 -0400 (Fri, 22 Jun 2007) New Revision: 3687 Removed: projects/wiki/extensions/CVS/ projects/wiki/extensions/SpamBlacklist/CVS/ projects/wiki/extensions/magpierss/CVS/ projects/wiki/extensions/magpierss/extlib/CVS/ projects/wiki/skins/CVS/ projects/wiki/skins/cavendish/CVS/ projects/wiki/skins/chick/CVS/ projects/wiki/skins/common/CVS/ projects/wiki/skins/common/images/CVS/ projects/wiki/skins/common/images/icons/CVS/ projects/wiki/skins/devmo/CVS/ projects/wiki/skins/disabled/CVS/ projects/wiki/skins/htmldump/CVS/ projects/wiki/skins/mdc/CVS/ projects/wiki/skins/monobook/CVS/ projects/wiki/skins/myskin/CVS/ projects/wiki/skins/simple/CVS/ Log: Remove CVS directories

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3686 - projects/wiki.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-22 04:37:27 -0400 (Fri, 22 Jun 2007) New Revision: 3686 Removed: projects/wiki/bak.mysql.2007-06-20_15.17.52_.tar.gz Log: Remove db backup from repository Deleted: projects/wiki/bak.mysql.2007-06-20_15.17.52_.tar.gz =================================================================== (Binary files differ)

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3684 - branches/maeste_palin.

by jbossws-commits＠lists.jboss.org

Author: maeste Date: 2007-06-22 04:32:26 -0400 (Fri, 22 Jun 2007) New Revision: 3684 Added: branches/maeste_palin/mergeinfo.txt Log: Adding mergeinfo.txt Added: branches/maeste_palin/mergeinfo.txt =================================================================== --- branches/maeste_palin/mergeinfo.txt (rev 0) +++ branches/maeste_palin/mergeinfo.txt 2007-06-22 08:32:26 UTC (rev 3684) @@ -0,0 +1,4 @@ +maeste (stefano.maestri(a)javalinux.it) 22-JUN-2007 +svn merge -c 3581 https://svn.jboss.org/repos/jbossws/branches/maeste_palin +svn merge -c 3589 https://svn.jboss.org/repos/jbossws/branches/maeste_palin +svn merge -r 3590:3619 https://svn.jboss.org/repos/jbossws/branches/maeste_palin

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3683 - in trunk: integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF and 23 other directories.

by jbossws-commits＠lists.jboss.org

Author: maeste Date: 2007-06-22 04:30:37 -0400 (Fri, 22 Jun 2007) New Revision: 3683 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationExceptionHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationExceptionHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/UnwrapInvocationExceptionHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java Removed: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/UserException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/UserExceptionBean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java Modified: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java trunk/integration/sunri/.classpath trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/sunri/ant-import/build-thirdparty.xml trunk/integration/sunri/build.xml trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml trunk/integration/sunri/src/test/resources/test-excludes.txt trunk/integration/sunri/version.properties trunk/integration/xfire/.classpath trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/ant-import/build-thirdparty.xml trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml trunk/testsuite/ant-import/build-jars-jaxws.xml trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java trunk/testsuite/src/resources/jaxws/samples/exception/WEB-INF/web.xml Log: svn merge -c 3581 https://svn.jboss.org/repos/jbossws/branches/maeste_palin First implementation of JDKLogRedirector for JBWS-1675 JBWS-1678 svn merge -c 3589 https://svn.jboss.org/repos/jbossws/branches/maeste_palin Added wsdl4j.jar library required for integration tests svn merge -r 3590:3619 https://svn.jboss.org/repos/jbossws/branches/maeste_palin Minor changes on JDKLogRedirector moving JDKLogRedirector. First step, partial commit moving JDKLogRedirect on integration/sunri source directory. Second and final step Bean code is more elegant with start method ;) Removed some unuseful logs Work in progress on JBWS-1670: added invocation exception handler to deal with InvocationException in different ways according to the stack we are using (SunRI requires us not to unwrap InvocationTargetException before passing it back to the InvokerTube) FIxed JBWS-1669. Modify exception sample to use a real jaxws client for tests. Fixed JBWS-1670 . Modified: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -132,6 +132,7 @@ <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> Modified: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -133,6 +133,7 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss40.InvocationHandlerEJB3</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> Modified: trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -137,6 +137,7 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> Modified: trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -148,6 +148,7 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -25,6 +25,7 @@ import java.util.Map; +import org.jboss.wsf.spi.invocation.InvocationExceptionHandler; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.RequestHandler; @@ -38,7 +39,8 @@ { private String requestHandler; private String lifecycleHandler; - private Map<String,String> invocationHandler; + private Map<String, String> invocationHandler; + private String invocationExceptionHandler; public void setLifecycleHandler(String handler) { @@ -50,11 +52,16 @@ this.requestHandler = handler; } - public void setInvocationHandler(Map<String,String> handlers) + public void setInvocationHandler(Map<String, String> handlers) { this.invocationHandler = handlers; } + public void setInvocationExceptionHandler(String handler) + { + this.invocationExceptionHandler = handler; + } + @Override public void create(Deployment dep) { @@ -97,11 +104,23 @@ String className = invocationHandler.get(dep.getType().toString()); if (className == null) throw new IllegalStateException("Cannot obtain invocation handler for: " + dep.getType()); - + + InvocationExceptionHandler exceptionHandler; try { + Class<?> handlerClass = dep.getClassLoader().loadClass(invocationExceptionHandler); + exceptionHandler = (InvocationExceptionHandler)handlerClass.newInstance(); + } + catch (Exception e) + { + throw new IllegalStateException("Cannot load invocation exception handler: " + invocationExceptionHandler); + } + try + { Class<?> handlerClass = dep.getClassLoader().loadClass(className); - return (InvocationHandler)handlerClass.newInstance(); + InvocationHandler invocationHandlerInstance = (InvocationHandler)handlerClass.newInstance(); + invocationHandlerInstance.setExceptionHandler(exceptionHandler); + return invocationHandlerInstance; } catch (Exception e) { Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -23,12 +23,8 @@ // $Id$ -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.reflect.UndeclaredThrowableException; -import javax.management.MBeanException; - import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.utils.JavaUtils; @@ -43,6 +39,8 @@ { // provide logging private static final Logger log = Logger.getLogger(AbstractInvocationHandler.class); + + protected InvocationExceptionHandler exceptionHandler; protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException { @@ -63,39 +61,12 @@ return implMethod; } - protected void handleInvocationException(Throwable th) throws Exception + protected final void handleInvocationException(Throwable th) throws Exception { - if (th instanceof InvocationTargetException) - { - // unwrap the throwable raised by the service endpoint implementation - Throwable targetEx = ((InvocationTargetException)th).getTargetException(); - handleInvocationThrowable(targetEx); - } - - if (th instanceof MBeanException) - { - throw ((MBeanException)th).getTargetException(); - } - - handleInvocationThrowable(th); + //delegate to invocation exception handler + exceptionHandler.handleInvocationException(th); } - private void handleInvocationThrowable(Throwable th) throws Exception - { - if (th instanceof Exception) - { - throw (Exception)th; - } - else if (th instanceof Error) - { - throw (Error)th; - } - else - { - throw new UndeclaredThrowableException(th); - } - } - public void create(Endpoint ep) { log.debug("Create: " + ep.getName()); @@ -115,4 +86,14 @@ { log.debug("Destroy: " + ep.getName()); } + + public InvocationExceptionHandler getExceptionHandler() + { + return exceptionHandler; + } + + public void setExceptionHandler(InvocationExceptionHandler exceptionHandler) + { + this.exceptionHandler = exceptionHandler; + } } Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationExceptionHandler.java (from rev 3619, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationExceptionHandler.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationExceptionHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationExceptionHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,64 @@ +/* + * 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.wsf.spi.invocation; + +import java.lang.reflect.UndeclaredThrowableException; + +import javax.management.MBeanException; + +/** + * A basic invocation exception handler that simply rethrows Throwable as Exception + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> + * @since 17-Jun-2007 + * + */ +public class BasicInvocationExceptionHandler implements InvocationExceptionHandler +{ + + public void handleInvocationException(Throwable th) throws Exception + { + if (th instanceof MBeanException) + { + throw ((MBeanException)th).getTargetException(); + } + + handleInvocationThrowable(th); + } + + protected void handleInvocationThrowable(Throwable th) throws Exception + { + if (th instanceof Exception) + { + throw (Exception)th; + } + else if (th instanceof Error) + { + throw (Error)th; + } + else + { + throw new UndeclaredThrowableException(th); + } + } + +} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -53,4 +53,5 @@ public void destroy(Endpoint ep) { } + } Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationExceptionHandler.java (from rev 3619, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationExceptionHandler.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationExceptionHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationExceptionHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,35 @@ +/* + * 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.wsf.spi.invocation; + +/** + * A general invocation exception handler + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> + * @since 17-Jun-2007 + * + */ +public interface InvocationExceptionHandler +{ + public void handleInvocationException(Throwable th) throws Exception; + +} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -50,4 +50,7 @@ /** Destroy the invocation handler */ void destroy(Endpoint ep); + + /** Set the handler to be used to deal with invocation exceptions **/ + void setExceptionHandler(InvocationExceptionHandler exceptionHandler); } Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/UnwrapInvocationExceptionHandler.java (from rev 3619, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/UnwrapInvocationExceptionHandler.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/UnwrapInvocationExceptionHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/UnwrapInvocationExceptionHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,55 @@ +/* + * 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.wsf.spi.invocation; + +import java.lang.reflect.InvocationTargetException; + +import javax.management.MBeanException; + +/** + * An invocation exception handler that unwraps InvocationExceptions + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> + * @since 17-Jun-2007 + * + */ +public class UnwrapInvocationExceptionHandler extends BasicInvocationExceptionHandler +{ + + public void handleInvocationException(Throwable th) throws Exception + { + if (th instanceof InvocationTargetException) + { + // unwrap the throwable raised by the service endpoint implementation + Throwable targetEx = ((InvocationTargetException)th).getTargetException(); + handleInvocationThrowable(targetEx); + } + + if (th instanceof MBeanException) + { + throw ((MBeanException)th).getTargetException(); + } + + handleInvocationThrowable(th); + } + +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log (from rev 3581, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log) Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java =================================================================== --- branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java 2007-06-14 12:50:56 UTC (rev 3581) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,116 +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.wsf.spi.utils.log; - -import java.util.logging.ErrorManager; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.SimpleFormatter; - -import org.jboss.logging.Logger; - -/** - * A Handler (java.util.logging.Handler) class redirecting messages - * to the jboss logging system. - * - * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> - * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> - * @since 14-Jun-2007 - * - */ -public class JBossLogHandler extends Handler -{ - - public JBossLogHandler() - { - super.setFormatter(new SimpleFormatter()); - } - - @Override - public void publish(LogRecord record) - { - if (!isLoggable(record)) - { - return; - } - String msg; - try - { - msg = getFormatter().formatMessage(record); - } - catch (Exception ex) - { - // We don't want to throw an exception here, but we - // report the exception to any registered ErrorManager. - reportError(null, ex, ErrorManager.FORMAT_FAILURE); - return; - } - if (record.getLevel() == Level.INFO) - { - Logger.getLogger(record.getSourceClassName()).info(msg); - } - else if (record.getLevel() == Level.SEVERE) - { - Logger.getLogger(record.getSourceClassName()).error(msg); - } - else if (record.getLevel() == Level.WARNING) - { - Logger.getLogger(record.getSourceClassName()).warn(msg); - } - else if (record.getLevel() == Level.FINE) - { - Logger.getLogger(record.getSourceClassName()).debug(msg); - } - else if (record.getLevel() == Level.FINER || record.getLevel() == Level.FINEST) - { - Logger.getLogger(record.getSourceClassName()).trace(msg); - } - else - { - Logger.getLogger(record.getSourceClassName()).debug(msg); - } - } - - @Override - public boolean isLoggable(LogRecord record) - { - if (record == null) - { - return false; - } - return super.isLoggable(record); - } - - @Override - public void flush() - { - //nothing to do - } - - @Override - public void close() throws SecurityException - { - //nothing to do - } - -} \ No newline at end of file Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java (from rev 3581, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,116 @@ +/* + * 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.wsf.spi.utils.log; + +import java.util.logging.ErrorManager; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.SimpleFormatter; + +import org.jboss.logging.Logger; + +/** + * A Handler (java.util.logging.Handler) class redirecting messages + * to the jboss logging system. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> + * @since 14-Jun-2007 + * + */ +public class JBossLogHandler extends Handler +{ + + public JBossLogHandler() + { + super.setFormatter(new SimpleFormatter()); + } + + @Override + public void publish(LogRecord record) + { + if (!isLoggable(record)) + { + return; + } + String msg; + try + { + msg = getFormatter().formatMessage(record); + } + catch (Exception ex) + { + // We don't want to throw an exception here, but we + // report the exception to any registered ErrorManager. + reportError(null, ex, ErrorManager.FORMAT_FAILURE); + return; + } + if (record.getLevel() == Level.INFO) + { + Logger.getLogger(record.getSourceClassName()).info(msg); + } + else if (record.getLevel() == Level.SEVERE) + { + Logger.getLogger(record.getSourceClassName()).error(msg); + } + else if (record.getLevel() == Level.WARNING) + { + Logger.getLogger(record.getSourceClassName()).warn(msg); + } + else if (record.getLevel() == Level.FINE) + { + Logger.getLogger(record.getSourceClassName()).debug(msg); + } + else if (record.getLevel() == Level.FINER || record.getLevel() == Level.FINEST) + { + Logger.getLogger(record.getSourceClassName()).trace(msg); + } + else + { + Logger.getLogger(record.getSourceClassName()).debug(msg); + } + } + + @Override + public boolean isLoggable(LogRecord record) + { + if (record == null) + { + return false; + } + return super.isLoggable(record); + } + + @Override + public void flush() + { + //nothing to do + } + + @Override + public void close() throws SecurityException + { + //nothing to do + } + +} \ No newline at end of file Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java =================================================================== --- branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java 2007-06-14 12:50:56 UTC (rev 3581) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,112 +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.wsf.spi.utils.log; - -import java.util.LinkedList; -import java.util.List; -import java.util.logging.Filter; -import java.util.logging.Handler; -import java.util.logging.Level; - -import org.jboss.logging.Logger; - -/** - * Redirects JDK Logger output to the JBoss Logger. - * - * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> - * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> - * @since 14-Jun-2007 - * - */ -public class JDKLogRedirector -{ - private List<String> namespaces = new LinkedList<String>(); - - public JDKLogRedirector() - { - } - - public void changeHandlers() - { - for (String ns : namespaces) - { - changeHandler(ns); - } - } - - /** - * Modifies the jdk root logger in order not to log records coming from - * loggers with the provided namespace; these records are then logged - * through the JBoss Logger. - * - * @param ns - */ - public void changeHandler(String ns) - { - if (ns == null) - ns = ""; - Logger.getLogger(this.getClass()).info("Changing current root logger's log handlers to hide logs with namespace " + ns); - java.util.logging.Logger jdkRootLogger = java.util.logging.Logger.getLogger(""); - Handler[] handlers = jdkRootLogger.getHandlers(); - for (int i = 0; i < handlers.length; i++) - { - Handler handler = handlers[i]; - if (!(handler instanceof JBossLogHandler)) - { - StringBuffer sb = new StringBuffer("Disableing handler "); - sb.append(handler).append(" with level ").append(handler.getLevel()); - Logger.getLogger(this.getClass()).debug(sb); - Filter f = handler.getFilter(); - if (f != null && f instanceof NamespaceFilter) - { - ((NamespaceFilter)f).addNamespace(ns); - } - else - { - NamespaceFilter nsFilter = new NamespaceFilter(false); - nsFilter.addNamespace(ns); - handler.setFilter(nsFilter); - } - } - } - Handler jbossLogHandler = new JBossLogHandler(); - jbossLogHandler.setLevel(Level.ALL); - java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler); - } - - public void addNamespace(String ns) - { - namespaces.add(ns); - changeHandler(ns); - } - - public List<String> getNamespaces() - { - return namespaces; - } - - public void setNamespaces(List<String> namespaces) - { - this.namespaces = namespaces; - changeHandlers(); - } -} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java (from rev 3581, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,112 @@ +/* + * 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.wsf.spi.utils.log; + +import java.util.LinkedList; +import java.util.List; +import java.util.logging.Filter; +import java.util.logging.Handler; +import java.util.logging.Level; + +import org.jboss.logging.Logger; + +/** + * Redirects JDK Logger output to the JBoss Logger. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> + * @since 14-Jun-2007 + * + */ +public class JDKLogRedirector +{ + private List<String> namespaces = new LinkedList<String>(); + + public JDKLogRedirector() + { + } + + public void changeHandlers() + { + for (String ns : namespaces) + { + changeHandler(ns); + } + } + + /** + * Modifies the jdk root logger in order not to log records coming from + * loggers with the provided namespace; these records are then logged + * through the JBoss Logger. + * + * @param ns + */ + public void changeHandler(String ns) + { + if (ns == null) + ns = ""; + Logger.getLogger(this.getClass()).info("Changing current root logger's log handlers to hide logs with namespace " + ns); + java.util.logging.Logger jdkRootLogger = java.util.logging.Logger.getLogger(""); + Handler[] handlers = jdkRootLogger.getHandlers(); + for (int i = 0; i < handlers.length; i++) + { + Handler handler = handlers[i]; + if (!(handler instanceof JBossLogHandler)) + { + StringBuffer sb = new StringBuffer("Disableing handler "); + sb.append(handler).append(" with level ").append(handler.getLevel()); + Logger.getLogger(this.getClass()).debug(sb); + Filter f = handler.getFilter(); + if (f != null && f instanceof NamespaceFilter) + { + ((NamespaceFilter)f).addNamespace(ns); + } + else + { + NamespaceFilter nsFilter = new NamespaceFilter(false); + nsFilter.addNamespace(ns); + handler.setFilter(nsFilter); + } + } + } + Handler jbossLogHandler = new JBossLogHandler(); + jbossLogHandler.setLevel(Level.ALL); + java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler); + } + + public void addNamespace(String ns) + { + namespaces.add(ns); + changeHandler(ns); + } + + public List<String> getNamespaces() + { + return namespaces; + } + + public void setNamespaces(List<String> namespaces) + { + this.namespaces = namespaces; + changeHandlers(); + } +} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java =================================================================== --- branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java 2007-06-14 12:50:56 UTC (rev 3581) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,96 +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.wsf.spi.utils.log; - -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.logging.Filter; -import java.util.logging.LogRecord; - -/** - * A log filter allowing logging of LogRecord depending on the - * namespace of the Logger they have been collected by. - * - * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> - * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> - * @since 14-Jun-2007 - * - */ -public class NamespaceFilter implements Filter -{ - - private Set<String> namespaces; - private boolean show; - - public NamespaceFilter(boolean show) - { - this.show = show; - } - - public boolean isLoggable(LogRecord record) - { - String loggerName = record.getLoggerName(); - if (loggerName == null) - { - return true; - } - else - { - for (String ns : namespaces) - { - if (loggerName.startsWith(ns)) - { - return show; - } - } - return !show; - } - } - - public void addNamespace(String ns) - { - if (namespaces == null) - namespaces = new LinkedHashSet<String>(); - namespaces.add(ns); - } - - public Set<String> getNamespaces() - { - return namespaces; - } - - public void setNamespaces(Set<String> namespaces) - { - this.namespaces = namespaces; - } - - public boolean isShow() - { - return show; - } - - public void setShow(boolean show) - { - this.show = show; - } - -} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java (from rev 3581, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,96 @@ +/* + * 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.wsf.spi.utils.log; + +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.logging.Filter; +import java.util.logging.LogRecord; + +/** + * A log filter allowing logging of LogRecord depending on the + * namespace of the Logger they have been collected by. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> + * @since 14-Jun-2007 + * + */ +public class NamespaceFilter implements Filter +{ + + private Set<String> namespaces; + private boolean show; + + public NamespaceFilter(boolean show) + { + this.show = show; + } + + public boolean isLoggable(LogRecord record) + { + String loggerName = record.getLoggerName(); + if (loggerName == null) + { + return true; + } + else + { + for (String ns : namespaces) + { + if (loggerName.startsWith(ns)) + { + return show; + } + } + return !show; + } + } + + public void addNamespace(String ns) + { + if (namespaces == null) + namespaces = new LinkedHashSet<String>(); + namespaces.add(ns); + } + + public Set<String> getNamespaces() + { + return namespaces; + } + + public void setNamespaces(Set<String> namespaces) + { + this.namespaces = namespaces; + } + + public boolean isShow() + { + return show; + } + + public void setShow(boolean show) + { + this.show = show; + } + +} Modified: trunk/integration/sunri/.classpath =================================================================== --- trunk/integration/sunri/.classpath 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/.classpath 2007-06-22 08:30:37 UTC (rev 3683) @@ -24,5 +24,6 @@ <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/> + <classpathentry kind="lib" path="/dati/jboss-4.2.0.CR2/lib/jboss-common.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -42,6 +42,7 @@ <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/wsdl4j.jar"/> </path> <path id="tests.extra.classpath"> Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -65,7 +65,8 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-ri-src.jar" dest="${thirdparty.dir}/jaxws-ri-src.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> - + <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> + <checksum file="${int.sunri.dir}/version.properties" fileext=".md5"/> </target> Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/build.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -118,7 +118,8 @@ <exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/> <include name="org/jboss/wsf/stack/sunri50/**"/> <include name="org/jboss/wsf/stack/sunri/metadata/**"/> - <include name="org/jboss/wsf/stack/sunri/*"/> + <include name="org/jboss/wsf/stack/sunri/log/**"/> + <include name="org/jboss/wsf/stack/sunri/*"/> </fileset> </jar> Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -28,6 +28,7 @@ import javax.xml.ws.Provider; import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.EndpointAssociation; @@ -50,6 +51,8 @@ public class InvokerEJB3 extends Invoker { private final InstanceResolver resolver; + + private WSWebServiceContext wsc; public InvokerEJB3(InstanceResolver resolver) { @@ -60,6 +63,7 @@ public void start(@NotNull WSWebServiceContext wsc, @NotNull WSEndpoint endpoint) { resolver.start(wsc, endpoint); + this.wsc = wsc; } @Override @@ -82,6 +86,9 @@ InvocationHandler invHandler = ep.getInvocationHandler(); Invocation inv = invHandler.createInvocation(); + + inv.getInvocationContext().addAttachment(MessageContext.class, wsc.getMessageContext()); + inv.setJavaMethod(m); inv.setArgs(args); Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log (from rev 3619, branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log) Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java =================================================================== --- branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,147 +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.wsf.stack.sunri.log; - -import java.util.Map; -import java.util.logging.ErrorManager; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.SimpleFormatter; - -import org.jboss.logging.Logger; - -/** - * A Handler (java.util.logging.Handler) class redirecting messages - * to the jboss logging system. - * - * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> - * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> - * @since 14-Jun-2007 - * - */ -public class JBossLogHandler extends Handler -{ - private Map<String, String> levelMap; - private String defaultLevel; - - public JBossLogHandler(Map<String, String> levelMap, String defaultLevel) - { - super.setFormatter(new SimpleFormatter()); - this.levelMap = levelMap; - this.defaultLevel = defaultLevel; - } - - @Override - public void publish(LogRecord record) - { - if (!isLoggable(record)) - { - return; - } - String msg; - try - { - msg = getFormatter().formatMessage(record); - } - catch (Exception ex) - { - // We don't want to throw an exception here, but we - // report the exception to any registered ErrorManager. - reportError(null, ex, ErrorManager.FORMAT_FAILURE); - return; - } - - String level = levelMap.get(record.getLevel().getName()); - level = level == null ? levelMap.get(record.getLevel().getName().toUpperCase()): level; - level = level == null ? defaultLevel : level; - if ("info".equalsIgnoreCase(level)) - { - if (Logger.getLogger(record.getSourceClassName()).isInfoEnabled()) - { - Logger.getLogger(record.getSourceClassName()).info(msg); - } - else - { - Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); - } - - } - else if ("error".equalsIgnoreCase(level)) - { - Logger.getLogger(record.getSourceClassName()).error(msg); - } - else if ("warn".equalsIgnoreCase(level)) - { - Logger.getLogger(record.getSourceClassName()).warn(msg); - } - else if ("debug".equalsIgnoreCase(level)) - { - if (Logger.getLogger(record.getSourceClassName()).isDebugEnabled()) - { - Logger.getLogger(record.getSourceClassName()).debug(msg); - } - else - { - Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); - } - } - else if ("trace".equalsIgnoreCase(level)) - { - if (Logger.getLogger(record.getSourceClassName()).isTraceEnabled()) - { - Logger.getLogger(record.getSourceClassName()).trace(msg); - } - else - { - Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); - } - } - else - { - Logger.getLogger(record.getSourceClassName()).warn("[WAS-UNKNOWN]" + msg); - } - } - - @Override - public boolean isLoggable(LogRecord record) - { - if (record == null) - { - return false; - } - return super.isLoggable(record); - } - - @Override - public void flush() - { - //nothing to do - } - - @Override - public void close() throws SecurityException - { - //nothing to do - } - -} \ No newline at end of file Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java (from rev 3619, branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,147 @@ +/* + * 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.wsf.stack.sunri.log; + +import java.util.Map; +import java.util.logging.ErrorManager; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.SimpleFormatter; + +import org.jboss.logging.Logger; + +/** + * A Handler (java.util.logging.Handler) class redirecting messages + * to the jboss logging system. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> + * @since 14-Jun-2007 + * + */ +public class JBossLogHandler extends Handler +{ + private Map<String, String> levelMap; + private String defaultLevel; + + public JBossLogHandler(Map<String, String> levelMap, String defaultLevel) + { + super.setFormatter(new SimpleFormatter()); + this.levelMap = levelMap; + this.defaultLevel = defaultLevel; + } + + @Override + public void publish(LogRecord record) + { + if (!isLoggable(record)) + { + return; + } + String msg; + try + { + msg = getFormatter().formatMessage(record); + } + catch (Exception ex) + { + // We don't want to throw an exception here, but we + // report the exception to any registered ErrorManager. + reportError(null, ex, ErrorManager.FORMAT_FAILURE); + return; + } + + String level = levelMap.get(record.getLevel().getName()); + level = level == null ? levelMap.get(record.getLevel().getName().toUpperCase()): level; + level = level == null ? defaultLevel : level; + if ("info".equalsIgnoreCase(level)) + { + if (Logger.getLogger(record.getSourceClassName()).isInfoEnabled()) + { + Logger.getLogger(record.getSourceClassName()).info(msg); + } + else + { + Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); + } + + } + else if ("error".equalsIgnoreCase(level)) + { + Logger.getLogger(record.getSourceClassName()).error(msg); + } + else if ("warn".equalsIgnoreCase(level)) + { + Logger.getLogger(record.getSourceClassName()).warn(msg); + } + else if ("debug".equalsIgnoreCase(level)) + { + if (Logger.getLogger(record.getSourceClassName()).isDebugEnabled()) + { + Logger.getLogger(record.getSourceClassName()).debug(msg); + } + else + { + Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); + } + } + else if ("trace".equalsIgnoreCase(level)) + { + if (Logger.getLogger(record.getSourceClassName()).isTraceEnabled()) + { + Logger.getLogger(record.getSourceClassName()).trace(msg); + } + else + { + Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); + } + } + else + { + Logger.getLogger(record.getSourceClassName()).warn("[WAS-UNKNOWN]" + msg); + } + } + + @Override + public boolean isLoggable(LogRecord record) + { + if (record == null) + { + return false; + } + return super.isLoggable(record); + } + + @Override + public void flush() + { + //nothing to do + } + + @Override + public void close() throws SecurityException + { + //nothing to do + } + +} \ No newline at end of file Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java =================================================================== --- branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,148 +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.wsf.stack.sunri.log; - -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.logging.Filter; -import java.util.logging.Handler; -import java.util.logging.Level; - -import org.jboss.logging.Logger; - -/** - * Redirects JDK Logger output to the JBoss Logger. - * - * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> - * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> - * @since 14-Jun-2007 - * - */ -public class JDKLogRedirector -{ - private List<String> namespaces = new LinkedList<String>(); - private Map<String, String> levelMapping = new HashMap<String, String>(); - private String defaultLevel; - private static Logger myLogger = Logger.getLogger(JDKLogRedirector.class); - - public JDKLogRedirector() - { - } - - public void changeHandlers() - { - - for (String ns : namespaces) - { - changeHandler(ns); - } - } - - /** - * Modifies the jdk root logger in order not to log records coming from - * loggers with the provided namespace; these records are then logged - * through the JBoss Logger. - * - * @param ns - */ - public void changeHandler(String ns) - { - if (ns == null) - ns = ""; - myLogger.debug("Changing current root logger's log handlers to hide records with namespace " + ns); - java.util.logging.Logger jdkRootLogger = java.util.logging.Logger.getLogger(""); - Handler[] handlers = jdkRootLogger.getHandlers(); - for (int i = 0; i < handlers.length; i++) - { - Handler handler = handlers[i]; - if (!(handler instanceof JBossLogHandler)) - { - StringBuffer sb = new StringBuffer("Disableing handler "); - sb.append(handler).append(" with level ").append(handler.getLevel()); - myLogger.debug(sb); - Filter f = handler.getFilter(); - if (f != null && f instanceof NamespaceFilter) - { - ((NamespaceFilter)f).addNamespace(ns); - } - else - { - NamespaceFilter nsFilter = new NamespaceFilter(false); - nsFilter.addNamespace(ns); - handler.setFilter(nsFilter); - } - } - } - myLogger.debug("Adding JBossLogHandler to log records with namespace " + ns); - Handler jbossLogHandler = new JBossLogHandler(levelMapping, defaultLevel); - jbossLogHandler.setLevel(Level.ALL); - java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler); - } - - public void addNamespace(String ns) - { - namespaces.add(ns); - } - - public List<String> getNamespaces() - { - return namespaces; - } - - public void setNamespaces(List<String> namespaces) - { - this.namespaces = namespaces; - } - - public String getDefaultLevel() - { - return defaultLevel; - } - - public void setDefaultLevel(String defaultLevel) - { - this.defaultLevel = defaultLevel; - - } - - public Map<String, String> getLevelMapping() - { - return levelMapping; - } - - public void setLevelMapping(Map<String, String> levelMapping) - { - this.levelMapping = levelMapping; - } - - public String putLevelMappingEntry(String key, String value) - { - return levelMapping.put(key, value); - } - - public void start() - { - changeHandlers(); - } -} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java (from rev 3619, branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,148 @@ +/* + * 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.wsf.stack.sunri.log; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.logging.Filter; +import java.util.logging.Handler; +import java.util.logging.Level; + +import org.jboss.logging.Logger; + +/** + * Redirects JDK Logger output to the JBoss Logger. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> + * @since 14-Jun-2007 + * + */ +public class JDKLogRedirector +{ + private List<String> namespaces = new LinkedList<String>(); + private Map<String, String> levelMapping = new HashMap<String, String>(); + private String defaultLevel; + private static Logger myLogger = Logger.getLogger(JDKLogRedirector.class); + + public JDKLogRedirector() + { + } + + public void changeHandlers() + { + + for (String ns : namespaces) + { + changeHandler(ns); + } + } + + /** + * Modifies the jdk root logger in order not to log records coming from + * loggers with the provided namespace; these records are then logged + * through the JBoss Logger. + * + * @param ns + */ + public void changeHandler(String ns) + { + if (ns == null) + ns = ""; + myLogger.debug("Changing current root logger's log handlers to hide records with namespace " + ns); + java.util.logging.Logger jdkRootLogger = java.util.logging.Logger.getLogger(""); + Handler[] handlers = jdkRootLogger.getHandlers(); + for (int i = 0; i < handlers.length; i++) + { + Handler handler = handlers[i]; + if (!(handler instanceof JBossLogHandler)) + { + StringBuffer sb = new StringBuffer("Disableing handler "); + sb.append(handler).append(" with level ").append(handler.getLevel()); + myLogger.debug(sb); + Filter f = handler.getFilter(); + if (f != null && f instanceof NamespaceFilter) + { + ((NamespaceFilter)f).addNamespace(ns); + } + else + { + NamespaceFilter nsFilter = new NamespaceFilter(false); + nsFilter.addNamespace(ns); + handler.setFilter(nsFilter); + } + } + } + myLogger.debug("Adding JBossLogHandler to log records with namespace " + ns); + Handler jbossLogHandler = new JBossLogHandler(levelMapping, defaultLevel); + jbossLogHandler.setLevel(Level.ALL); + java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler); + } + + public void addNamespace(String ns) + { + namespaces.add(ns); + } + + public List<String> getNamespaces() + { + return namespaces; + } + + public void setNamespaces(List<String> namespaces) + { + this.namespaces = namespaces; + } + + public String getDefaultLevel() + { + return defaultLevel; + } + + public void setDefaultLevel(String defaultLevel) + { + this.defaultLevel = defaultLevel; + + } + + public Map<String, String> getLevelMapping() + { + return levelMapping; + } + + public void setLevelMapping(Map<String, String> levelMapping) + { + this.levelMapping = levelMapping; + } + + public String putLevelMappingEntry(String key, String value) + { + return levelMapping.put(key, value); + } + + public void start() + { + changeHandlers(); + } +} Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java =================================================================== --- branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,96 +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.wsf.stack.sunri.log; - -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.logging.Filter; -import java.util.logging.LogRecord; - -/** - * A log filter allowing logging of LogRecord depending on the - * namespace of the Logger they have been collected by. - * - * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> - * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> - * @since 14-Jun-2007 - * - */ -public class NamespaceFilter implements Filter -{ - - private Set<String> namespaces; - private boolean show; - - public NamespaceFilter(boolean show) - { - this.show = show; - } - - public boolean isLoggable(LogRecord record) - { - String loggerName = record.getLoggerName(); - if (loggerName == null) - { - return true; - } - else - { - for (String ns : namespaces) - { - if (loggerName.startsWith(ns)) - { - return show; - } - } - return !show; - } - } - - public void addNamespace(String ns) - { - if (namespaces == null) - namespaces = new LinkedHashSet<String>(); - namespaces.add(ns); - } - - public Set<String> getNamespaces() - { - return namespaces; - } - - public void setNamespaces(Set<String> namespaces) - { - this.namespaces = namespaces; - } - - public boolean isShow() - { - return show; - } - - public void setShow(boolean show) - { - this.show = show; - } - -} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java (from rev 3619, branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,96 @@ +/* + * 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.wsf.stack.sunri.log; + +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.logging.Filter; +import java.util.logging.LogRecord; + +/** + * A log filter allowing logging of LogRecord depending on the + * namespace of the Logger they have been collected by. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> + * @since 14-Jun-2007 + * + */ +public class NamespaceFilter implements Filter +{ + + private Set<String> namespaces; + private boolean show; + + public NamespaceFilter(boolean show) + { + this.show = show; + } + + public boolean isLoggable(LogRecord record) + { + String loggerName = record.getLoggerName(); + if (loggerName == null) + { + return true; + } + else + { + for (String ns : namespaces) + { + if (loggerName.startsWith(ns)) + { + return show; + } + } + return !show; + } + } + + public void addNamespace(String ns) + { + if (namespaces == null) + namespaces = new LinkedHashSet<String>(); + namespaces.add(ns); + } + + public Set<String> getNamespaces() + { + return namespaces; + } + + public void setNamespaces(Set<String> namespaces) + { + this.namespaces = namespaces; + } + + public boolean isShow() + { + return show; + } + + public void setShow(boolean show) + { + this.show = show; + } + +} Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -122,6 +122,7 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.BasicInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> @@ -213,5 +214,25 @@ </list> </property> </bean> - + + <bean name="JDKLogRedirector" class="org.jboss.wsf.stack.sunri.log.JDKLogRedirector"> + <property name="namespaces"> + <list class="java.util.LinkedList" elementClass="java.lang.String"> + <value>javax.enterprise.resource.webservices.jaxws</value> + <value>com.sun</value> + </list> + </property> + <property name="levelMapping"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>INFO</key><value>info</value></entry> + <entry><key>SEVERE</key><value>error</value></entry> + <entry><key>WARNING</key><value>warn</value></entry> + <entry><key>FINE</key><value>debug</value></entry> + <entry><key>FINER</key><value>trace</value></entry> + <entry><key>FINEST</key><value>trace</value></entry> + </map> + </property> + <property name="defaultLevel">debug</property> + </bean> + </deployment> \ No newline at end of file Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -133,6 +133,7 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.BasicInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> @@ -244,5 +245,25 @@ </uninstall> <depends>WebServiceMainDeployer</depends> </bean> + + <bean name="JDKLogRedirector" class="org.jboss.wsf.stack.sunri.log.JDKLogRedirector"> + <property name="namespaces"> + <list class="java.util.LinkedList" elementClass="java.lang.String"> + <value>javax.enterprise.resource.webservices.jaxws</value> + <value>com.sun</value> + </list> + </property> + <property name="levelMapping"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>INFO</key><value>info</value></entry> + <entry><key>SEVERE</key><value>error</value></entry> + <entry><key>WARNING</key><value>warn</value></entry> + <entry><key>FINE</key><value>debug</value></entry> + <entry><key>FINER</key><value>trace</value></entry> + <entry><key>FINEST</key><value>trace</value></entry> + </map> + </property> + <property name="defaultLevel">debug</property> + </bean> </deployment> Modified: trunk/integration/sunri/src/test/resources/test-excludes.txt =================================================================== --- trunk/integration/sunri/src/test/resources/test-excludes.txt 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/src/test/resources/test-excludes.txt 2007-06-22 08:30:37 UTC (rev 3683) @@ -12,7 +12,7 @@ ################################################################### # [JBWS-1669] Fix WebServiceContext.getMessageContext() -org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java +#org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java # [JBWS-1673] Fix JAXR samples for SunRI org/jboss/test/ws/jaxws/samples/jaxr/** Modified: trunk/integration/sunri/version.properties =================================================================== --- trunk/integration/sunri/version.properties 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/version.properties 2007-06-22 08:30:37 UTC (rev 3683) @@ -7,4 +7,4 @@ jboss-security-spi=2.0.0.Beta sun-jaxws=2.1.1 sun-servlet=2.5 - +ibm-wsdl4j=1.6.2 Modified: trunk/integration/xfire/.classpath =================================================================== --- trunk/integration/xfire/.classpath 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/xfire/.classpath 2007-06-22 08:30:37 UTC (rev 3683) @@ -17,5 +17,6 @@ <classpathentry kind="lib" path="thirdparty/xbean-spring.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> + <classpathentry kind="lib" path="thirdparty/commons-logging-1.1.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -48,6 +48,7 @@ <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/wsdl4j.jar"/> </path> <path id="xfire.classpath"> Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -61,6 +61,7 @@ <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-all.jar" dest="${thirdparty.dir}/xfire-all.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-distribution-sources.jar" dest="${thirdparty.dir}/xfire-distribution-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-jsr181-api.jar" dest="${thirdparty.dir}/xfire-jsr181-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <checksum file="${int.xfire.dir}/version.properties" fileext=".md5"/> </target> Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -122,6 +122,7 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -133,6 +133,7 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> Modified: trunk/testsuite/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -82,10 +82,10 @@  <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/exception/jaxws/**"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/UserException.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws/**"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/server/UserException.class"/> </classes> </war> Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,34 +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.ws.jaxws.samples.exception; - -import javax.jws.WebService; - -@WebService -public interface ExceptionEndpoint -{ - public void throwRuntimeException(); - - public void throwSoapFaultException(); - - public void throwApplicationException() throws UserException; -} \ No newline at end of file Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,60 +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.ws.jaxws.samples.exception; - -import javax.jws.WebService; -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFactory; -import javax.xml.soap.SOAPFault; -import javax.xml.ws.soap.SOAPFaultException; - -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.exception.ExceptionEndpoint") -public class ExceptionEndpointImpl implements ExceptionEndpoint -{ - public void throwRuntimeException() - { - throw new RuntimeException("oh no, a runtime exception occured."); - } - - public void throwSoapFaultException() - { - // This should be thrown as-is - try - { - SOAPFactory factory = SOAPFactory.newInstance(); - SOAPFault fault = factory.createFault("this is a fault string!", new QName("http://foo", "FooCode")); - fault.setFaultActor("mr.actor"); - fault.addDetail().addChildElement("test"); - throw new SOAPFaultException(fault); - } - catch (SOAPException s) - { - throw new RuntimeException(s); - } - } - - public void throwApplicationException() throws UserException - { - throw new UserException("validation", 123, "Some validation error"); - } -} Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -29,6 +29,9 @@ import junit.framework.Test; +import org.jboss.test.ws.jaxws.samples.exception.client.ExceptionEndpoint; +import org.jboss.test.ws.jaxws.samples.exception.client.UserException; +import org.jboss.test.ws.jaxws.samples.exception.client.UserException_Exception; import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.w3c.dom.Element; @@ -41,7 +44,7 @@ */ public class ExceptionTestCase extends JBossWSTest { - private String targetNS = "http://exception.samples.jaxws.ws.test.jboss.org/"; + private String targetNS = "http://server.exception.samples.jaxws.ws.test.jboss.org/"; private ExceptionEndpoint proxy; public static Test suite() @@ -111,22 +114,17 @@ public void testApplicationException() throws Exception { - if (isIntegrationSunRI()) - { - System.out.println("FIXME: [JBWS-1670] SunRI client does not throw UserException"); - return; - } - try { proxy.throwApplicationException(); fail("Expected UserException"); } - catch (UserException e) + catch (UserException_Exception e) { - assertEquals("Some validation error", e.getMessage()); - assertEquals("validation", e.getErrorCategory()); - assertEquals(123, e.getErrorCode()); + UserException ue = e.getFaultInfo(); + assertEquals("Some validation error", ue.getMessage()); + assertEquals("validation", ue.getErrorCategory()); + assertEquals(123, ue.getErrorCode()); } } } \ No newline at end of file Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/UserException.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/UserException.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/UserException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,55 +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.ws.jaxws.samples.exception; - -import javax.xml.ws.WebFault; - -/** - * A mach application exception - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -@WebFault(faultBean="org.jboss.test.ws.jaxws.samples.exception.jaxws.UserExceptionBean") -public class UserException extends Exception -{ - private int errorCode; - private String errorCategory; - - public UserException(String errorCategory, int errorCode, String message) - { - super(message); - - this.errorCategory = errorCategory; - this.errorCode = errorCode; - } - - public String getErrorCategory() - { - return errorCategory; - } - - public int getErrorCode() - { - return errorCode; - } -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client) Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,41 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; - - -@WebService(name = "ExceptionEndpoint", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/") -public interface ExceptionEndpoint { - - - /** - * - */ - @WebMethod - @RequestWrapper(localName = "throwRuntimeException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowRuntimeException") - @ResponseWrapper(localName = "throwRuntimeExceptionResponse", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowRuntimeExceptionResponse") - public void throwRuntimeException(); - - /** - * - */ - @WebMethod - @RequestWrapper(localName = "throwSoapFaultException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowSoapFaultException") - @ResponseWrapper(localName = "throwSoapFaultExceptionResponse", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowSoapFaultExceptionResponse") - public void throwSoapFaultException(); - - /** - * - * @throws UserException_Exception - */ - @WebMethod - @RequestWrapper(localName = "throwApplicationException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowApplicationException") - @ResponseWrapper(localName = "throwApplicationExceptionResponse", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowApplicationExceptionResponse") - public void throwApplicationException() - throws UserException_Exception - ; - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,41 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + + +@WebService(name = "ExceptionEndpoint", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/") +public interface ExceptionEndpoint { + + + /** + * + */ + @WebMethod + @RequestWrapper(localName = "throwRuntimeException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowRuntimeException") + @ResponseWrapper(localName = "throwRuntimeExceptionResponse", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowRuntimeExceptionResponse") + public void throwRuntimeException(); + + /** + * + */ + @WebMethod + @RequestWrapper(localName = "throwSoapFaultException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowSoapFaultException") + @ResponseWrapper(localName = "throwSoapFaultExceptionResponse", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowSoapFaultExceptionResponse") + public void throwSoapFaultException(); + + /** + * + * @throws UserException_Exception + */ + @WebMethod + @RequestWrapper(localName = "throwApplicationException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowApplicationException") + @ResponseWrapper(localName = "throwApplicationExceptionResponse", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowApplicationExceptionResponse") + public void throwApplicationException() + throws UserException_Exception + ; + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,32 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for throwApplicationException complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="throwApplicationException"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "throwApplicationException") -public class ThrowApplicationException { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,32 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for throwApplicationException complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="throwApplicationException"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "throwApplicationException") +public class ThrowApplicationException { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,32 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for throwApplicationExceptionResponse complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="throwApplicationExceptionResponse"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "throwApplicationExceptionResponse") -public class ThrowApplicationExceptionResponse { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,32 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for throwApplicationExceptionResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="throwApplicationExceptionResponse"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "throwApplicationExceptionResponse") +public class ThrowApplicationExceptionResponse { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,32 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for throwRuntimeException complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="throwRuntimeException"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "throwRuntimeException") -public class ThrowRuntimeException { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,32 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for throwRuntimeException complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="throwRuntimeException"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "throwRuntimeException") +public class ThrowRuntimeException { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,32 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for throwRuntimeExceptionResponse complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="throwRuntimeExceptionResponse"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "throwRuntimeExceptionResponse") -public class ThrowRuntimeExceptionResponse { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,32 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for throwRuntimeExceptionResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="throwRuntimeExceptionResponse"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "throwRuntimeExceptionResponse") +public class ThrowRuntimeExceptionResponse { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,32 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for throwSoapFaultException complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="throwSoapFaultException"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "throwSoapFaultException") -public class ThrowSoapFaultException { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,32 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for throwSoapFaultException complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="throwSoapFaultException"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "throwSoapFaultException") +public class ThrowSoapFaultException { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,32 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for throwSoapFaultExceptionResponse complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="throwSoapFaultExceptionResponse"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "throwSoapFaultExceptionResponse") -public class ThrowSoapFaultExceptionResponse { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,32 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for throwSoapFaultExceptionResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="throwSoapFaultExceptionResponse"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "throwSoapFaultExceptionResponse") +public class ThrowSoapFaultExceptionResponse { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,106 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for UserException complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="UserException"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="errorCategory" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="errorCode" type="{http://www.w3.org/2001/XMLSchema}int"/> - * <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "UserException", propOrder = { - "errorCategory", - "errorCode", - "message" -}) -public class UserException { - - protected String errorCategory; - protected int errorCode; - protected String message; - - /** - * Gets the value of the errorCategory property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getErrorCategory() { - return errorCategory; - } - - /** - * Sets the value of the errorCategory property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setErrorCategory(String value) { - this.errorCategory = value; - } - - /** - * Gets the value of the errorCode property. - * - */ - public int getErrorCode() { - return errorCode; - } - - /** - * Sets the value of the errorCode property. - * - */ - public void setErrorCode(int value) { - this.errorCode = value; - } - - /** - * Gets the value of the message property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getMessage() { - return message; - } - - /** - * Sets the value of the message property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setMessage(String value) { - this.message = value; - } - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,106 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for UserException complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="UserException"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="errorCategory" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="errorCode" type="{http://www.w3.org/2001/XMLSchema}int"/> + * <element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "UserException", propOrder = { + "errorCategory", + "errorCode", + "message" +}) +public class UserException { + + protected String errorCategory; + protected int errorCode; + protected String message; + + /** + * Gets the value of the errorCategory property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getErrorCategory() { + return errorCategory; + } + + /** + * Sets the value of the errorCategory property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setErrorCategory(String value) { + this.errorCategory = value; + } + + /** + * Gets the value of the errorCode property. + * + */ + public int getErrorCode() { + return errorCode; + } + + /** + * Sets the value of the errorCode property. + * + */ + public void setErrorCode(int value) { + this.errorCode = value; + } + + /** + * Gets the value of the message property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * Sets the value of the message property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,48 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.ws.WebFault; - - -@WebFault(name = "UserException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/") -public class UserException_Exception - extends Exception -{ - - /** - * Java type that goes as soapenv:Fault detail element. - * - */ - private UserException faultInfo; - - /** - * - * @param faultInfo - * @param message - */ - public UserException_Exception(String message, UserException faultInfo) { - super(message); - this.faultInfo = faultInfo; - } - - /** - * - * @param faultInfo - * @param message - * @param cause - */ - public UserException_Exception(String message, UserException faultInfo, Throwable cause) { - super(message, cause); - this.faultInfo = faultInfo; - } - - /** - * - * @return - * returns fault bean: org.jboss.test.ws.jaxws.samples.exception.client.UserException - */ - public UserException getFaultInfo() { - return faultInfo; - } - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,48 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.ws.WebFault; + + +@WebFault(name = "UserException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/") +public class UserException_Exception + extends Exception +{ + + /** + * Java type that goes as soapenv:Fault detail element. + * + */ + private UserException faultInfo; + + /** + * + * @param faultInfo + * @param message + */ + public UserException_Exception(String message, UserException faultInfo) { + super(message); + this.faultInfo = faultInfo; + } + + /** + * + * @param faultInfo + * @param message + * @param cause + */ + public UserException_Exception(String message, UserException faultInfo, Throwable cause) { + super(message, cause); + this.faultInfo = faultInfo; + } + + /** + * + * @return + * returns fault bean: org.jboss.test.ws.jaxws.samples.exception.client.UserException + */ + public UserException getFaultInfo() { + return faultInfo; + } + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,2 +0,0 @@ -(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/") -package org.jboss.test.ws.jaxws.samples.exception.client; Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/") +package org.jboss.test.ws.jaxws.samples.exception.client; Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationException.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationException.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationException") -@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationException") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowApplicationException { - - -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationExceptionResponse.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationExceptionResponse.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationExceptionResponse") -@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationExceptionResponse") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowApplicationExceptionResponse { - - -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeException.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeException.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeException") -@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeException") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowRuntimeException { - - -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeExceptionResponse.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeExceptionResponse.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeExceptionResponse") -@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeExceptionResponse") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowRuntimeExceptionResponse { - - -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultException.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultException.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultException") -@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultException") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowSoapFaultException { - - -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultExceptionResponse.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultExceptionResponse.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultExceptionResponse") -@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultExceptionResponse") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowSoapFaultExceptionResponse { - - -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/UserExceptionBean.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/UserExceptionBean.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/UserExceptionBean.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,50 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "UserException") -@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "UserException", propOrder = { - "errorCategory", - "errorCode", - "message" -}) -(a)XmlAccessorType(XmlAccessType.FIELD) -public class UserExceptionBean { - - @XmlElement(namespace = "", name = "errorCategory") - private String errorCategory; - @XmlElement(namespace = "", name = "errorCode") - private int errorCode; - @XmlElement(namespace = "", name = "message") - private String message; - - public String getErrorCategory() { - return this.errorCategory; - } - - public void setErrorCategory(String errorCategory) { - this.errorCategory = errorCategory; - } - - public int getErrorCode() { - return this.errorCode; - } - - public void setErrorCode(int errorCode) { - this.errorCode = errorCode; - } - - public String getMessage() { - return this.message; - } - - public void setMessage(String message) { - this.message = message; - } - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server) Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,35 +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.ws.jaxws.samples.exception.server; - -import javax.jws.WebService; - - -@WebService -public interface ExceptionEndpoint -{ - public void throwRuntimeException(); - - public void throwSoapFaultException(); - - public void throwApplicationException() throws UserException; -} \ No newline at end of file Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,35 @@ +/* + * 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.ws.jaxws.samples.exception.server; + +import javax.jws.WebService; + + +@WebService +public interface ExceptionEndpoint +{ + public void throwRuntimeException(); + + public void throwSoapFaultException(); + + public void throwApplicationException() throws UserException; +} \ No newline at end of file Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,61 +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.ws.jaxws.samples.exception.server; - -import javax.jws.WebService; -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFactory; -import javax.xml.soap.SOAPFault; -import javax.xml.ws.soap.SOAPFaultException; - - -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpoint") -public class ExceptionEndpointImpl implements ExceptionEndpoint -{ - public void throwRuntimeException() - { - throw new RuntimeException("oh no, a runtime exception occured."); - } - - public void throwSoapFaultException() - { - // This should be thrown as-is - try - { - SOAPFactory factory = SOAPFactory.newInstance(); - SOAPFault fault = factory.createFault("this is a fault string!", new QName("http://foo", "FooCode")); - fault.setFaultActor("mr.actor"); - fault.addDetail().addChildElement("test"); - throw new SOAPFaultException(fault); - } - catch (SOAPException s) - { - throw new RuntimeException(s); - } - } - - public void throwApplicationException() throws UserException - { - throw new UserException("validation", 123, "Some validation error"); - } -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,61 @@ +/* + * 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.ws.jaxws.samples.exception.server; + +import javax.jws.WebService; +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFactory; +import javax.xml.soap.SOAPFault; +import javax.xml.ws.soap.SOAPFaultException; + + +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpoint") +public class ExceptionEndpointImpl implements ExceptionEndpoint +{ + public void throwRuntimeException() + { + throw new RuntimeException("oh no, a runtime exception occured."); + } + + public void throwSoapFaultException() + { + // This should be thrown as-is + try + { + SOAPFactory factory = SOAPFactory.newInstance(); + SOAPFault fault = factory.createFault("this is a fault string!", new QName("http://foo", "FooCode")); + fault.setFaultActor("mr.actor"); + fault.addDetail().addChildElement("test"); + throw new SOAPFaultException(fault); + } + catch (SOAPException s) + { + throw new RuntimeException(s); + } + } + + public void throwApplicationException() throws UserException + { + throw new UserException("validation", 123, "Some validation error"); + } +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,55 +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.ws.jaxws.samples.exception.server; - -import javax.xml.ws.WebFault; - -/** - * A mach application exception - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -@WebFault(faultBean="org.jboss.test.ws.jaxws.samples.exception.server.jaxws.UserExceptionBean") -public class UserException extends Exception -{ - private int errorCode; - private String errorCategory; - - public UserException(String errorCategory, int errorCode, String message) - { - super(message); - - this.errorCategory = errorCategory; - this.errorCode = errorCode; - } - - public String getErrorCategory() - { - return errorCategory; - } - - public int getErrorCode() - { - return errorCode; - } -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,55 @@ +/* + * 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.ws.jaxws.samples.exception.server; + +import javax.xml.ws.WebFault; + +/** + * A mach application exception + * + * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +@WebFault(faultBean="org.jboss.test.ws.jaxws.samples.exception.server.jaxws.UserExceptionBean") +public class UserException extends Exception +{ + private int errorCode; + private String errorCategory; + + public UserException(String errorCategory, int errorCode, String message) + { + super(message); + + this.errorCategory = errorCategory; + this.errorCode = errorCode; + } + + public String getErrorCategory() + { + return errorCategory; + } + + public int getErrorCode() + { + return errorCode; + } +} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws) Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationException") -@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationException") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowApplicationException { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,15 @@ + +package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationException") +@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationException") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class ThrowApplicationException { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationExceptionResponse") -@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationExceptionResponse") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowApplicationExceptionResponse { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,15 @@ + +package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationExceptionResponse") +@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationExceptionResponse") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class ThrowApplicationExceptionResponse { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeException") -@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeException") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowRuntimeException { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,15 @@ + +package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeException") +@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeException") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class ThrowRuntimeException { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeExceptionResponse") -@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeExceptionResponse") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowRuntimeExceptionResponse { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,15 @@ + +package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeExceptionResponse") +@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeExceptionResponse") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class ThrowRuntimeExceptionResponse { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultException") -@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultException") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowSoapFaultException { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,15 @@ + +package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultException") +@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultException") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class ThrowSoapFaultException { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultExceptionResponse") -@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultExceptionResponse") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowSoapFaultExceptionResponse { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,15 @@ + +package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultExceptionResponse") +@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultExceptionResponse") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class ThrowSoapFaultExceptionResponse { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,50 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "UserException") -@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "UserException", propOrder = { - "errorCategory", - "errorCode", - "message" -}) -(a)XmlAccessorType(XmlAccessType.FIELD) -public class UserExceptionBean { - - @XmlElement(namespace = "", name = "errorCategory") - private String errorCategory; - @XmlElement(namespace = "", name = "errorCode") - private int errorCode; - @XmlElement(namespace = "", name = "message") - private String message; - - public String getErrorCategory() { - return this.errorCategory; - } - - public void setErrorCategory(String errorCategory) { - this.errorCategory = errorCategory; - } - - public int getErrorCode() { - return this.errorCode; - } - - public void setErrorCode(int errorCode) { - this.errorCode = errorCode; - } - - public String getMessage() { - return this.message; - } - - public void setMessage(String message) { - this.message = message; - } - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,50 @@ + +package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "UserException") +@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "UserException", propOrder = { + "errorCategory", + "errorCode", + "message" +}) +(a)XmlAccessorType(XmlAccessType.FIELD) +public class UserExceptionBean { + + @XmlElement(namespace = "", name = "errorCategory") + private String errorCategory; + @XmlElement(namespace = "", name = "errorCode") + private int errorCode; + @XmlElement(namespace = "", name = "message") + private String message; + + public String getErrorCategory() { + return this.errorCategory; + } + + public void setErrorCategory(String errorCategory) { + this.errorCategory = errorCategory; + } + + public int getErrorCode() { + return this.errorCode; + } + + public void setErrorCode(int errorCode) { + this.errorCode = errorCode; + } + + public String getMessage() { + return this.message; + } + + public void setMessage(String message) { + this.message = message; + } + +} Modified: trunk/testsuite/src/resources/jaxws/samples/exception/WEB-INF/web.xml =================================================================== --- trunk/testsuite/src/resources/jaxws/samples/exception/WEB-INF/web.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/resources/jaxws/samples/exception/WEB-INF/web.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -7,7 +7,7 @@ <servlet> <servlet-name>ExceptionEndpointService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.exception.ExceptionEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpointImpl</servlet-class> </servlet> <servlet-mapping>

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3682 - in branches/maeste_palin/integration/xfire: src/main/java/org/jboss/wsf/stack/xfire and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: maeste Date: 2007-06-21 12:24:14 -0400 (Thu, 21 Jun 2007) New Revision: 3682 Added: branches/maeste_palin/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/log/ branches/maeste_palin/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/log/MessageDumpLogging.java branches/maeste_palin/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/log/MessageDumpLoggingMBean.java Modified: branches/maeste_palin/integration/xfire/.classpath branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml Log: JBWS-1677 partial commit. Implemented MBean to enable disable log Modified: branches/maeste_palin/integration/xfire/.classpath =================================================================== --- branches/maeste_palin/integration/xfire/.classpath 2007-06-21 16:23:53 UTC (rev 3681) +++ branches/maeste_palin/integration/xfire/.classpath 2007-06-21 16:24:14 UTC (rev 3682) @@ -18,5 +18,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="lib" path="thirdparty/commons-logging-1.1.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-logging-log4j.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Added: branches/maeste_palin/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/log/MessageDumpLogging.java =================================================================== --- branches/maeste_palin/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/log/MessageDumpLogging.java (rev 0) +++ branches/maeste_palin/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/log/MessageDumpLogging.java 2007-06-21 16:24:14 UTC (rev 3682) @@ -0,0 +1,235 @@ +/* + * 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.wsf.stack.xfire.log; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + + +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; +import javax.management.ObjectName; + +import org.codehaus.xfire.service.Service; +import org.codehaus.xfire.transport.http.XFireServletController; +import org.codehaus.xfire.util.LoggingHandler; +import org.codehaus.xfire.util.dom.DOMInHandler; +import org.codehaus.xfire.util.dom.DOMOutHandler; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.utils.ObjectNameFactory; +import org.jboss.wsf.stack.xfire.ManagedEndpointRegistry; + +/** + * @author Stefano Maestri <mailto:stefano.maestri@javalinux.it> + * + * since 21/06/2007 + */ +public class MessageDumpLogging implements MessageDumpLoggingMBean +{ + // provide logging + private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.class); + + + + private static final DOMInHandler domInHandler = new DOMInHandler(); + + private static final DOMOutHandler domOutHandler = new DOMOutHandler(); + + private static final LoggingHandler loggingHandelr = new LoggingHandler(); + + /* (non-Javadoc) + * @see org.jboss.wsf.stack.xfire.log.MessageDumpLoggingMBean#getImplementationTitle() + */ + public String getImplementationTitle() + { + return getClass().getPackage().getImplementationTitle(); + } + + /* (non-Javadoc) + * @see org.jboss.wsf.stack.xfire.log.MessageDumpLoggingMBean#getImplementationVersion() + */ + public String getImplementationVersion() + { + return getClass().getPackage().getImplementationVersion(); + } + + public void create() throws Exception + { + log.info(getImplementationTitle()); + log.info(getImplementationVersion()); + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.registerMBean(this, ObjectNameFactory.create("jboss.ws:service=MessageDumpLogging")); + } + } + + public void destroy() throws Exception + { + log.debug("Destroy service endpoint manager"); + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.unregisterMBean(ObjectNameFactory.create("jboss.ws:service=MessageDumpLogging")); + } + } + + private MBeanServer getMBeanServer() + { + MBeanServer server = null; + ArrayList servers = MBeanServerFactory.findMBeanServer(null); + if (servers.size() > 0) + { + server = (MBeanServer)servers.get(0); + } + return server; + } + + /* (non-Javadoc) + * @see org.jboss.wsf.stack.xfire.log.MessageDumpLoggingMBean#modifyDumpingAll(boolean) + */ + public void modifyDumpingAll(boolean enable) + { + EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + for (ObjectName epName : epRegistry.getEndpoints()) + { + this.modifyAllServices(epName, enable); + } + } + + /* (non-Javadoc) + * @see org.jboss.wsf.stack.xfire.log.MessageDumpLoggingMBean#modifyDumpingEndpoit(java.lang.String, boolean) + */ + public void modifyDumpingEndpoit(String endPointName, boolean enable) + { + this.modifyAllServices(ObjectNameFactory.create(endPointName), true); + } + + /* (non-Javadoc) + * @see org.jboss.wsf.stack.xfire.log.MessageDumpLoggingMBean#modifyDumpingService(java.lang.String, java.lang.String, boolean) + */ + public void modifyDumpingService(String endPointName, String serviceName, boolean enable) + { + EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + Endpoint ep = epRegistry.getEndpoint(ObjectNameFactory.create(endPointName)); + XFireServletController controller = ep.getAttachment(XFireServletController.class); + Service service = controller.getXFire().getServiceRegistry().getService(serviceName); + if (enable) + { + this.enableService(service); + } + else + { + this.disableService(service); + } + } + + private void modifyAllServices(ObjectName epName, boolean enable) + { + EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + Endpoint ep = epRegistry.getEndpoint(epName); + XFireServletController controller = ep.getAttachment(XFireServletController.class); + if (controller != null) + { + for (Service service : (Collection<Service>)controller.getXFire().getServiceRegistry().getServices()) + { + if (enable) + { + this.enableService(service); + } + else + { + this.disableService(service); + } + } + } + } + + private void enableService(Service service) + { +// service.addInHandler(new DOMInHandler()); +// service.addOutHandler(new DOMOutHandler()); +// service.addFaultHandler(new DOMOutHandler()); +// +// service.addInHandler(new LoggingHandler()); +// service.addOutHandler(new LoggingHandler()); +// service.addFaultHandler(new LoggingHandler()); + + service.addInHandler(domInHandler); + service.addOutHandler(domOutHandler); + service.addFaultHandler(domOutHandler); + + service.addInHandler(loggingHandelr); + service.addOutHandler(loggingHandelr); + service.addFaultHandler(loggingHandelr); + + + } + + private void disableService(Service service) + { + service.getInHandlers().remove(domInHandler); + service.getOutHandlers().remove(domOutHandler); + service.getFaultHandlers().remove(domOutHandler); + service.getInHandlers().remove(loggingHandelr); + service.getOutHandlers().remove(loggingHandelr); + service.getFaultHandlers().remove(loggingHandelr); + } +// List toBeRemoved = new LinkedList(); +// for (Object obj : service.getInHandlers()) +// { +// if (obj instanceof LoggingHandler || obj instanceof DOMInHandler ) +// { +// toBeRemoved.add(obj); +// } +// } +// service.getInHandlers().removeAll(toBeRemoved); +// +// toBeRemoved.clear(); +// for (Object obj : service.getOutHandlers() ) +// { +// if (obj instanceof LoggingHandler || obj instanceof DOMOutHandler) +// { +// toBeRemoved.add(obj); +// } +// } +// service.getOutHandlers().removeAll(toBeRemoved); +// +// toBeRemoved.clear(); +// for (Object obj : service.getFaultHandlers()) +// { +// if (obj instanceof LoggingHandler || obj instanceof DOMOutHandler) +// { +// toBeRemoved.add(obj); +// } +// } +// service.getFaultHandlers().removeAll(toBeRemoved); +// } + + +} + Added: branches/maeste_palin/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/log/MessageDumpLoggingMBean.java =================================================================== --- branches/maeste_palin/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/log/MessageDumpLoggingMBean.java (rev 0) +++ branches/maeste_palin/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/log/MessageDumpLoggingMBean.java 2007-06-21 16:24:14 UTC (rev 3682) @@ -0,0 +1,16 @@ +package org.jboss.wsf.stack.xfire.log; + +public interface MessageDumpLoggingMBean +{ + + public abstract String getImplementationTitle(); + + public abstract String getImplementationVersion(); + + public abstract void modifyDumpingAll(boolean enable); + + public abstract void modifyDumpingEndpoit(String endPointName, boolean enable); + + public abstract void modifyDumpingService(String endPointName, String serviceName, boolean enable); + +} \ No newline at end of file Modified: branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-21 16:23:53 UTC (rev 3681) +++ branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) @@ -217,5 +217,7 @@ </list> </property> </bean> + <bean name="MessageDump" class="org.jboss.wsf.stack.xfire.log.MessageDumpLogging"/> + </deployment> \ No newline at end of file Modified: branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml 2007-06-21 16:23:53 UTC (rev 3681) +++ branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) @@ -247,5 +247,6 @@ </uninstall> <depends>WebServiceMainDeployer</depends> </bean> - + <bean name="MessageDump" class="org.jboss.wsf.stack.xfire.log.MessageDumpLogging"/> + </deployment>

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3681 - branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-21 12:23:53 -0400 (Thu, 21 Jun 2007) New Revision: 3681 Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java Log: [JBWS-771] Use part names that are friendly to .NET Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-06-21 16:08:28 UTC (rev 3680) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-06-21 16:23:53 UTC (rev 3681) @@ -108,7 +108,7 @@ this.javaTypeName = javaTypeName; // [JBWS-771] Use part names that are friendly to .NET - if (opMetaData.getEndpointMetaData().getParameterStyle() == ParameterStyle.WRAPPED) + if (opMetaData.isDocumentWrapped()) partName = "parameters"; else partName = xmlName.getLocalPart();

16 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits June 2007