Repository: incubator-juneau Updated Branches: refs/heads/master 39a0384f2 -> d89c87376
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d89c8737/juneau-releng/juneau-doc.css ---------------------------------------------------------------------- diff --git a/juneau-releng/juneau-doc.css b/juneau-releng/juneau-doc.css deleted file mode 100755 index e282e78..0000000 --- a/juneau-releng/juneau-doc.css +++ /dev/null @@ -1,361 +0,0 @@ -/********************************************************************************** - * Juneau-specific javadoc styles. - * - * These are styles available in Javadocs in addition to the general Oracle - * javadoc tags. - * - * Available classes: - * fixedWidth - Force block to be 800 px wide. - * table.styled - A table with alternating row colors. - * h2/h3/h4/h5/h6.topic - Topic headers. - * bordered - Put border around a block (e.g. an image). - * padded - Put padding around a block (e.g. an image). - * ol/ul.toc - Table of contents. - * ol/ul.notes - Notes. - * code.snippet - A code snippet. - * ol/ul.spaced-list - A spaced list. - * ol/ul.javahierarchy - A Java class hierarchy list. - * li.c - Java class. - * li.i - Java interface. - * li.a - Java abstract class. - * li.n - Java annotation. - * li.p - Java package. - * li.m - Java method. - * li.f - Java field. - * p.severe - A severe block. - * p.warn - A warning block. - * p.info - An info block. - * p.todo - A TODO block. - * a.doclink - A link to another document. - * - * Available tags: - * <l> - A literal. - * <property> - A property. - **********************************************************************************/ - -property { - font-size: 9pt; - white-space: pre; - font-family: monospace; - font-weight: bold; -} - -.fixedWidth { - max-width: 800px; -} - -/*--- Override formatting on <table class='styled'> ---*/ -table.styled,.contentContainer .description table.styled,.contentContainer ul li table.styled,ul.blockList ul.blockList li.blockList table.styled - { - padding: 0px; - position: relative; - width: auto; - border: 1px solid #9eadc0; - margin-left: 20px; - margin-right: 20px; - border-collapse: collapse; -} - -table.styled th { background-color: #dee3e9; border: 1px solid #9eadc0; padding: 3px 10px 3px 10px; } -table.styled td { padding: 3px; } -table.styled ul { padding: 0px 10px; } -table.styled tr:nth-child(1) { background-color: #dee3e9; } -table.styled tr:nth-child(2n+2) { background-color: #eeeeef; } -table.styled tr:nth-child(2n+3) { background-color: white; } -/* Same as r1 except with a border on the bottom */ -table.styled tr.bb { border-bottom: 1px solid #9eadc0 } -table.styled tr.light { background-color: white !important;} -table.styled tr.dark { background-color: #eeeeef !important; } - -/*--- Juneau topic headers ---*/ -h2.topic, -h3.topic, -h4.topic { - margin-bottom: 20px; - margin-top: 25px; - padding-top: 3px; - padding-left: 25px; - color: #2c4557; - border-top: 2px groove #9eadc0; - background-image: url('data:image/gif;base64,R0lGODlhEAAQAIQfACZJcSdKcjFTejVWfT5fhUFih0ZnjEhojUxskFFwk1Z0l1d1mFp4ml98nmaComiEpGuHpnKNq3SOrHiRroGZtYeeuJGmv5erwp+yx6O1yqm6zrDA0sTQ3s3X4+Dn7v///yH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEAAB8ALAAAAAAQABAAAAVk4CeOZGmWgmEQG/k0MHw4UY0gY1PvfG3kvaBhUqk4IMgkcuGrdJ7QaCfDiBgunKx2m1VYP5KNeEze0H4VjHrNVh9+HodlTq9bEr9PhMLv+ykOAyIaNEE8ACMFiouMigEnkJGQIQA7'); - background-repeat: no-repeat; - background-position: left center; -} -h2.topic { font-size: 14pt; } -h3.topic { font-size: 13pt; } -h4.topic { font-size: 12pt; } - -h2.closed, -h3.closed, -h4.closed { - background-image: url('data:image/gif;base64,R0lGODlhEAAQAIQYADNVfDhagUNkiUZnjEhojUxskE9vklFwlFd1mF17nWJ/oGaCo2+KqXKNq3aQrX2WsoGZtYObtoeeuJKowJ2wxqm6zrbF1sTQ3v///////////////////////////////yH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEAAB8ALAAAAAAQABAAAAVi4CeOZGmST6EGpLK8cNHMi6GI8qzvcyEikqBwGByIIJekcpmEiByWqHQadYgYlax2m2WIFpSweBxeiBKTtHqdTvwi8LgcjhAdHPi8Hn8QERiAgYKABCIAAoiJiogAJ46PjiEAOw==') !important; -} - -div.topic { margin-left: 10px; } - -h6.figure { - color: #2c4557; - margin-left: 30px; - margin-right: 30px; - margin-top: 10px; - margin-bottom: 0px; - font-style: italic; -} - -/*--- Override how Javadoc handles unordered lists inside .footer ---*/ -ul.normal { - margin-top: 0px; -} - -ul.normal li { - font-size: 100%; - list-style: disc; -} - -/*--- Bordered images ---*/ -.bordered { - border: 1px solid #cccccc; - margin: 0px 20px; - border-radius: 10px; - box-shadow: 1px 1px 1px 0px rgba(0, 0, 0, 0.5); -} - -.padded { - padding-left: 20px; - padding-right: 20px; -} - -/*--- Rows with bottom borders ---*/ -tr.borderbottom td { - border-bottom: 1px solid #9eadc0 -} - -.nomargin { - margin: 0px; -} - -ol.toc, ol.notes, -ul.toc, ul.notes, -.toc ol, .notes ol, -.toc ul, .notes ul { - background: #dee3e9; - margin: 0px; - padding: 0px; -} - -ul.toc, ul.notes, -.toc ul, .notes ul { - list-style: disc; -} - -ol.toc p, ol.notes p, -ul.toc p, ul.notes p, -.toc ol p, .notes ol p, -.toc ul p, .notes ul p, -ol.toc div, ol.notes div, -ul.toc div, ul.notes div, -.toc ol div, .notes ol div, -.toc ul div, .notes ul div { - color: #353833; - font: normal 1em Arial, Helvetica, sans-serif; - font-size: 1em; - padding-bottom: 5px; - margin: 0px; -} - -.toc li { - background: #FFFFFF; - margin-left: 30px; - padding-left: 5px; -} - -.notes li { - background: #FFFFFF; - margin-left: 30px; - padding-left: 5px; - padding-top: 10px; -} - -/* Linear gradients */ - -/* Light-colored background headers */ -h5.toc,h6.toc, -h5.notes,h6.notes, -h5.topic,h6.topic, -h2.title, -div.docSummary > div.block, -div.contentContainer > div.block > p:first-child { - background: linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll 0% 0% transparent; - background: -moz-linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll 0% 0% transparent; - background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#DEE3E9) ); -} - -/* Dark-colored background headers */ -div.header > div.subTitle > div.block, -div.footer > div.subTitle > div.block > p:first-child, -h1.title, -div.contentContainer > h2:first-of-type, -body > p:first-child { - background: linear-gradient(to bottom, #3B596D, #6289A3) repeat scroll 0% 0% transparent; - background: -moz-linear-gradient(to bottom, #3B596D, #6289A3) repeat scroll 0% 0% transparent; - background: -webkit-gradient(linear, left top, left bottom, from(#3B596D), to(#6289A3) ); -} - -/* Header styles */ - -h5.toc, h5.notes, -h6.toc, h6.notes { - color: #2C4557; - margin-bottom: 0px; - padding: 5px 30px; - border-radius: 15px 15px 15px 0px; - text-decoration: none; - box-shadow: 1px 1px 1px 0px rgba(0, 0, 0, 0.5); -} - -h5.topic, h6.topic { - color: #2C4557; - padding: 5px 20px; - margin: 30px 10px 20px 0px; - text-decoration: none; -} - -/* Light-colored title on package summary pages */ -div.docSummary > div.block, -div.contentContainer > div.block > p:first-child { - font-size: 1.2em; - font-weight: bold; - color: #2C4557; - margin-top: 0px; - margin-bottom: 0px; - padding: 5px 30px; - border-radius: 0px 0px 15px 15px; - text-decoration: none; -} - -/* Dark-colored title on overview page */ -div.header > div.subTitle > div.block, -div.footer > div.subTitle > div.block > p:first-child, -body > p:first-child { - font-size: 1.2em; - font-weight: bold; - color: white; - margin-bottom: 0px; - padding: 5px 30px; - border-radius: 15px; - text-decoration: none; -} - -/* Dark-colored package title on package summary pages */ -h1.title, -div.contentContainer > h2:first-of-type { - font-size: 1.2em; - font-weight: bold; - color: white; - margin-bottom: 0px; - padding: 5px 30px; - border-radius: 15px 15px 0px 0px; - text-decoration: none; -} - -/* Class titles */ -h2.title { - font-size: 1.2em; - font-weight: bold; - color: #2C4557; - margin-top: 0px; - margin-bottom: 0px; - padding: 5px 30px; - border-radius: 15px; - text-decoration: none; -} - -code.snippet { - border: 1px solid #cccccc; - margin: 2px; - padding: 0px 5px; - border-radius: 5px; - background-color: #f8f8f8; -} - -l { - color: DarkBlue; - font-weight: bold; - font-style: italic; - font-family: monospace; - font-size: 1.2em; -} - -.spaced-list li { padding:5px; } -.footer .spaced-list ul { margin:0 } - - -/* Java Hierarchy Tree */ -.javahierarchy li { - padding-left: 30px; - padding-top: 5px; - padding-bottom: 5px; - padding-top: 2px; - list-style: none; - background-repeat: no-repeat; - background-position: left top; -} -.javahierarchy li.c { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAC7klEQVQ4jZWUW2hTWRSGv31Jk2qaaBttvBUvUTGKl1qtUDoKCoIwCD75UgTxUm/YAR8EpaDOMDhIQcFUxToPE+ZhHnRUBF8GBsYHHdSiIkSLqGiF4i22Dck+Kd3zEBrPOSmj/ocf1j57/f9aZx/2wlqLn1jmYDmJ5RaWHLb8ZLH0YunEMnN8rWuhCiKsCuKSKoiiKgj7BRZVQfyoCiLg9hDWWgCCgzoOXAea+Db8A3xvIiOfgJJh9dtAELgNLP9GszH8DWzMTyk6EkA58mflyOXKkbi5yq7icvhP+usGyMaGuRO9y+5AO/485ch1ypEnAETkWbABeAEId8mWUCuX49cJyVBFO5fuX6Qjug8hPJIhYLZURh5QRgplJG6eqUsRkiEymQzJZJJYLEYqlQJge+MOkheW4dPUKCO3aWXEen8Hy6pXkAjOB6Crq4un+Qw1F4Kcrj/JhjfrsUOw5P1SnvQ+QielW9qkpZENfsMF4YXluK+vjwlbq6iaocnygZYHjXxszwMwob6KqnkewxatjKjzG0ZttBwPDw8TiEuUKZ2XmqiY+lv4c7LxSGdp5XgqAFBw8uU4HA6jdelvfgXyUhmRU0bg5svss3JGIpFADIIygql2Clcab3Kl8Saba7fg1ykjXkhlxD3/xqOB+/QPvgago6OD2SZB7ehkfph7mKbaNTTVruHhL0/I/1WsMBSJ3+s6gWP+3tfGN3CuNY3WuuK70uk0bW1tzDwWITQ/4N7aKRb+GpsGvAQCfmFyaCV7Fx2iubkZrTWZTIaenh66u7sJNweYtqvGnZ4D4sJay+Lz9d1A+3innOtzeHcjR/75CHbUEoxrJrWEmPxdNUJ6bsr+x7sHzmoAZcRBYDHQ6jeMNASJ7AlWVip6VteAFPB5fK04NT0 KXAXWjtfp/+APYFvvoTcFjyHAyp9mKOAocBionApeZIHTwPF7R/pHx156DMewunNWFGgDNgHTgSXACKWpdJfSUE3/e/xVzq/9DyomQ6ck1QE9AAAAAElFTkSuQmCC'); -} -.javahierarchy li.i { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAB70lEQVQ4jZWVPWgUQRiGn92d5cKZkIAQRUiMoCBoYUi6AyNYKIKI2AkShCv8QSzPIhYxAU2ZELTwrxERQeIPwhUKSkAsPKwCFgFPEhCtEvSc/cbTs9gz5OZmNuSFKZZ955nve9n5Nmg0Gtj6/uTXLuAcUAAGgXzz1SrwGZgD7vWeyi/be4P1wC8PVzqBGeAMoNpOalUdmALGd57u+d0G/HT/23bgBTC8AcjWPHB879ltq2vAj7eWcsB74MAmYf/1BjgyeL7PKAAtct0HGyoOkOtMu383vQjtkQMcAiaAUvDqxkI/UAUCl7NwYQ8dXTEAcRzzcrxCFDnj/QEMKC3mkg8GYH8FWgxR9Ndl7QJGlRY57IOlxNZHbYQo/ONzDyudmP5snlVhYohCZ4UABaVFtmYCXS37K+xTWkwWD/sipcDIZ9dKi6kBWzZXoRdYVVqkAhz0Aq0MExHCTGBiXmcC7ZYTkwV8qrTIbWAMiN1Au2VvhTXgUThbLn7VYu5qMbiWK0PPKs2Wiz/DpumyFjPvMl48cYd8rocgCKjX62jjhD3XYm7CuvF1cmiqG3gGjPgC8ugxMDpXKSUtQICj+yaiZp5XgI4NQCvANHCtvHB17eoErl/AyO6xbtKpfQzYAewnndBV4APpUH3wdnGyZu/9BxocEIfO9OfmAAAAAElFTkSuQmCC'); -} -.javahierarchy li.a { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAACx0lEQVQ4jZWUTUhUURTHf3d8jo6NjdakfZhZSJkTZVgJiRW1kIKgDyJa9LGoSCiQVi3CKANpkdEiByqDQgqKwGpTUBQoEZIaBTU1m0QoMKKPccx5711Pi2km3xvD/MOBc+85///9cy4cRITMYKEI50ToFiE+rvRdhH4RmkQomYjrONgJ/HaCa3YCy04gk4RlJzhrJ8ger6FEBAAzrmYDD4BVTA1dwFbvNPkBJAVHvqkc4AVQNUWxFJ4B9XmFYnoAtEWLtqjSFowPkdV48x7gC3zFVzBKjr8fj9GAthSu3g3aohlAfRukFPgIqPFPZnnX45/1EKVyM+y87r/C/OBhlINBDCjzaItj2kK53eUVXkapXN5HIlRWVhIMBmlrawNg+cpDXGirdrvM1xb7DW2yye3AyKkmK3sxAOdbW7FG39F5A4qLTvP50yZ+xuDTlyr6+npZscxBXWXYFqVuwey8inQejUY5vA8WlQIM8SVawY4DydrSUggtcVBrDW0yM2NIEkinw8PDLJgL2kyeC/Ph6d2/ran7P5hvaCtDDtuKp3O/30+uNzmn/8AvjzaJazP5UioSsQ/pjvLycmI//ziRIooruimu6CZ3+m7cPG3y0aNNet2Fka89jMQGAWhsbOTHyBJkbAYFJafwBWrxBWo50TzA/UeZgoZt8QRY53SuGYo0ULKyk1AoRCgUcVQ7Ojq4fusFN1vBdo6iU72+xxxgAMh2DyQ6VMf0siZqamowDINIJEJ7ezvhcJjNdWO0HHe0x4HZSkR4dVeFgSMTTbnvLVy+A2+ioMegbB5s3wi76sHjcbQerdopl5SI0HtLeYHHQN2/vm8S3Ae2Ve8RSa+vnhsqANwD1k9R7Dawf80+GQX+7kOA51dVFnASOAFkbgUnvgMXgTN rD8pY6tIhmEJXWAWAvcAWYC6wDLBJbqWXJJdqR12DxN3c3xwok/9rc3QeAAAAAElFTkSuQmCC'); -} -.javahierarchy li.n { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAD3klEQVQ4jaWUfUyVVRzHP899nvsi98LlzbgC8hIUaCiCxWyGOF9WiE2IZM4NMFn2Qrnsn1xz9qKW/KW1YZuWq0bWqDUFZ8O05cQSULBsUxHWNaFB7XovXu693APPPf3BHnZlrdb6br9/fud8P/udnXO+SCmZXUiZjZRNSNmJlIGoRR9S9iHlbqRM/zuvIqXEkCaEA3gfqAU0/llTQBPw1pTFMmk0Z4A2f8AFtAMP/wtots4DT07E2sdmgHaP1wpcBJb8R5ih74HHA0kJQgPQhHj3f8AAVgJ7gNeUBPftDMANKNE7nCaFOoedqpgYsjQNTYFhXefb0ASH744zpOuzoX4gS9PC4uXZsGKblY9cKcxR4JPOC3S3txMYuk1+bi4NDQ3Uulxs7R/kfIw92hYL1Cuuq9d6gSKjm2rWOJOTza27Y5SvKGN0aIiYp6rRFj6EYrOh/HaLo2tWUbp0KctPdTBWVBwNPaZpYjIjurM3bR5mJBtKS/FI2N3Vw3PZmcRrKleDIfYNj7DLP0633c7Tvw5wNGUeanKyYV9uUsMiSQ0L1LDAFZGsjY+jpf0kt91udnz2BW/m5fLLwADNhw5R4rBT2PENnt5euvwB1pStJPT1Vxh+NSzmmzQxiVElc2xoisKJD4/gfKKCnQX5uD0eyhcv4rtr1wEY/qkP0dPFHV1nbnoaE10/EsUImVQhAqoQqEKQbZn+HDdv3ODRivUkmM2cbmvDNPc+Fmx7EYCRkRHMcU5iFIWgEER8Pgy/KoTbpIbFZWNkXUwBEIlESE1NA2Dc68VeWESWzQrA6Ogo1rg4CuNi+flGP6rVFn1kt6aJybPACgBvMARATk4OA394iEQkNTU1+BOTqc+evrvKykqy1q0nxWblYFMTczKz0cTMVz6uplZ t7Dfp+naTrqveYIjavPuRUnKyf5Cg1cry+Wk86Ephz+et4PHQsPUZEjWVVw8c5HRLC5kvbMdit2PS9YBJ17coUkoe+fTLD4DnAd4oWUJFXi6N+/bTk5HLaMcpfj/eimp3kFa9Ce/FC/iuXMaSlEz6pjoSS5YZ073UU7exWZFSsuzIMQtwBih1WMy8U5RPyeJFXLo5SO9YAN9EmHiblQVzE9l7rgtfKIRiMkU/3zag8uKzm+VMfD3W/LETOAGUyVCIYs8QVWtXs7CggMSEBO74/Vy53s8rr+/CWb4BsyPWgLUC9Z2NWyaAewO27MBhFdgF7JS6bhvp/oE/+3oIjo4wGRzH7IglNiOLB6o3Y4lz+oD3gLfP7dgWMRj3AA2t3t/sZDq11wGpQAHTCe0GLjEdqi1ndzYGZnv/Ahxrv7iITMWYAAAAAElFTkSuQmCC'); -} -.javahierarchy li.p { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAACZklEQVQ4jZWVTUhUURiGn3PmNmNNcUUIxEJ0EYEF/SAhWSZKCUHYsk24MExTEdzkIsimhUQroxwyC5IW0aa6rgoEQQgXBUYLIdJczK4fk2FKx3vuaXGb4d5zR4Ze+DbnO+9zz3d+viu01kQ0KeqBXqAZOAbs+pdZB74CL4En9OiMaRVBoJsWu4F7wGXAin4pJBe4A9yy+vRWBLh5X1YDM0BjGZCpeeBCYsBbLwJz4zIBLABH/xNW0BzQkRzy8haAqxgLwRI2dv9ayKHdDby1z+Q/TZH/OAHaC6ZbgdvAdfH9rqwFVgFRyIqETdXgTx+kNZ7nIaVECH/K4tspahZ7iEkRhGaBOqkUg0ohlIJgFJRKpbAsi0rbxnEcAI6c7WbsXT2GZ49SdElX0e4qMCOo4TZYGsnR+PupX4EQfFENLH/Tpq/RchW15g4LA+h5oGSSqoaLxbFMJsOSDfvs0NRmsXwzFrnZssKmbuSHOVyU4zh0dnYyc1XSUB3aR89SKmrQgbHCoWSzWVZWVpieniadTtN2AA7uFRj+P5aryAHJ0AqNQxkdHUUKSMZhfyUMtwguHZeRvQZWLVeJD0BLGBgqg96TgmunYhH3NkBmTWDMPBRd0lxKr6RSPFKKre3uIfiPwsyXiJxSPBdaaxaG4mn8dlVUdlNz7qELQPcJyZWmaMmGBprG8w8Kb3kIOAScLmR3WoL5/h3F2WVKdoAJCLSvub64DbwGzpRbiqEXQFdrOr8RAgLM9sRjwA1gBKgoA/oFjAOp9sl8sfWIUr+AN90JG79rnwdqgMP4HXoVeI/fVJ91PN7Mmd6/kgcg4WKjGnYAAAAASUVORK5CYII='); -} -.javahierarchy li.m { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAC/0lEQVQ4jZ2VbUiVZxjHf+fJlzLnoUQtLcOX3uwFi2gwiQljbOgmfdyXFIrKoEYEvXzID+VirGLMxrCI+hQsxMz1MnRz5JA4FrVFW8cyZ5Kd0l7gGJle9/Wspw/H83ieoyD1hwee+77u63//r+t6+D8+x3GIx6lT5AHVQAmwCkgZCw0BD4DzwOlNm3gUn+uLJTxeL6nAMWADkDDhJi9s4DvgQPW2ZJ1A+OMPL+cAF4E1UxDFowP4csfOtCGX8PvDz5KBTqD4HcmiaAc+27UnwyQAGJFvgeLMrEQ2bslyTzWfe8Hd4Ii7zs5JonJjprs+1/Cc+/dGAUqBWmCvVVvTm6vG7FRjsNVtBQAj5jf++rsJNQY1hoLCJE/8zM+buf3PpWh8W21N72xLjexQIz41gq3Gk1BWVkZ3TxtqBDXCoiUzJtRqq0bjH6iRKktFPlERVMSjcGBgAL/fT848GH39Cn8aZGQmMzj4zEP4v20TzVeRNZYayY0qiFXY0tICQPkXn9PbF2Bx0cyx/V+9Cm1XIWqkxFKRdFehGSdsbW3FcRwqKiro7rnCshV+z0WuQtVYhfMT1EhMPxLd93A4TNedfoqW51K4dDoL8tMIhZ4QDAbjSo4oHMOIZYwMGyMYI2hMD1NTU+m40gXA0aOHsCwfDQ1nSZ+V7SFUW4nmGyN9lorcHB/KeMkpKSm0tV7HcRzy8/MBaGxsZMG81XEle4bSZ6mRPyYbimVZPOp/THfXIAChUIhAIEDG7MWTljz2NFsqclJFNDIU74dtq6Hzz4cANDU1kZzoZ2ZSZtwZdyjDKnLW5zgO69edqCdiVwy96qf91iEAVi2sJDfrI3pCbdx50Eje3FJWFnzF03AXgX/rAFi7tJq56cUA25s7tv7kcxyH8g+PJQF twDreDxeA9Zevfe249vVp8RE/8Avw8TuSNQBVv9/aPQpxBlta9M00YD+wD5g+BVEYqAMOtgf3v4lu+ib7BZQU1PiJuHYZkA0sJ+LQfcANIqZ65up/tcPxuW8B5sK/IDeOZ/cAAAAASUVORK5CYII='); -} -.javahierarchy li.f { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAACOElEQVQ4jZWUS2gTURSGv4kjSppSm4UExYqLuFGkoUUoSWOhouIT3LgqBVcWqjZkYSlaMIWKC4UUbKmCK8UHpD7ahaiREpWKWpduRBrQhVSRDiUovY9xERMmk4mpP1wY7rnnu+dx5xi2beNWfHRuG3AKiAIRwP/XZAELwAPgZm6o46vb13ACo6lcABgDegCz6qZKSeAycPH1cFxUATuGsyFgGmivA3LrJXBkLtVtlYG7h56sA94Arf8JK2kW2P929MCKCaCkuOSGpU60cqhtS5Xn7dxnrs58dG93ASPAOV8kOdWilRjQSuBcm4P+KhjA9w/TfMlex31eK9EXSU4FfUqK00oKQ0mBc9m2BiCdTmMYRnklEgm0VrjPKykalRS9ppKi2ysSZ/eDu/YRivVU2JUUbheAdlNJ0eKZmwOota4FcCtqhE9OVr9s4M7gUdrCoar9/vFnPJ1fqAXUppKyRoCe9/DtxSTWj2YCWyNe5l8+JUXBo8DllN1NyWQyaOXZFJQUeVNLMQ/E/xVhIByjOXKsMjfvmuZNJUXWC+hsir36pjw0lRQ3gPPAWqfl53IB27axLGu1wAJw17Btm42HL0xQHFcVst7dY2XxE/5wJw3b99QD9i/OjFwr/ctngR1Ap/NEIHK8/F0nwsfAODjG14a9ySbgEVA3FJfuA71Lz6/8rgACNHadWUOxnoPA+jqgJSANpJZnx3Rp0/B6wA2xviaKU/sgsAnYSXFC54H3FIfqrcKriYLb9w8elEANsOQ8SwAAAABJRU5ErkJggg=='); -} - -.javahierarchy ul { - margin-top: 10px; - padding-left: 5px; -} - -p.severe, p.warn, p.info { - background-repeat: no-repeat; - background-position: left center; - padding-left: 30px; - min-height: 24px; -} - -p.severe { - color: DarkRed; - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAAD2klEQVRIx9WWz4tVZRjHP+feuWfuvc7kOM74IzeSk7MwypgQrBZBtBoIghtFC6F/wdCopEhdRKKbaGGLIIXIsMJAihZulBBxwFUlFqLOHceZcebeuefX+/Np8c4YcR1zFi46cODAC+/n+X7f7/M+JxIRHuVT4hE/PQ9anD15qCxeXhXvG965UbF+p7MWb+wVp81VZ+xpr+2Powe/cCvtEa1k0ezJQ6MiciLe8fKu3nXrKce99NTq4D26vYBuL9D56yqLVy5ccsbueerIiasPDZj56uBekMNrdjdq1b4+pD2P5CnSmUO0gp4aUaVCNDBEu3mTqZ++y52xB579/Ntj/wmY/vKjT+tj4/tqQxuIFmaRZA6xCqxFjAGtEaUQpcBoov51+Me3MnvlMncunDuy6+TP+1cETB3/4I3qM69889jwRvxcE0wHvAfnwubGIFrDEkBUEYBAedsObly+yOzF82++ePbyqa4U3frs3dhbd7RWjfFT1yC7C1r9U61WwR5VIMvfy2oW29iJ86zfMITL08Pnnt8adwG8sY3ekZ1byq0ZJGshRY7kGRQZkoeXPEeKAilyKAqkKKDIIc+QTpvqrWuse3L7iMvSRldMnTHjsXNIMg9WISLBHu/BOsQaMDZYpDWidFCj8lBMkYE41vaUaGbpOPD1vwBWmbGyVnidIO27SBb8F+fB2nDIKmzulQ5VFymSpUiaQE+F0sAg9XqML/Ld3QqU3lTSGZJ08LPT9L1/fFUdO/dcP1EcU6mswRVs6QJYpZH520irg2tOrvpKcDcTot5JJOvDG/R9FJhpk+Vry0pBVKG15yVwHpwJEbUmpKnI8CpHsuUAgORQqlURZ1A6x2ua97NoIk+S0X5tiOI a0WAc8u8skbMBoHVoLl0EmCoQXdyLcCSONE8Ry0S3RWnnbGvav9XXXw8HbO09ANaEQ7ZLCTI69IFR96B4B/U6M7fnQTjbDUg6p++2Fj4e2LZ5pK4yJC8Qa8GZALJLKowOQKODdc4g1lKqlGmLY/oG14HTXY32wpmL2iaLB+7cnESw+DxFkjaSdJBkEUkXg7J8KZqqAF0EBRHQV6XZbAO817CiV7zsfnl6/dENmwf3blm7hp7FDj7NQ7UuWIZ3S9Y5EKFUj9H1KjdmWkz+ybGGk3ceOHBcluxv/j4/f8vy4RPbN8abqhUwDpxGtAXxUIJSXEbqNW7nGX/82tLAQeCThx44ZwajUXGcGN7IruHhAXqB/t4yiNDJNAWemamMO1NcAt5uOPltVRMN4PtaVBbPawgN8YwgjC0tTYjnOnAK+OF1kdWPzP/NX8XfTeTdmoFvg/0AAAAASUVORK5CYII='); -} -p.warn { - color: DarkRed; - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAADbElEQVRIx9WWQWhcVRSGv3PvzGSaTE06acVaK1ZQsRuDVrHtoiqCYKjSVUAEA12Ji+Au0kVpiXTntuJGcaFuXNWNa3HnIrjQRUHRWhJrE5NmMvPeu/fc4+LOZNJam2y68MHhPh73ff85/zn38cTMuJ+X4z5f912gpovvQq0GNY94D86DcyDbdqUEmlqmcZYYIcTPCKFjIVA7+fm9BXAOnCDiQByIZLj0FXKP9oB9J3unp9ASu3nlrKV0gpR6O1vk5C7gAXwQNietN6dcq43bux+ZeHWKZHOktIseSN8OYQjGMhgDszZm89QTdH+EzUVkRCHpPJrau2uybDfcBllDMrA0L2Mvj4suQ+pB6iHxBq797Diq87uooG/DAJ6hubEpHULTnPgEugZa5gjruJGEqc6FK6cP3VtgaEWGbsEVVC/I2MkGegOS8tqx87zyzMW8J6zgH3y6gYYLOwjkrC0lLI8jpoqpHjWNs+J7ENdAHNNvjfHG26MgDQgbuGYJWsxWXz53dAeBDM7wCFEhxgXXesET/oS4Cclo1kdp1Jp5GGIPyhX8w094Ym/hvwWSDuyAOICH4/hHzoisQLWeYbGgWW+yp9GEWIL2oFrD1VaR1uSZ8pMDx+9+0PSOWTYDs0tuFOj8DLHICdSVEXUkrUN3GTp/QOyA9XCtCdJS9xLw0r8riJFBWAhYCNPUD56S+BuEHsQAoYJYMjrSYLRZB+1meOxAdQuvvyL7HjpVfiTTdwpI+P6d4RSZeVL6wU8enpJwHWI1nKham/VqPxZLJvxV2LjaF9kESqx2gPKna4sox5ofmA4timEAh2Qz8sDhKQlLUBaQYoaniqTCp+9/jRfHex8+hYsbGa5d0IhwDX9wckp /X5kBvhhaFCKEAFVoWFUtuFoHyk72PnYh3oKwAaY8eaLB4897IA2zjxEU6IFvbUJiobgoja0KLITBITvn2o8ekfJ6FkhlPyrQCucbvH52FlKA5W8hdPKp16yHgasK/GPjR/SX9XPA+aFFKYGGGVdbge5qznwLXvTXDShv5k9FbwnUMjgNBajAj62jxsyWQOP0Nw6g+OrFggD4APTPhURwlu+tgLCaxXwFzW3gQUh+ZlCIiMsV9GNt7e/L+4q/PiYWmJY5c6360X8xcZsltwkwXNcLLpNTiPK//6v4B6rvGz1BOnzJAAAAAElFTkSuQmCC'); -} -p.info { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAEWklEQVRIx41WS28bVRT+zr3XY48fjZM0pamoFBolPNqiiAXbdAMItUJIrFCFZIslC8SaH8BDXbBkZ0sQIYRYIhALmiKxoUWtUF9ABUFqaFITx7Hd+jUPzrkznthp0zLy8R3PvfN993zncU14xLVwZmWOCCUQLQO0RERFvucZavB4hX9f4LF68+s31vbDoIcDfz7HQyWfc089PT+LyYk8XDeD/sC3NvAD7LS6bB3U6k0MBt4qE5VvfPX62mMJGLyUz2UqLy7N49DMBNZrfWzWB2h1A9zvhXZNOkVIaR4NkFJgojbqO9sIw6B8/cvXqvsSLJz+rDI1WSi9vHwS9aaPX//soNMPR1YRZg86uLPVh5WKP4rNla8gwHZzE54/qF7/4nT5AQLZ+VQxXxHwW+t9/LHejaYJybjy/gIWj7r4/XYXZz+4FU+RHTV/sQe417qLwB+Ur628aj1RQ81FllceAS5AAi7X4pMZKN41sdmR0QOlEGoDd+IwPzeVE299P5cQSEBF862Wvy+4mOxcLllDDEhaWY2i+4hIGY10YYrXq4pFkFQs5DJ/nXnpBZy/3BzRfARcdhqTHJEYbA/4NnpOtCtTIjhDtOsbCAP/KSN5Lqm4Xus9FJwsyBCMLLgfsiSSUGFonwXxqFXEILI47gH0OjslI0U0WSzg738H47k1Atr3Qlz+9PhYOp945yaUjmMQZ5QXu6CZ0Og0+qSWlVRo1k2j3QlGdh+90OsH2Gp6aPLc4ttXxwgMF4DhYrDmRJaKzaQ18tm0xGZJPCj2uDrv2SKKgLsM3O74CMVtDqTWZG2cQEce8DzFsbCeWOVCZB2+2dZFE0kQJC9utzwmCKGNsuBqaEaNEWj2QNbYOUUJSUTAxZcNbXYZaVyeFxSl9G9zW+A2Y8G GOR7tMvJkrwcRAe2SWIbQtg9LQKqhpCs2mh20Wn0MPGFlgthoWEw6AtrrgcTB6p4eNYN8Ttuq5peuKGm5G7UWN7Ag0TGxoRcx0ZgHImFqJLgMnMoYO05PGE55TyS6IB5Ud9ptDgpxalFStUngRlrC6CUyigcJSexBjnc/M6nxz0ZHCKpKDgvPD1a7vR4m3QQ/LgXa/b2XIA6+MVG6phwDh3c/P2uwWeui0wtWf/nk+TUVNUQq3+82YVQIV2O3S+6RbIxgmABWKiZxFI4eYv1dhas3mg1Supw0OzmJAj4sev06HOIqHOl1w8q++NGxMYLv3p1JiIXsyJTCEwcI53+8y8mC9y6de2btgQPnuTe/qRA5JV9NIzAGyu5st1qHVSpyDDNGND922KDgElZ/qqHR8Ko/fzhf3vfIPH72Wz7kUxVfTyB0XDipGJjJVNwSctkoFacPaBwsGtS2urj2W7MhO7/48WL1sYe+PSyIKuzCKXIKyKQzyGXSyDJoNqu5iDjPKeCK93BnsyOVv8oZU7507tm1//WvYnidLP3ARKrELy9L4+KoFu3hwhUqRSR5Lqko2bIfxn8JsXvuUrTzzQAAAABJRU5ErkJggg=='); -} -p.todo { - color: graytext; -} - -.topic a { - border-bottom: 1px dotted #4c6b87; -} - -/* Article links */ -a.doclink { - font-weight: bold; - border-bottom: 1px dotted #4c6b87; -} - http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d89c8737/juneau-server/src/main/java/org/apache/juneau/server/package.html ---------------------------------------------------------------------- diff --git a/juneau-server/src/main/java/org/apache/juneau/server/package.html b/juneau-server/src/main/java/org/apache/juneau/server/package.html index 43f8fab..fb1752e 100755 --- a/juneau-server/src/main/java/org/apache/juneau/server/package.html +++ b/juneau-server/src/main/java/org/apache/juneau/server/package.html @@ -1334,7 +1334,7 @@ <ul class='javahierarchy'> <li class='n'>{@link org.apache.juneau.server.annotation.RestResource#serializers() @RestResource.serializers()} - Annotation on servlet class. <li class='n'>{@link org.apache.juneau.server.annotation.RestMethod#serializers() @RestMethod.serializers()} - Annotation on individual servlet methods. - <li class='m'>{@link org.apache.juneau.server.RestServlet#createSerializers(ObjectMap,Class[])} - Override method to set the serializers programmatically. + <li class='m'>{@link org.apache.juneau.server.RestServlet#createSerializers(ObjectMap,Class[],Class[])} - Override method to set the serializers programmatically. </ul> <p> The following are equivalent ways of defining serializers used by a servlet... @@ -1356,9 +1356,9 @@ ... } - <jc>// Example #3 - Serializers defined on servlet by overriding the createSerializers(ObjectMap,Class[]) method</jc> + <jc>// Example #3 - Serializers defined on servlet by overriding the createSerializers(ObjectMap,Class[],Class[]) method</jc> <ja>@Override</ja> - <jk>public</jk> SerializerGroup createSerializers(ObjectMap,Class[]) { + <jk>public</jk> SerializerGroup createSerializers(ObjectMap,Class[],Class[]) { SerializerGroup g = <jk>new</jk> SerializerGroup() .append(JsonSerializer.<jk>class</jk>, XmlSerializer.<jk>class</jk>); @@ -1395,7 +1395,7 @@ <ul class='javahierarchy'> <li class='n'>{@link org.apache.juneau.server.annotation.RestResource#parsers() @RestResource.parsers()} - Annotation on servlet class. <li class='n'>{@link org.apache.juneau.server.annotation.RestMethod#parsers() @RestMethod.parsers()} - Annotation on individual servlet methods. - <li class='m'>{@link org.apache.juneau.server.RestServlet#createParsers(ObjectMap,Class[])} - Override method to set the parsers programmatically. + <li class='m'>{@link org.apache.juneau.server.RestServlet#createParsers(ObjectMap,Class[],Class[])} - Override method to set the parsers programmatically. </ul> <p> The following are equivalent ways of defining parsers used by a servlet... @@ -1513,8 +1513,8 @@ </p> <ul class='spaced-list'> <li>By overriding the {@link org.apache.juneau.server.RestServlet#createProperties()} method. - <li>By overriding the {@link org.apache.juneau.server.RestServlet#createSerializers(ObjectMap,Class[])} and - {@link org.apache.juneau.server.RestServlet#createParsers(ObjectMap,Class[])} methods and setting properties on the + <li>By overriding the {@link org.apache.juneau.server.RestServlet#createSerializers(ObjectMap,Class[],Class[])} and + {@link org.apache.juneau.server.RestServlet#createParsers(ObjectMap,Class[],Class[])} methods and setting properties on the serializers and parsers directly. </ul> @@ -1564,8 +1564,9 @@ } </p> <p> - {@link org.apache.juneau.server.annotation.RestMethod#transforms() @RestMethod.transforms()} - is the equivalent annotation for individual Java methods. + {@link org.apache.juneau.server.annotation.RestMethod#beanFilters() @RestMethod.beanFilters()} and + {@link org.apache.juneau.server.annotation.RestMethod#pojoSwaps() @RestMethod.pojoSwaps()} + are the equivalent annotations for individual Java methods. </p> <p> Transforms can also be defined programmatically through the following: @@ -1580,7 +1581,7 @@ <h6 class='topic'>Additional Information</h6> <ul class='javahierarchy'> <li class='n'>{@link org.apache.juneau.server.annotation.RestMethod#serializersInherit @RestMethod.serializersInherit()} - <br>Controls how serializers inherit transforms from the servlet class. + <br>Controls how serializers inherit transforms (bean filters and POJO swaps) from the servlet class. <li class='n'>{@link org.apache.juneau.server.annotation.RestMethod#parsersInherit @RestMethod.parsersInherit()} <br>Controls how parsers inherit transforms from the servlet class. </ul> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d89c8737/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b0804c2..0da0b64 100644 --- a/pom.xml +++ b/pom.xml @@ -87,8 +87,8 @@ <linksource>true</linksource> <source>1.6</source> <bootclasspath>${sun.boot.class.path}</bootclasspath> - <overview>${basedir}/../juneau-core/src/main/java/overview.html</overview> - <stylesheetfile>${basedir}/../juneau-releng/javadoc.css</stylesheetfile> + <overview>${basedir}/juneau-core/src/main/javadoc/overview.html</overview> + <stylesheetfile>${basedir}/juneau-core/src/main/javadoc/javadoc.css</stylesheetfile> <use>true</use> <additionalparam>-sourcetab 3 -notimestamp -Xdoclint:none</additionalparam> <verbose>false</verbose> @@ -97,6 +97,8 @@ <link>http://docs.oracle.com/javase/7/docs/api/</link> <link>http://docs.oracle.com/javaee/5/api/</link> </links> + <docfilessubdirs>true</docfilessubdirs> + <javadocDirectory>${basedir}/juneau-core/src/main/javadoc</javadocDirectory> </configuration> <executions> <execution>
