Menu
▾
▴
jboss-cvs-commits — CVS commits for JBoss
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(544) |
May
(1715) |
Jun
(1059) |
Jul
(886) |
Aug
(1214) |
Sep
(1375) |
Oct
(1664) |
Nov
(1153) |
Dec
(1084) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(1630) |
Feb
(1634) |
Mar
(1979) |
Apr
(1119) |
May
(1850) |
Jun
(1231) |
Jul
(1168) |
Aug
(1840) |
Sep
(1038) |
Oct
(1127) |
Nov
(1458) |
Dec
(854) |
| 2004 |
Jan
(1145) |
Feb
(1064) |
Mar
(2242) |
Apr
(1728) |
May
(1346) |
Jun
(1280) |
Jul
(1681) |
Aug
(2388) |
Sep
(2233) |
Oct
(3246) |
Nov
(3248) |
Dec
(1775) |
| 2005 |
Jan
(3407) |
Feb
(3049) |
Mar
(2402) |
Apr
(3687) |
May
(3289) |
Jun
(5731) |
Jul
(3905) |
Aug
(5843) |
Sep
(5149) |
Oct
(6866) |
Nov
(4051) |
Dec
(4646) |
| 2006 |
Jan
(7356) |
Feb
(4713) |
Mar
(9447) |
Apr
(6553) |
May
(6206) |
Jun
(4301) |
Jul
(1160) |
Aug
(23) |
Sep
(11) |
Oct
(19) |
Nov
(26) |
Dec
(15) |
| 2007 |
Jan
(28) |
Feb
(24) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julien V. <ju...@jb...> - 2006-07-08 00:32:04
|
User: julien Date: 06/07/07 20:32:01 Log: Directory /cvsroot/jboss/jboss-portal/server/src/resources/test/test-charset-sar/conf added to the repository |
|
From: Julien V. <ju...@jb...> - 2006-07-08 00:32:02
|
User: julien Date: 06/07/07 20:32:01 Log: Directory /cvsroot/jboss/jboss-portal/server/src/resources/test/test-charset-sar/META-INF added to the repository |
|
From: Julien V. <ju...@jb...> - 2006-07-08 00:31:56
|
User: julien Date: 06/07/07 20:31:55 Log: Directory /cvsroot/jboss/jboss-portal/server/src/resources/test/test-charset-sar added to the repository |
|
From: Julien V. <ju...@jb...> - 2006-07-08 00:31:26
|
User: julien Date: 06/07/07 20:31:23 Log: Directory /cvsroot/jboss/jboss-portal/server/src/main/org/jboss/portal/test/server/charset added to the repository |
|
From: Marshall C. <mcu...@jb...> - 2006-07-07 22:38:54
|
User: mculpepper
Date: 06/07/07 18:38:52
Added: core/features/org.jboss.ide.eclipse.source/sourceTemplatePlugin
License.txt plugin.properties build.properties
Log:
moved sourceTemplatePlugin to source feature
Revision Changes Path
1.3 +0 -0 jbosside/core/features/org.jboss.ide.eclipse.source/sourceTemplatePlugin/License.txt
(In the diff below, changes in quantity of whitespace are not shown.)
Index: License.txt
===================================================================
RCS file: License.txt
diff -N License.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ License.txt 7 Jul 2006 22:38:52 -0000 1.3
@@ -0,0 +1,149 @@
+GNU Lesser General Public License
+Version 2.1, February 1999
+
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+as the successor of the GNU Library Public License, version 2, hence
+the version number 2.1.]
+
+Preamble
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.
+
+This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.
+
+When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things.
+
+To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.
+
+For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights.
+
+We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.
+
+To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.
+
+Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.
+
+Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs.
+
+When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library.
+
+We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances.
+
+For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.
+
+In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.
+
+Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.
+
+The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you".
+
+A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.
+
+The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".)
+
+"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does.
+
+1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+a) The modified work must itself be a software library.
+
+b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.
+
+c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.
+
+d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.
+
+(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.
+
+Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.
+
+This option is useful when you wish to copy part of the code of the Library into a program that is not a library.
+
+4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.
+
+If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.
+
+5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.
+
+However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.
+
+When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.
+
+If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)
+
+Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.
+
+6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.
+
+You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:
+
+a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)
+
+b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.
+
+c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.
+
+d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.
+
+e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.
+
+For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.
+
+7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:
+
+a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.
+
+b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
+
+8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.
+
+10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.
+
+11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.
+
+14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
1.3 +0 -0 jbosside/core/features/org.jboss.ide.eclipse.source/sourceTemplatePlugin/plugin.properties
(In the diff below, changes in quantity of whitespace are not shown.)
Index: plugin.properties
===================================================================
RCS file: plugin.properties
diff -N plugin.properties
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ plugin.properties 7 Jul 2006 22:38:52 -0000 1.3
@@ -0,0 +1,2 @@
+pluginName=JBoss Eclipse IDE Source
+providerName=JBoss, Inc.
\ No newline at end of file
1.3 +2 -2 jbosside/core/features/org.jboss.ide.eclipse.source/sourceTemplatePlugin/build.properties
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.properties
===================================================================
RCS file: build.properties
diff -N build.properties
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ build.properties 7 Jul 2006 22:38:52 -0000 1.3
@@ -0,0 +1,6 @@
+bin.includes = plugin.xml,\
+ plugin.properties,\
+ License.txt,\
+ src/*/**,\
+ META-INF/
+sourcePlugin = true
\ No newline at end of file
|
|
From: Marshall C. <mcu...@jb...> - 2006-07-07 22:38:54
|
User: mculpepper
Date: 06/07/07 18:38:52
Removed: core/features/org.jboss.ide.eclipse.feature/sourceTemplatePlugin
License.txt plugin.properties build.properties
Log:
moved sourceTemplatePlugin to source feature
|
|
From: Rali G. <rg...@jb...> - 2006-07-07 22:37:26
|
User: rgenova
Date: 06/07/07 18:37:24
Modified: core build.xml
Log:
updated ha stuff
Revision Changes Path
1.120 +58 -37 jboss-portal/core/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/build.xml,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- build.xml 6 Jul 2006 13:35:21 -0000 1.119
+++ build.xml 7 Jul 2006 22:37:24 -0000 1.120
@@ -232,7 +232,7 @@
<!--| modules. |-->
<!--+====================================================================+-->
- <target name="output"
+ <target name="artifacts"
description="Generate all target output."
depends="compile">
@@ -329,48 +329,55 @@
<fileset dir="${apache.tomahawk.lib}" includes="tomahawk.jar"/>
<fileset dir="${apache.lang.lib}" includes="commons-lang-2.0.jar"/>
</copy>
+ </target>
- <!-- Build configurations -->
- <copy todir="${build.resources}/jboss-portal.sar">
+
+ <target name="explode" depends="init">
+ <explode
+ file="${build.lib}/jboss-portal.sar"
+ todir="${build.lib}"
+ name="jboss-portal-exploded.sar"
+ />
+ <!--exclude="portal-cms.sar"-->
+ <!--<copy file="${build.lib}/portal-cms.sar" tofile="${build.lib}/jboss-portal-exploded.sar/portal-cms.sar"/>-->
+ </target>
+
+ <!-- Build the jboss-portal-ha.sar -->
+ <target name="output-ha" depends="artifacts">
+ <copy todir="${build.resources}/jboss-portal-ha.sar">
<fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/>
</copy>
- <copy todir="${build.resources}/jboss-portal.sar">
+ <copy todir="${build.resources}/jboss-portal-ha.sar">
<filterset>
- <filtersfile file="../build/etc/single.properties"/>
+ <filtersfile file="../build/etc/clustered.properties"/>
</filterset>
<fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/>
</copy>
+ <implode
+ dir="${build.resources}/jboss-portal-ha.sar"
+ tofile="${build.lib}/jboss-portal-ha.sar"/>
- <copy todir="${build.resources}/jboss-portal-ha.sar">
+ </target>
+
+ <!-- Build the jboss-portal.sar -->
+ <target name="output" depends="artifacts">
+ <!-- Build configurations -->
+ <copy todir="${build.resources}/jboss-portal.sar">
<fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/>
</copy>
- <copy todir="${build.resources}/jboss-portal-ha.sar">
+ <copy todir="${build.resources}/jboss-portal.sar">
<filterset>
<filtersfile file="../build/etc/single.properties"/>
</filterset>
<fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/>
</copy>
-
<!-- Build archives -->
<implode
dir="${build.resources}/jboss-portal.sar"
tofile="${build.lib}/jboss-portal.sar"/>
- <implode
- dir="${build.resources}/jboss-portal-ha.sar"
- tofile="${build.lib}/jboss-portal-ha.sar"/>
- </target>
-
- <target name="explode" depends="init">
- <explode
- file="${build.lib}/jboss-portal.sar"
- todir="${build.lib}"
- name="jboss-portal-exploded.sar"
- />
- <!--exclude="portal-cms.sar"-->
- <!--<copy file="${build.lib}/portal-cms.sar" tofile="${build.lib}/jboss-portal-exploded.sar/portal-cms.sar"/>-->
</target>
<target name="datasource" depends="init">
@@ -464,6 +471,13 @@
<copy file="${build.lib}/jboss-portal.sar" todir="${jboss.home}/server/${portal.deploy.dir}"/>
</target>
+ <target name="deploy-ha"
+ description="Deploy high availability."
+ depends="output-ha">
+ <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
+ <copy file="${build.lib}/jboss-portal-ha.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/>
+ </target>
+
<target name="deploy-management"
description="Deploy."
depends="output">
@@ -481,6 +495,13 @@
<delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/>
</target>
+ <target name="undeploy-ha"
+ description="Undeploy."
+ depends="init">
+ <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
+ <delete file="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar"/>
+ </target>
+
<target name="test" depends="init">
<property name="build.testlog" value="${module.output}/log"/>
|
|
From: Rali G. <rg...@jb...> - 2006-07-07 22:37:07
|
User: rgenova
Date: 06/07/07 18:37:05
Modified: build distrib.xml
Log:
updated ha stuff
Revision Changes Path
1.20 +1 -0 jboss-portal/build/distrib.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: distrib.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/build/distrib.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- distrib.xml 5 Jul 2006 16:46:16 -0000 1.19
+++ distrib.xml 7 Jul 2006 22:37:05 -0000 1.20
@@ -56,6 +56,7 @@
<!-- Build JBoss Portal artifacts -->
<target name="source.build">
<ant dir="${source.dir}/build" antfile="build.xml"/>
+ <ant dir="${source.dir}/core" antfile="build.xml" target="output-ha"/>
<ant dir="${source.dir}/core" antfile="build.xml" target="datasource">
<!-- Hack because invoking the datasource generation from another build file replace ${/} -->
<property name="/" value="${/}"/>
|
|
From: Rali G. <rg...@jb...> - 2006-07-07 22:36:08
|
User: rgenova Date: 06/07/07 18:36:05 Modified: build/etc local.properties-example Log: added ha deploy dir Revision Changes Path 1.12 +1 -0 jboss-portal/build/etc/local.properties-example (In the diff below, changes in quantity of whitespace are not shown.) Index: local.properties-example =================================================================== RCS file: /cvsroot/jboss/jboss-portal/build/etc/local.properties-example,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- local.properties-example 30 Jun 2006 23:58:19 -0000 1.11 +++ local.properties-example 7 Jul 2006 22:36:05 -0000 1.12 @@ -41,6 +41,7 @@ portal.web.context-root=/portal # JBoss server/<xxx> directory for JBoss Portal, ie: $JBOSS_HOME/server/default portal.deploy.dir=default/deploy +portal-ha.deploy.dir=all/deploy # Show SQL or not portal.sql.show=false # Uncomment if you want to use a specific JBoss home path otherwise the build will use the JBOSS_HOME env variable |
|
From: Marshall C. <mcu...@jb...> - 2006-07-07 22:14:47
|
User: mculpepper
Date: 06/07/07 18:14:44
Removed: core/features/org.jboss.ide.eclipse.source/sourceTemplatePlugin
License.txt plugin.properties build.properties
Log:
removed sourceTemplatePlugin
|
|
From: Marshall C. <mcu...@jb...> - 2006-07-07 22:14:28
|
User: mculpepper
Date: 06/07/07 18:14:23
Removed: core/features/org.jboss.ide.eclipse.feature/sourceTemplateFeature
feature.properties License.txt build.properties
Log:
removed sourceTemplateFeature
|
|
From: Julien V. <ju...@jb...> - 2006-07-07 21:48:12
|
User: julien
Date: 06/07/07 17:48:09
Modified: core/src/main/org/jboss/portal/core/aspects/server
UserInterceptor.java
Log:
in UserFinalizer if no user module is bound, don't do anything. that situation can happen during shutdown.
if user is not found then we issue a warning with the user ID
Revision Changes Path
1.29 +20 -5 jboss-portal/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UserInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- UserInterceptor.java 7 Jul 2006 15:32:20 -0000 1.28
+++ UserInterceptor.java 7 Jul 2006 21:48:09 -0000 1.29
@@ -28,9 +28,12 @@
import org.jboss.portal.identity.UserModule;
import org.jboss.portal.identity.User;
import org.jboss.portal.identity.NoSuchUserException;
+import org.jboss.portal.identity.IdentityException;
import org.jboss.logging.Logger;
import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.NameNotFoundException;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSessionBindingListener;
@@ -47,7 +50,7 @@
* current value when the user is not used anymore.
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.28 $
+ * @version $Revision: 1.29 $
*/
public class UserInterceptor extends ServerInterceptor
{
@@ -228,11 +231,23 @@
//
// Here we use JNDI to locate the module as this finalizer could have been
// migrated in the session of another node of the cluster
+ try
+ {
UserModule module = (UserModule)new InitialContext().lookup("java:portal/UserModule");
// Get user and set last visit date to now
User user = module.findUserById(userId);
user.setLastVisitDate(new Date());
}
+ catch (NameNotFoundException ignore)
+ {
+ // Name is not bound anymore, it could happen during a shutdown, we don't do anything
+ }
+ catch (NoSuchUserException e)
+ {
+ // User is not found
+ log.warn("Trying to finalize non existing user " + userId);
+ }
+ }
}
}
|
|
From: Manik S. <msu...@jb...> - 2006-07-07 21:32:20
|
User: msurtani
Date: 06/07/07 17:32:19
Modified: src/org/jboss/cache/interceptors Tag:
Branch_JBossCache_1_4_0 TxInterceptor.java
Log:
More efficient lock releases
Revision Changes Path
No revision
No revision
1.48.2.5 +1 -11 JBossCache/src/org/jboss/cache/interceptors/TxInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TxInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/TxInterceptor.java,v
retrieving revision 1.48.2.4
retrieving revision 1.48.2.5
diff -u -b -r1.48.2.4 -r1.48.2.5
--- TxInterceptor.java 7 Jul 2006 14:41:46 -0000 1.48.2.4
+++ TxInterceptor.java 7 Jul 2006 21:32:19 -0000 1.48.2.5
@@ -15,7 +15,6 @@
import org.jboss.cache.TransactionEntry;
import org.jboss.cache.TransactionTable;
import org.jboss.cache.TreeCache;
-import org.jboss.cache.lock.IdentityLock;
import org.jboss.cache.config.Option;
import org.jboss.cache.marshall.JBCMethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
@@ -32,7 +31,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.LinkedList;
/**
* This interceptor is the new default at the head of all interceptor chains,
@@ -723,15 +721,7 @@
private void cleanupStaleLocks(GlobalTransaction gtx) throws Throwable
{
TransactionEntry entry = txTable.get(gtx);
- List list=new LinkedList(entry.getLocks());
- boolean trace = log.isTraceEnabled();
- for(int i=list.size() - 1; i >= 0; i--)
- {
- IdentityLock lock=(IdentityLock)list.get(i);
- if(trace) log.trace("releasing lock for " + lock.getFqn() + " (" + lock + ")");
- lock.release(gtx);
- }
- entry.getLocks().clear();
+ entry.releaseAllLocksLIFO(gtx);
}
/**
|
|
From: Tom E. <tom...@jb...> - 2006-07-07 20:50:18
|
User: telrod
Date: 06/07/07 16:50:13
Modified: src/tests/org/jboss/test/remoting/byvalue
ByValueInvocationTestCase.java
Log:
JBREM-320 - updated test case to test with both java and jboss serialization.
Revision Changes Path
1.5 +35 -1 JBossRemoting/src/tests/org/jboss/test/remoting/byvalue/ByValueInvocationTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ByValueInvocationTestCase.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/byvalue/ByValueInvocationTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ByValueInvocationTestCase.java 21 May 2006 04:47:28 -0000 1.4
+++ ByValueInvocationTestCase.java 7 Jul 2006 20:50:13 -0000 1.5
@@ -51,7 +51,7 @@
connector.addInvocationHandler("mock", invocationHandler);
}
- public void testInvocation() throws Throwable
+ public void testJavaInvocation() throws Throwable
{
InvokerLocator locator = new InvokerLocator("rmi://localhost:5400/?" +
InvokerLocator.BYVALUE + "=" + Boolean.TRUE.toString());
@@ -84,4 +84,38 @@
}
+ public void testJBossInvocation() throws Throwable
+ {
+ InvokerLocator locator = new InvokerLocator("rmi://localhost:5400/?" +
+ InvokerLocator.BYVALUE + "=" + Boolean.TRUE.toString() + "&" +
+ InvokerLocator.SERIALIZATIONTYPE + "=" + "jboss");
+ ServerInvocationHandler invocationHandler = new MockServerInvocationHandler();
+
+ // set up
+ ByValueInvocationTestCase.setupConfiguration(locator, invocationHandler);
+
+ Thread.sleep(3000);
+
+ // This could have been new Client(locator), but want to show that subsystem param is null
+ Client remotingClient = new Client(locator);
+ remotingClient.connect();
+ ByValuePayload byValuePayload = new ByValuePayload();
+ Object response = remotingClient.invoke(new NameBasedInvocation("testByValue",
+ new Object[]{byValuePayload},
+ new String[]{byValuePayload.getClass().getName()}),
+ null);
+
+ System.out.println("Invocation response: " + response);
+ if(response instanceof Boolean)
+ {
+ assertTrue("Result of testByValue is false.", ((Boolean) response).booleanValue());
+ }
+ else
+ {
+ assertTrue("Result of testByValue was not even of type Boolean.", false);
+ }
+ remotingClient.disconnect();
+
+ }
+
}
\ No newline at end of file
|
|
From: Tom E. <tom...@jb...> - 2006-07-07 20:46:27
|
User: telrod
Date: 06/07/07 16:46:24
Modified: src/main/org/jboss/remoting/transport/local
LocalClientInvoker.java
Log:
JBREM-320 - changed how pass by value gets marshalled within local client invoker (if is configured to be pass by value).
Revision Changes Path
1.14 +8 -3 JBossRemoting/src/main/org/jboss/remoting/transport/local/LocalClientInvoker.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LocalClientInvoker.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/local/LocalClientInvoker.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- LocalClientInvoker.java 7 Jul 2006 19:49:30 -0000 1.13
+++ LocalClientInvoker.java 7 Jul 2006 20:46:24 -0000 1.14
@@ -31,8 +31,10 @@
import org.jboss.remoting.ServerInvoker;
import org.jboss.remoting.marshal.Marshaller;
import org.jboss.remoting.marshal.UnMarshaller;
+import org.jboss.remoting.serialization.SerializationStreamFactory;
import org.jboss.remoting.transport.BidirectionalClientInvoker;
+import java.io.IOException;
import java.util.Map;
/**
@@ -43,7 +45,7 @@
* same JVM as the callback server.
*
* @author <a href="mailto:te...@vo...">Tom Elrod</a>
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
*/
public class LocalClientInvoker extends AbstractInvoker implements BidirectionalClientInvoker
{
@@ -140,9 +142,12 @@
return ret;
}
- protected InvocationRequest marshallInvocation(InvocationRequest localInvocation)
+ protected InvocationRequest marshallInvocation(InvocationRequest localInvocation) throws IOException, ClassNotFoundException
{
- return null;
+ Object param = localInvocation.getParameter();
+ Object newParam = SerializationStreamFactory.getManagerInstance(getSerializationType()).createMarshalledValueForClone(param).get();
+ localInvocation.setParameter(newParam);
+ return localInvocation;
}
/**
|
|
From: Clebert S. <csu...@jb...> - 2006-07-07 20:30:03
|
User: csuconic
Date: 06/07/07 16:29:59
Modified: src/main/org/jboss/remoting/serialization
SerializationManager.java
Log:
JBREM-320 - Adding API for smart cloning
Revision Changes Path
1.8 +5 -1 JBossRemoting/src/main/org/jboss/remoting/serialization/SerializationManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SerializationManager.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/serialization/SerializationManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- SerializationManager.java 27 Feb 2006 20:53:50 -0000 1.7
+++ SerializationManager.java 7 Jul 2006 20:29:59 -0000 1.8
@@ -33,7 +33,7 @@
* Controls the creation of ObjectInputStream, ObjectOutputStream.
* <p/>
* It is important that implementation of this class needs to be stateless.
- * $Id: SerializationManager.java,v 1.7 2006/02/27 20:53:50 csuconic Exp $
+ * $Id: SerializationManager.java,v 1.8 2006/07/07 20:29:59 csuconic Exp $
*
* @author <a href="mailto:tcl...@jb...">Clebert Suconic</a>
*/
@@ -55,6 +55,10 @@
public abstract void sendObject(ObjectOutputStream output, Object dataObject) throws IOException;
+ /** Used in call by value operations.
+ * This will use the most effective way */
+ public abstract IMarshalledValue createMarshalledValueForClone(Object original) throws IOException;
+
/**
* This was a refactory of a method usually existent on {@link org.jboss.remoting.marshal.serializable.SerializableUnMarshaller}.
* That's why we are using InputStream instead of ObjectInputStream as a parameter here.
|
|
From: Clebert S. <csu...@jb...> - 2006-07-07 20:30:03
|
User: csuconic
Date: 06/07/07 16:29:59
Modified: src/main/org/jboss/remoting/serialization/impl/java
JavaSerializationManager.java
Log:
JBREM-320 - Adding API for smart cloning
Revision Changes Path
1.8 +6 -1 JBossRemoting/src/main/org/jboss/remoting/serialization/impl/java/JavaSerializationManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JavaSerializationManager.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/serialization/impl/java/JavaSerializationManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- JavaSerializationManager.java 27 Feb 2006 20:53:50 -0000 1.7
+++ JavaSerializationManager.java 7 Jul 2006 20:29:59 -0000 1.8
@@ -35,7 +35,7 @@
import org.jboss.remoting.serialization.IMarshalledValue;
/**
- * $Id: JavaSerializationManager.java,v 1.7 2006/02/27 20:53:50 csuconic Exp $
+ * $Id: JavaSerializationManager.java,v 1.8 2006/07/07 20:29:59 csuconic Exp $
*
* @author <a href="mailto:cle...@jb...">Clebert Suconic</a>
*/
@@ -76,6 +76,10 @@
}
}
+ public IMarshalledValue createMarshalledValueForClone(Object original) throws IOException {
+ return createdMarshalledValue(original);
+ }
+
public void sendObject(ObjectOutputStream oos, Object dataObject) throws IOException
{
oos.writeObject(dataObject);
@@ -139,4 +143,5 @@
}
return obj;
}
+
}
|
|
From: Clebert S. <csu...@jb...> - 2006-07-07 20:30:03
|
User: csuconic
Date: 06/07/07 16:29:59
Modified: src/main/org/jboss/remoting/serialization/impl/jboss
JBossSerializationManager.java
Added: src/main/org/jboss/remoting/serialization/impl/jboss
SmartCloningMarshalledValue.java
Log:
JBREM-320 - Adding API for smart cloning
Revision Changes Path
1.10 +7 -1 JBossRemoting/src/main/org/jboss/remoting/serialization/impl/jboss/JBossSerializationManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossSerializationManager.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/serialization/impl/jboss/JBossSerializationManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- JBossSerializationManager.java 22 May 2006 16:24:25 -0000 1.9
+++ JBossSerializationManager.java 7 Jul 2006 20:29:59 -0000 1.10
@@ -34,13 +34,15 @@
import org.jboss.remoting.serialization.SerializationStreamFactory;
import org.jboss.serial.io.JBossObjectInputStream;
import org.jboss.serial.io.JBossObjectOutputStream;
+import org.jboss.serial.io.MarshalledObjectForLocalCalls;
+import org.jboss.serial.objectmetamodel.safecloning.SafeCloningRepository;
import org.jboss.serial.util.StringUtilBuffer;
import org.jboss.remoting.serialization.IMarshalledValue;
/**
* Instantiates the Streamings according to JbossObjectOutputStream and JBossObjectInputStream.
* Also, it uses a different approach for MarshallValues as we don't need to convert objects in bytes.
- * $Id: JBossSerializationManager.java,v 1.9 2006/05/22 16:24:25 csuconic Exp $
+ * $Id: JBossSerializationManager.java,v 1.10 2006/07/07 20:29:59 csuconic Exp $
*
* @author <a href="mailto:tcl...@jb...">Clebert Suconic</a>
*/
@@ -82,6 +84,10 @@
}
}
+ public IMarshalledValue createMarshalledValueForClone(Object original) throws IOException {
+ return new SmartCloningMarshalledValue(original);
+ }
+
public void sendObject(ObjectOutputStream oos, Object dataObject) throws IOException
{
1.1 date: 2006/07/07 20:29:59; author: csuconic; state: Exp;JBossRemoting/src/main/org/jboss/remoting/serialization/impl/jboss/SmartCloningMarshalledValue.java
Index: SmartCloningMarshalledValue.java
===================================================================
/*
* 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.remoting.serialization.impl.jboss;
import java.io.IOException;
import org.jboss.remoting.serialization.IMarshalledValue;
import org.jboss.serial.io.MarshalledObjectForLocalCalls;
import org.jboss.serial.objectmetamodel.safecloning.SafeCloningRepository;
/**
*
* IMarshalledValue used on smart cloning/call by value operations for JBoss Serialization
* @author Clebert Suconic
*
*/
public class SmartCloningMarshalledValue extends MarshalledObjectForLocalCalls implements IMarshalledValue
{
public SmartCloningMarshalledValue() {
super();
}
public SmartCloningMarshalledValue(Object arg0, SafeCloningRepository arg1)
throws IOException {
super(arg0, arg1);
}
public SmartCloningMarshalledValue(Object arg0) throws IOException {
super(arg0);
}
}
|
|
From: Julien V. <ju...@jb...> - 2006-07-07 20:03:00
|
User: julien
Date: 06/07/07 16:02:58
Modified: wsrp/src/main/org/jboss/portal/wsrp/deployment
WSRPDeploymentFactory.java
Log:
renamed ServiceFactoryImpl to the more appropriate AbstractJNDIServiceFactory
Revision Changes Path
1.10 +3 -3 jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WSRPDeploymentFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- WSRPDeploymentFactory.java 7 Jul 2006 20:00:28 -0000 1.9
+++ WSRPDeploymentFactory.java 7 Jul 2006 20:02:58 -0000 1.10
@@ -28,7 +28,7 @@
import org.jboss.portal.wsrp.core.RegistrationData;
import org.jboss.portal.wsrp.services.PerEndpointSOAPInvokerServiceFactory;
import org.jboss.portal.wsrp.services.RemoteSOAPInvokerServiceFactory;
-import org.jboss.portal.wsrp.services.ServiceFactoryImpl;
+import org.jboss.portal.wsrp.services.AbstractJNDIServiceFactory;
import org.jboss.util.StringPropertyReplacer;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.UnmarshallingContext;
@@ -42,7 +42,7 @@
* Wire the mbeans to install
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class WSRPDeploymentFactory implements ObjectModelFactory
{
@@ -100,7 +100,7 @@
Attributes attrs)
{
- ServiceFactoryImpl serviceFactory = null;
+ AbstractJNDIServiceFactory serviceFactory = null;
RegistrationData registrationData = null;
if ("endpoint-config".equals(localName))
{
|
|
From: Julien V. <ju...@jb...> - 2006-07-07 20:03:00
|
User: julien
Date: 06/07/07 16:02:57
Modified: build/ide/intellij/idea50/modules/wsrp wsrp.iml
Log:
renamed ServiceFactoryImpl to the more appropriate AbstractJNDIServiceFactory
Revision Changes Path
1.20 +4 -0 jboss-portal/build/ide/intellij/idea50/modules/wsrp/wsrp.iml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: wsrp.iml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/build/ide/intellij/idea50/modules/wsrp/wsrp.iml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- wsrp.iml 7 Jul 2006 20:00:28 -0000 1.19
+++ wsrp.iml 7 Jul 2006 20:02:57 -0000 1.20
@@ -186,5 +186,9 @@
<root url="http://java.sun.com/j2ee/1.4/docs/api/" />
</javadoc-paths>
</component>
+ <component name="VcsManagerConfiguration">
+ <option name="ACTIVE_VCS_NAME" value="CVS" />
+ <option name="USE_PROJECT_VCS" value="false" />
+ </component>
</module>
|
|
From: Julien V. <ju...@jb...> - 2006-07-07 20:02:59
|
User: julien
Date: 06/07/07 16:02:58
Modified: wsrp/src/main/org/jboss/portal/wsrp/services
PerEndpointSOAPInvokerServiceFactory.java
RMIInvokerServiceFactory.java
SOAPInvokerServiceFactory.java
Added: wsrp/src/main/org/jboss/portal/wsrp/services
AbstractJNDIServiceFactory.java
Removed: wsrp/src/main/org/jboss/portal/wsrp/services
ServiceFactoryImpl.java
Log:
renamed ServiceFactoryImpl to the more appropriate AbstractJNDIServiceFactory
Revision Changes Path
1.5 +2 -2 jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PerEndpointSOAPInvokerServiceFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PerEndpointSOAPInvokerServiceFactory.java 7 Jul 2006 20:00:29 -0000 1.4
+++ PerEndpointSOAPInvokerServiceFactory.java 7 Jul 2006 20:02:58 -0000 1.5
@@ -32,10 +32,10 @@
/**
* @author <a href="mailto:chr...@jb...">Chris Laprun</a>
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
* @since 2.4
*/
-public class PerEndpointSOAPInvokerServiceFactory extends ServiceFactoryImpl
+public class PerEndpointSOAPInvokerServiceFactory extends AbstractJNDIServiceFactory
{
/** . */
1.2 +2 -2 jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/RMIInvokerServiceFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RMIInvokerServiceFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/RMIInvokerServiceFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RMIInvokerServiceFactory.java 12 May 2006 00:16:33 -0000 1.1
+++ RMIInvokerServiceFactory.java 7 Jul 2006 20:02:58 -0000 1.2
@@ -31,10 +31,10 @@
/**
* @author <a href="mailto:chr...@jb...">Chris Laprun</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @since 2.4
*/
-public class RMIInvokerServiceFactory extends ServiceFactoryImpl
+public class RMIInvokerServiceFactory extends AbstractJNDIServiceFactory
{
public RMIInvokerServiceFactory()
{
1.3 +2 -2 jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/SOAPInvokerServiceFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SOAPInvokerServiceFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/SOAPInvokerServiceFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SOAPInvokerServiceFactory.java 7 Jul 2006 20:00:29 -0000 1.2
+++ SOAPInvokerServiceFactory.java 7 Jul 2006 20:02:58 -0000 1.3
@@ -35,10 +35,10 @@
/**
* @author <a href="mailto:chr...@jb...">Chris Laprun</a>
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
* @since 2.4
*/
-public class SOAPInvokerServiceFactory extends ServiceFactoryImpl
+public class SOAPInvokerServiceFactory extends AbstractJNDIServiceFactory
{
/** . */
1.1 date: 2006/07/07 20:02:58; author: julien; state: Exp;jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java
Index: AbstractJNDIServiceFactory.java
===================================================================
/*
* 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.portal.wsrp.services;
import org.jboss.logging.Logger;
import org.jboss.portal.common.system.AbstractJBossService;
import org.jboss.portal.common.util.Tools;
import javax.naming.InitialContext;
import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
/**
* A service factory implementation that get the services using JNDI lookups.
*
* Rename to AbstractJNDIServiceFactory.
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
* @author <a href="mailto:chr...@jb...">Chris Laprun</a>
* @version $Revision: 1.1 $
* @noinspection ALL
* @since 2.4
*/
public abstract class AbstractJNDIServiceFactory extends AbstractJBossService implements ServiceFactory
{
/** The logger. */
protected final Logger log = Logger.getLogger(getClass());
/** The JNDI configuration. */
private Properties env;
/** A Map recording the mapping between WSRP port type class name and JDNI name of the implementing service. */
protected Properties portJNDIMapping;
/** Cache the services. */
private Map services;
protected void createService() throws Exception
{
for (Iterator i = env.entrySet().iterator(); i.hasNext();)
{
Map.Entry entry = (Map.Entry)i.next();
String name = (String)entry.getKey();
String value = (String)entry.getValue();
log.debug("Use env property " + name + "=" + value);
}
//
services = new ConcurrentReaderHashMap();
}
protected void destroyService() throws Exception
{
services = null;
}
public Properties getEnv()
{
return env;
}
public void setEnv(Properties env)
{
this.env = env;
}
/**
* Give a chance to subclass to customize the service between the retrieval and the caching. The default
* implementation returns the passed service.
*
* @param serviceClass the requested service class
* @param service the service implementation obtained from the JNDI lookup
* @return an implementation based on the provided service
* @throws Exception
*/
protected Object customizeServiceImplementation(Class serviceClass, Object service) throws Exception
{
return service;
}
public Object getService(Class serviceClass) throws Exception
{
if (serviceClass == null)
{
throw new IllegalArgumentException("Null class not accepted to perform lookup");
}
//
String key = serviceClass.getName();
if (!portJNDIMapping.containsKey(key))
{
throw new IllegalArgumentException("Unknown service class: " + key);
}
//
Object service = services.get(key);
if (service == null)
{
//
String jndiName = (String)portJNDIMapping.get(key);
log.debug("Looking up service for class " + key + " using JNDI name " + jndiName);
if (jndiName == null)
{
throw new IllegalArgumentException("No such service " + serviceClass);
}
//
InitialContext ctx = null;
try
{
if (env != null)
{
ctx = new InitialContext(env);
}
else
{
ctx = new InitialContext();
}
//
service = ctx.lookup(jndiName);
if (log.isTraceEnabled())
{
log.trace("JNDI lookup for " + jndiName + " returned " + service);
}
//
if (service != null)
{
service = customizeServiceImplementation(serviceClass, service);
services.put(key, service);
}
return service;
}
finally
{
Tools.safeClose(ctx);
}
}
//
return service;
}
public Properties getPortJNDIMapping()
{
return portJNDIMapping;
}
public void setPortJNDIMapping(Properties portJNDIMapping)
{
this.portJNDIMapping = portJNDIMapping;
}
}
|
|
From: Julien V. <ju...@jb...> - 2006-07-07 20:00:40
|
User: julien
Date: 06/07/07 16:00:28
Modified: build/ide/intellij/idea50/modules/wsrp wsrp.iml
Log:
- changed caching strategy of service proxies : the configured factory does not cache statically anymore as it would lead to issues in multithreaded environements. instead it caches per factory (which is configured with the state) and I have added a service factory decorator that caches statically but is used only in the tests (in order to avoid to recreate the same proxy (which leads to saving lot of time as soap proxy are very expensive to build)))
Revision Changes Path
1.19 +36 -0 jboss-portal/build/ide/intellij/idea50/modules/wsrp/wsrp.iml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: wsrp.iml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/build/ide/intellij/idea50/modules/wsrp/wsrp.iml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- wsrp.iml 30 Jun 2006 23:50:59 -0000 1.18
+++ wsrp.iml 7 Jul 2006 20:00:28 -0000 1.19
@@ -145,6 +145,42 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-common.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-system.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-jaxrpc.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
<javadoc-paths>
<root url="http://java.sun.com/j2ee/1.4/docs/api/" />
|
|
From: Julien V. <ju...@jb...> - 2006-07-07 20:00:36
|
User: julien
Date: 06/07/07 16:00:29
Modified: wsrp/src/main/org/jboss/portal/wsrp/services
PerEndpointSOAPInvokerServiceFactory.java
SOAPInvokerServiceFactory.java ServiceFactory.java
ServiceFactoryImpl.java
Added: wsrp/src/main/org/jboss/portal/wsrp/services
CachingServiceFactory.java
Log:
- changed caching strategy of service proxies : the configured factory does not cache statically anymore as it would lead to issues in multithreaded environements. instead it caches per factory (which is configured with the state) and I have added a service factory decorator that caches statically but is used only in the tests (in order to avoid to recreate the same proxy (which leads to saving lot of time as soap proxy are very expensive to build)))
Revision Changes Path
1.4 +22 -28 jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PerEndpointSOAPInvokerServiceFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PerEndpointSOAPInvokerServiceFactory.java 1 Jun 2006 23:38:55 -0000 1.3
+++ PerEndpointSOAPInvokerServiceFactory.java 7 Jul 2006 20:00:29 -0000 1.4
@@ -30,39 +30,27 @@
import javax.xml.rpc.Stub;
/**
- * todo : cache created configured proxies
- *
* @author <a href="mailto:chr...@jb...">Chris Laprun</a>
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
* @since 2.4
*/
public class PerEndpointSOAPInvokerServiceFactory extends ServiceFactoryImpl
{
- /**
- * .
- */
+ /** . */
private static final String ENDPOINT_ADDRESS_PROP = "javax.xml.rpc.service.endpoint.address";
- /**
- * .
- */
+ /** . */
protected String serviceDescriptionURL;
- /**
- * .
- */
+ /** . */
protected String markupURL;
- /**
- * .
- */
+ /** . */
protected String registrationURL;
- /**
- * .
- */
+ /** . */
protected String portletManagementURL;
public String getServiceDescriptionURL()
@@ -105,27 +93,32 @@
this.portletManagementURL = portletManagementURL;
}
- public Object getService(Class clazz) throws Exception
+ /**
+ * If retrieve object is of javax.xml.rpc.Service class, we're using the WS stack and we need to get the port.
+ */
+ protected Object customizeServiceImplementation(Class serviceClass, Object service) throws Exception
{
- // If retrieve object is of javax.xml.rpc.Service class, we're using the WS stack and we need to get the port
- Service service = (Service)super.getService(clazz);
- log.debug("Unwrapping service " + service + " for class " + clazz);
- Object port = service.getPort(clazz);
+ Service rpcService = (Service)service;
+ //
+ log.debug("Unwrapping service " + rpcService + " for class " + serviceClass);
+ Object port = rpcService.getPort(serviceClass);
+
+ //
String portAddress = null;
- if (WSRP_v1_ServiceDescription_PortType.class.equals(clazz))
+ if (WSRP_v1_ServiceDescription_PortType.class.equals(serviceClass))
{
portAddress = serviceDescriptionURL;
}
- else if (WSRP_v1_Markup_PortType.class.equals(clazz))
+ else if (WSRP_v1_Markup_PortType.class.equals(serviceClass))
{
portAddress = markupURL;
}
- else if (WSRP_v1_Registration_PortType.class.equals(clazz))
+ else if (WSRP_v1_Registration_PortType.class.equals(serviceClass))
{
portAddress = registrationURL;
}
- else if (WSRP_v1_PortletManagement_PortType.class.equals(clazz))
+ else if (WSRP_v1_PortletManagement_PortType.class.equals(serviceClass))
{
portAddress = portletManagementURL;
}
@@ -139,9 +132,10 @@
else
{
throw new IllegalStateException("Service URLs were not properly initialized: no proper service URL for "
- + clazz.getName());
+ + serviceClass.getName());
}
+ //
return port;
}
}
1.2 +12 -9 jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/SOAPInvokerServiceFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SOAPInvokerServiceFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/SOAPInvokerServiceFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SOAPInvokerServiceFactory.java 12 May 2006 00:16:33 -0000 1.1
+++ SOAPInvokerServiceFactory.java 7 Jul 2006 20:00:29 -0000 1.2
@@ -33,11 +33,9 @@
import java.util.Map;
/**
- * todo : cache created configured proxies
- *
* @author <a href="mailto:chr...@jb...">Chris Laprun</a>
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @since 2.4
*/
public class SOAPInvokerServiceFactory extends ServiceFactoryImpl
@@ -70,16 +68,21 @@
this.endpointURL = endpointURL;
}
- public Object getService(Class clazz) throws Exception
+ /**
+ * If retrieve object is of javax.xml.rpc.Service class, we're using the WS stack and we need to get the port.
+ */
+ protected Object customizeServiceImplementation(Class serviceClass, Object service) throws Exception
{
- // If retrieve object is of javax.xml.rpc.Service class, we're using the WS stack and we need to get the port
- Service service = (Service)super.getService(clazz);
- log.debug("Unwrapping service " + service + " for class " + clazz);
- Object port = service.getPort(clazz);
+ Service rpcService = (Service)service;
+
+ //
+ log.debug("Unwrapping service " + rpcService + " for class " + serviceClass);
+ Object port = rpcService.getPort(serviceClass);
+ //
if (endpointURL != null)
{
- String portAddress = endpointURL + PORT_NAMES.get(clazz);
+ String portAddress = endpointURL + PORT_NAMES.get(serviceClass);
log.debug("Setting the end point to: " + portAddress);
((Stub)port)._setProperty(ENDPOINT_ADDRESS_PROP, portAddress);
}
1.2 +1 -7 jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/ServiceFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServiceFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/ServiceFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ServiceFactory.java 12 May 2006 00:16:33 -0000 1.1
+++ ServiceFactory.java 7 Jul 2006 20:00:29 -0000 1.2
@@ -23,19 +23,13 @@
import org.jboss.system.Service;
-import java.util.Properties;
-
/**
* A factory that gives access to remote services.
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public interface ServiceFactory extends Service
{
Object getService(Class clazz) throws Exception;
-
- Properties getPortJNDIMapping();
-
- void setPortJNDIMapping(Properties portJNDIMapping);
}
1.5 +86 -73 jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/ServiceFactoryImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServiceFactoryImpl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/ServiceFactoryImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ServiceFactoryImpl.java 3 Jul 2006 13:41:03 -0000 1.4
+++ ServiceFactoryImpl.java 7 Jul 2006 20:00:29 -0000 1.5
@@ -23,49 +23,59 @@
import org.jboss.logging.Logger;
import org.jboss.portal.common.system.AbstractJBossService;
+import org.jboss.portal.common.util.Tools;
import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+
/**
+ * A service factory implementation that get the services using JNDI lookups.
+ *
+ * Rename to AbstractJNDIServiceFactory.
+ *
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
* @author <a href="mailto:chr...@jb...">Chris Laprun</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
* @noinspection ALL
* @since 2.4
*/
public abstract class ServiceFactoryImpl extends AbstractJBossService implements ServiceFactory
{
- /**
- * .
- */
+ /** The logger. */
protected final Logger log = Logger.getLogger(getClass());
- /**
- * .
- */
+ /** The JNDI configuration. */
private Properties env;
- /**
- * A Map caching the already looked up services to avoid subsequent JNDI lookups once the service has been resolved.
- */
- private static final ThreadLocal threadlocal = new ThreadLocal()
+ /** A Map recording the mapping between WSRP port type class name and JDNI name of the implementing service. */
+ protected Properties portJNDIMapping;
+
+ /** Cache the services. */
+ private Map services;
+
+ protected void createService() throws Exception
{
- protected Object initialValue()
+ for (Iterator i = env.entrySet().iterator(); i.hasNext();)
{
- return new HashMap(4);
+ Map.Entry entry = (Map.Entry)i.next();
+ String name = (String)entry.getKey();
+ String value = (String)entry.getValue();
+ log.debug("Use env property " + name + "=" + value);
}
- };
- /**
- * A Map recording the mapping between WSRP port type class name and JDNI name of the implementing service.
- */
- protected Properties portJNDIMapping;
+ //
+ services = new ConcurrentReaderHashMap();
+ }
+
+ protected void destroyService() throws Exception
+ {
+ services = null;
+ }
public Properties getEnv()
{
@@ -75,45 +85,46 @@
public void setEnv(Properties env)
{
this.env = env;
- if (env != null)
- {
- for (Iterator i = env.entrySet().iterator(); i.hasNext();)
- {
- Map.Entry entry = (Map.Entry)i.next();
- String name = (String)entry.getKey();
- String value = (String)entry.getValue();
- log.debug("Use env property " + name + "=" + value);
- }
}
+
+ /**
+ * Give a chance to subclass to customize the service between the retrieval and the caching. The default
+ * implementation returns the passed service.
+ *
+ * @param serviceClass the requested service class
+ * @param service the service implementation obtained from the JNDI lookup
+ * @return an implementation based on the provided service
+ * @throws Exception
+ */
+ protected Object customizeServiceImplementation(Class serviceClass, Object service) throws Exception
+ {
+ return service;
}
- public Object getService(Class clazz) throws Exception
+ public Object getService(Class serviceClass) throws Exception
{
- if (clazz == null)
+ if (serviceClass == null)
{
throw new IllegalArgumentException("Null class not accepted to perform lookup");
}
- String className = clazz.getName();
- if (!portJNDIMapping.containsKey(className))
+ //
+ String key = serviceClass.getName();
+ if (!portJNDIMapping.containsKey(key))
{
- throw new IllegalArgumentException("Unknown service class: " + className);
+ throw new IllegalArgumentException("Unknown service class: " + key);
}
- // try to get the service from the service map to avoid JDNI if possible
- Map cache = (Map)threadlocal.get();
- Object service = cache.get(className);
- if (service != null)
+ //
+ Object service = services.get(key);
+ if (service == null)
{
- log.debug("Used cached service for " + className);
- return service;
- }
-
- String jndiName = (String)portJNDIMapping.get(className);
- log.debug("Looking up service for class " + className + " using JNDI name " + jndiName);
+ //
+ String jndiName = (String)portJNDIMapping.get(key);
+ log.debug("Looking up service for class " + key + " using JNDI name " + jndiName);
if (jndiName == null)
{
- throw new IllegalArgumentException("No such service " + clazz);
+ throw new IllegalArgumentException("No such service " + serviceClass);
}
//
@@ -128,28 +139,30 @@
{
ctx = new InitialContext();
}
+
+ //
service = ctx.lookup(jndiName);
- log.debug("JNDI lookup for " + jndiName + " returned " + service);
- if (service != null)
+ if (log.isTraceEnabled())
{
- cache.put(className, service);
+ log.trace("JNDI lookup for " + jndiName + " returned " + service);
}
+ //
+ if (service != null)
+ {
+ service = customizeServiceImplementation(serviceClass, service);
+ services.put(key, service);
+ }
return service;
}
finally
{
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (NamingException ignore)
- {
- }
+ Tools.safeClose(ctx);
}
}
+
+ //
+ return service;
}
public Properties getPortJNDIMapping()
1.1 date: 2006/07/07 20:00:29; author: julien; state: Exp;jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/services/CachingServiceFactory.java
Index: CachingServiceFactory.java
===================================================================
/*
* 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.portal.wsrp.services;
import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
import java.util.Map;
import org.jboss.portal.common.system.AbstractJBossService;
/**
* A service factory that statically cache implementations. It is mainly used in
* the test environment to void the very expensive creation of SOAP service proxies.
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
* @version $Revision: 1.1 $
*/
public class CachingServiceFactory extends AbstractJBossService implements ServiceFactory
{
/** . */
private static final Map cache = new ConcurrentReaderHashMap();
/** . */
private ServiceFactory delegate;
public Object getService(Class clazz) throws Exception
{
if (delegate == null)
{
throw new IllegalStateException("No static service factory");
}
if (clazz == null)
{
throw new IllegalArgumentException();
}
//
Object service = cache.get(clazz.getName());
if (service == null)
{
service = delegate.getService(clazz);
if (service != null)
{
cache.put(clazz.getName(), service);
}
}
return service;
}
public ServiceFactory getDelegate()
{
return delegate;
}
public void setDelegate(ServiceFactory delegate)
{
this.delegate = delegate;
}
}
|
|
From: Julien V. <ju...@jb...> - 2006-07-07 20:00:34
|
User: julien
Date: 06/07/07 16:00:29
Modified: wsrp/src/resources/test-wsrp-producer-jar/org/jboss/portal/test/wsrp
jboss-beans.xml
Log:
- changed caching strategy of service proxies : the configured factory does not cache statically anymore as it would lead to issues in multithreaded environements. instead it caches per factory (which is configured with the state) and I have added a service factory decorator that caches statically but is used only in the tests (in order to avoid to recreate the same proxy (which leads to saving lot of time as soap proxy are very expensive to build)))
Revision Changes Path
1.9 +5 -1 jboss-portal/wsrp/src/resources/test-wsrp-producer-jar/org/jboss/portal/test/wsrp/jboss-beans.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: jboss-beans.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/resources/test-wsrp-producer-jar/org/jboss/portal/test/wsrp/jboss-beans.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- jboss-beans.xml 2 Jul 2006 23:16:04 -0000 1.8
+++ jboss-beans.xml 7 Jul 2006 20:00:29 -0000 1.9
@@ -158,6 +158,10 @@
</property>
</bean>-->
+ <bean name="CachingServiceFactory" class="org.jboss.portal.wsrp.services.CachingServiceFactory">
+ <property name="delegate"><inject bean="SOAPServiceFactory"/></property>
+ </bean>
+
<!--
Change the bean name for the serviceFactory property to the appropriate value to use either RMI or SOAP invoker for
testing purposes.
@@ -170,6 +174,6 @@
<property name="nodeManager"><inject bean="NodeManager"/></property>
<property name="deployer"><inject bean="Deployer"/></property>
<property name="producerProxy"><inject bean="WSRPProducer"/></property>
- <property name="serviceFactory"><inject bean="SOAPServiceFactory"/></property>
+ <property name="serviceFactory"><inject bean="CachingServiceFactory"/></property>
</bean>
</deployment>
|
|
From: Julien V. <ju...@jb...> - 2006-07-07 20:00:34
|
User: julien
Date: 06/07/07 16:00:29
Modified: wsrp/src/resources/test-wsrp-consumer-jar/org/jboss/portal/test/wsrp
jboss-beans.xml
Log:
- changed caching strategy of service proxies : the configured factory does not cache statically anymore as it would lead to issues in multithreaded environements. instead it caches per factory (which is configured with the state) and I have added a service factory decorator that caches statically but is used only in the tests (in order to avoid to recreate the same proxy (which leads to saving lot of time as soap proxy are very expensive to build)))
Revision Changes Path
1.12 +5 -2 jboss-portal/wsrp/src/resources/test-wsrp-consumer-jar/org/jboss/portal/test/wsrp/jboss-beans.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: jboss-beans.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/resources/test-wsrp-consumer-jar/org/jboss/portal/test/wsrp/jboss-beans.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- jboss-beans.xml 2 Jul 2006 23:16:04 -0000 1.11
+++ jboss-beans.xml 7 Jul 2006 20:00:29 -0000 1.12
@@ -122,15 +122,18 @@
</bean>
-->
+ <bean name="CachingServiceFactory" class="org.jboss.portal.wsrp.services.CachingServiceFactory">
+ <property name="delegate"><inject bean="SOAPServiceFactory"/></property>
+ </bean>
+
<!--
Change the bean name for the serviceFactory property to the appropriate value to use either RMI or SOAP invoker for
testing purposes.
-->
<bean name="WSRPConsumer" class="org.jboss.portal.wsrp.consumer.WSRPConsumerImpl">
- <property name="serviceFactory"><inject bean="SOAPServiceFactory"/></property>
+ <property name="serviceFactory"><inject bean="CachingServiceFactory"/></property>
</bean>
-
<bean name="TestBean" class="org.jboss.portal.test.wsrp.WSRPConsumerBaseTest">
<constructor factoryMethod="getBean">
<factory bean="BeanFactory"/>
|
185 messages has been excluded from this view by a project administrator.
