April 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r40251 - in trunk/as: plugins/org.jboss.ide.eclipse.as.rse.ui and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-04-17 14:45:30 -0400 (Tue, 17 Apr 2012) New Revision: 40251 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/License.txt trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/about.ini trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/about.mappings trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/about.properties trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/jboss_about.png Modified: trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/build.properties trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/plugin.properties Log: https://issues.jboss.org/browse/JBIDE-11537 JBoss AS Tools Features have the same name Modified: trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2012-04-17 18:41:55 UTC (rev 40250) +++ trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2012-04-17 18:45:30 UTC (rev 40251) @@ -3,7 +3,8 @@ id="org.jboss.ide.eclipse.as.server.rse.integration.feature" label="%featureName" version="2.3.0.qualifier" - provider-name="%providerName"> + provider-name="%providerName" + plugin="org.jboss.ide.eclipse.as.rse.ui"> <description url="http://www.jboss.org/tools"> %description @@ -23,58 +24,49 @@ Raleigh NC 27606 USA. </license> - <requires> - <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="1.0.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.200" match="greaterOrEqual" /> - <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.modulecore" version="1.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.jem.util" version="2.1.2" match="greaterOrEqual" /> - <import plugin="org.eclipse.debug.core" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.jdt.launching" version="3.6.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual" /> - <import plugin="org.eclipse.debug.ui" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.core" version="3.1.200" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services" version="3.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.files.ftp" version="3.0.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.local" version="2.1.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.ssh" version="3.1.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.200" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.core" /> - <import plugin="org.jboss.ide.eclipse.archives.webtools" /> - <import plugin="org.eclipse.tm.terminal" version="3.1.0" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.ui" /> - <import plugin="org.eclipse.rse.files.ui" version="3.2.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.local" version="2.1.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.ssh" version="2.1.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.telnet" version="1.2.200" match="greaterOrEqual" /> - -  - <import plugin="org.eclipse.rse.connectorservice.local"/> - <import plugin="org.eclipse.rse.connectorservice.ssh"/> - <import plugin="org.eclipse.rse.processes.ui"/> - <import plugin="org.eclipse.rse.shells.ui"/> - <import plugin="org.eclipse.rse.subsystems.files.local"/> - <import plugin="org.eclipse.rse.subsystems.files.ssh"/> - <import plugin="org.eclipse.rse.subsystems.processes.core"/> - <import plugin="org.eclipse.rse.subsystems.processes.local"/> - <import plugin="org.eclipse.rse.subsystems.processes.shell.linux"/> - <import plugin="org.eclipse.rse.subsystems.terminals.core"/> - <import plugin="org.eclipse.rse.subsystems.terminals.ssh"/> - <import plugin="org.eclipse.rse.terminals.ui"/> - </requires> + <requires> + <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="1.0.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.modulecore" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.jem.util" version="2.1.2" match="greaterOrEqual"/> + <import plugin="org.eclipse.debug.core" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.jdt.launching" version="3.6.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual"/> + <import plugin="org.eclipse.debug.ui" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.core" version="3.1.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services" version="3.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.files.ftp" version="3.0.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.local" version="2.1.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.ssh" version="3.1.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.200" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.core"/> + <import plugin="org.jboss.ide.eclipse.archives.webtools"/> + <import plugin="org.eclipse.tm.terminal" version="3.1.0" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.ui"/> + <import plugin="org.eclipse.rse.files.ui" version="3.2.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.local" version="2.1.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.ssh" version="2.1.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.telnet" version="1.2.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.connectorservice.local"/> + <import plugin="org.eclipse.rse.connectorservice.ssh"/> + <import plugin="org.eclipse.rse.processes.ui"/> + <import plugin="org.eclipse.rse.shells.ui"/> + <import plugin="org.eclipse.rse.subsystems.files.local"/> + <import plugin="org.eclipse.rse.subsystems.files.ssh"/> + <import plugin="org.eclipse.rse.subsystems.processes.core"/> + <import plugin="org.eclipse.rse.subsystems.processes.local"/> + <import plugin="org.eclipse.rse.subsystems.processes.shell.linux"/> + <import plugin="org.eclipse.rse.subsystems.terminals.core"/> + <import plugin="org.eclipse.rse.subsystems.terminals.ssh"/> + <import plugin="org.eclipse.rse.terminals.ui"/> + </requires> <plugin id="org.jboss.ide.eclipse.as.rse.core" Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/License.txt =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/License.txt (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/License.txt 2012-04-17 18:45:30 UTC (rev 40251) @@ -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 Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/License.txt ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/about.ini =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/about.ini (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/about.ini 2012-04-17 18:45:30 UTC (rev 40251) @@ -0,0 +1,27 @@ +# about.ini +# contains information about a feature +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# "%key" are externalized strings defined in about.properties +# This file does not need to be translated. +# test +# Property "aboutText" contains blurb for "About" dialog (translated) +aboutText=%blurb + +# Property "windowImage" contains path to window icon (16x16) +# needed for primary features only + +# Property "featureImage" contains path to feature image (32x32) +featureImage=jboss_about.png + +# Property "aboutImage" contains path to product image (500x330 or 115x164) +# needed for primary features only + +# Property "appName" contains name of the application (not translated) +# needed for primary features only + +# Property "welcomePerspective" contains the id of the perspective in which the +# welcome page is to be opened. +# optional + + + Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/about.ini ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/about.mappings =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/about.mappings (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/about.mappings 2012-04-17 18:45:30 UTC (rev 40251) @@ -0,0 +1,5 @@ +# about.mappings +# contains fill-ins for about.properties +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file does not need to be translated. + Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/about.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/about.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/about.properties 2012-04-17 18:45:30 UTC (rev 40251) @@ -0,0 +1 @@ +blurb=JBossAS Tools Server / Remote Systems Integration\n \n Version\: {featureVersion}\n \n (c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\n Visit http\://jboss.org/tools \ No newline at end of file Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/about.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/build.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/build.properties 2012-04-17 18:41:55 UTC (rev 40250) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/build.properties 2012-04-17 18:45:30 UTC (rev 40251) @@ -4,4 +4,9 @@ .,\ plugin.xml,\ plugin.properties,\ - about.html + about.html,\ + License.txt,\ + about.ini,\ + about.mappings,\ + about.properties,\ + jboss_about.png Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/jboss_about.png =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/jboss_about.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/plugin.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/plugin.properties 2012-04-17 18:41:55 UTC (rev 40250) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/plugin.properties 2012-04-17 18:45:30 UTC (rev 40251) @@ -1,2 +1,2 @@ Bundle-Vendor.0 = JBoss by Red Hat -Bundle-Name.0 = JBossAS RSE UI Tools +Bundle-Name.0 = JBossAS Tools Server / Remote Systems Integration

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40250 - in trunk/as: plugins/org.jboss.ide.eclipse.as.jmx.integration and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-04-17 14:41:55 -0400 (Tue, 17 Apr 2012) New Revision: 40250 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/License.txt trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.html trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.ini trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.mappings trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.properties trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/jboss_about.png Modified: trunk/as/features/org.jboss.ide.eclipse.as.jmx.integration.feature/feature.xml trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/build.properties Log: https://issues.jboss.org/browse/JBIDE-11537 JBoss AS Tools Features have the same name Modified: trunk/as/features/org.jboss.ide.eclipse.as.jmx.integration.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.jmx.integration.feature/feature.xml 2012-04-17 18:36:54 UTC (rev 40249) +++ trunk/as/features/org.jboss.ide.eclipse.as.jmx.integration.feature/feature.xml 2012-04-17 18:41:55 UTC (rev 40250) @@ -3,7 +3,8 @@ id="org.jboss.ide.eclipse.as.jmx.integration.feature" label="%featureName" version="2.3.0.qualifier" - provider-name="%providerName"> + provider-name="%providerName" + plugin="org.jboss.ide.eclipse.as.jmx.integration"> <description url="http://www.jboss.org/tools"> %description Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/License.txt =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/License.txt (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/License.txt 2012-04-17 18:41:55 UTC (rev 40250) @@ -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 Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/License.txt ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/META-INF/MANIFEST.MF 2012-04-17 18:36:54 UTC (rev 40249) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/META-INF/MANIFEST.MF 2012-04-17 18:41:55 UTC (rev 40250) @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: JBoss AS Server Adapter / JMX Integration +Bundle-Name: JBossAS Tools Server / JMX Integration Bundle-SymbolicName: org.jboss.ide.eclipse.as.jmx.integration;singleton:=true Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.jboss.ide.eclipse.as.jmx.integration.Activator Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.html =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.html (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.html 2012-04-17 18:41:55 UTC (rev 40250) @@ -0,0 +1,25 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<HTML> + +<head> +<title>About</title> +<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> +</head> + +<BODY lang="EN-US"> + +<H3>About This Content</H3> + +<P>©2007 Red Hat, Inc. All rights reserved</P> + +<H3>License</H3> + +<P>Red Hat Inc., through its JBoss division, makes available all content in this plug-in +("Content"). Unless otherwise indicated below, the Content is provided to you +under the terms and conditions of the GNU Lesser General Public License v2 +("LGPL"). A copy of the LGPL is available at +<A href="http://opensource.org/licenses/lgpl-license.php">http://opensource.org/licenses/lgpl-license.php</A>. +For purposes of the LGPL, "Library" or "Work" will mean the Content.</P> + +</BODY> +</HTML> \ No newline at end of file Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.ini =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.ini (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.ini 2012-04-17 18:41:55 UTC (rev 40250) @@ -0,0 +1,27 @@ +# about.ini +# contains information about a feature +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# "%key" are externalized strings defined in about.properties +# This file does not need to be translated. +# test +# Property "aboutText" contains blurb for "About" dialog (translated) +aboutText=%blurb + +# Property "windowImage" contains path to window icon (16x16) +# needed for primary features only + +# Property "featureImage" contains path to feature image (32x32) +featureImage=jboss_about.png + +# Property "aboutImage" contains path to product image (500x330 or 115x164) +# needed for primary features only + +# Property "appName" contains name of the application (not translated) +# needed for primary features only + +# Property "welcomePerspective" contains the id of the perspective in which the +# welcome page is to be opened. +# optional + + + Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.ini ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.mappings =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.mappings (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.mappings 2012-04-17 18:41:55 UTC (rev 40250) @@ -0,0 +1,5 @@ +# about.mappings +# contains fill-ins for about.properties +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file does not need to be translated. + Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.properties 2012-04-17 18:41:55 UTC (rev 40250) @@ -0,0 +1 @@ +blurb=JBossAS Tools Server / JMX Integration\n \n Version\: {featureVersion}\n \n (c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\n Visit http\://jboss.org/tools \ No newline at end of file Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/about.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/build.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/build.properties 2012-04-17 18:36:54 UTC (rev 40249) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/build.properties 2012-04-17 18:41:55 UTC (rev 40250) @@ -3,4 +3,10 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ - icons/ + icons/,\ + about.html,\ + License.txt,\ + about.ini,\ + about.mappings,\ + about.properties,\ + jboss_about.png Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/jboss_about.png =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/jboss_about.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40249 - in trunk/as: plugins/org.jboss.ide.eclipse.archives.webtools and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-04-17 14:36:54 -0400 (Tue, 17 Apr 2012) New Revision: 40249 Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/License.txt trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/about.ini trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/about.mappings trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/about.properties trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/jboss_about.png Modified: trunk/as/features/org.jboss.ide.eclipse.as.archives.integration.feature/feature.xml trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.properties Log: https://issues.jboss.org/browse/JBIDE-11537 JBoss AS Tools Features have the same name Modified: trunk/as/features/org.jboss.ide.eclipse.as.archives.integration.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.archives.integration.feature/feature.xml 2012-04-17 18:30:33 UTC (rev 40248) +++ trunk/as/features/org.jboss.ide.eclipse.as.archives.integration.feature/feature.xml 2012-04-17 18:36:54 UTC (rev 40249) @@ -3,7 +3,8 @@ id="org.jboss.ide.eclipse.as.archives.integration.feature" label="%featureName" version="2.3.0.qualifier" - provider-name="%providerName"> + provider-name="%providerName" + plugin="org.jboss.ide.eclipse.archives.webtools"> <description url="http://www.jboss.org/tools"> %description Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/License.txt =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/License.txt (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/License.txt 2012-04-17 18:36:54 UTC (rev 40249) @@ -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 Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/License.txt ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/about.ini =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/about.ini (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/about.ini 2012-04-17 18:36:54 UTC (rev 40249) @@ -0,0 +1,27 @@ +# about.ini +# contains information about a feature +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# "%key" are externalized strings defined in about.properties +# This file does not need to be translated. +# test +# Property "aboutText" contains blurb for "About" dialog (translated) +aboutText=%blurb + +# Property "windowImage" contains path to window icon (16x16) +# needed for primary features only + +# Property "featureImage" contains path to feature image (32x32) +featureImage=jboss_about.png + +# Property "aboutImage" contains path to product image (500x330 or 115x164) +# needed for primary features only + +# Property "appName" contains name of the application (not translated) +# needed for primary features only + +# Property "welcomePerspective" contains the id of the perspective in which the +# welcome page is to be opened. +# optional + + + Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/about.ini ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/about.mappings =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/about.mappings (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/about.mappings 2012-04-17 18:36:54 UTC (rev 40249) @@ -0,0 +1,5 @@ +# about.mappings +# contains fill-ins for about.properties +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file does not need to be translated. + Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/about.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/about.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/about.properties 2012-04-17 18:36:54 UTC (rev 40249) @@ -0,0 +1 @@ +blurb=JBossAS Tools Server / Compression Integration\n \n Version\: {featureVersion}\n \n (c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\n Visit http\://jboss.org/tools \ No newline at end of file Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/about.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties 2012-04-17 18:30:33 UTC (rev 40248) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties 2012-04-17 18:36:54 UTC (rev 40249) @@ -4,7 +4,12 @@ plugin.properties,\ about.html,\ .,\ - filesetdata/ + filesetdata/,\ + License.txt,\ + about.ini,\ + about.mappings,\ + about.properties,\ + jboss_about.png jars.compile.order = . source.. = src/ output.. = bin/ Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/jboss_about.png =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/jboss_about.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.properties 2012-04-17 18:30:33 UTC (rev 40248) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.properties 2012-04-17 18:36:54 UTC (rev 40249) @@ -1,6 +1,6 @@ #Properties file for org.jboss.ide.eclipse.archives.webtools Bundle-Vendor.0 = JBoss by Red Hat -Bundle-Name.0 = Project Archives Webtools Integration Plug-in +Bundle-Name.0 = JBossAS Tools Server / Compression Integration nodeContribution.label.publishToServer = Publish To Server nodeContribution.label.editPublishSettings = Edit publish settings... newPackageAction.label.war = WAR

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40248 - trunk/as/features/org.jboss.ide.eclipse.as.feature.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-04-17 14:30:33 -0400 (Tue, 17 Apr 2012) New Revision: 40248 Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml Log: https://issues.jboss.org/browse/JBIDE-11537 JBoss AS Tools Features have the same name Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2012-04-17 16:46:34 UTC (rev 40247) +++ trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2012-04-17 18:30:33 UTC (rev 40248) @@ -3,7 +3,8 @@ id="org.jboss.ide.eclipse.as.feature" label="%featureName" version="2.3.0.qualifier" - provider-name="%providerName"> + provider-name="%providerName" + plugin="org.jboss.ide.eclipse.as.ui"> <description url="http://www.jboss.org/tools"> %description

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40247 - in trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim: resources/config and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2012-04-17 12:46:34 -0400 (Tue, 17 Apr 2012) New Revision: 40247 Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/03.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/04.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/05.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/06.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/08.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/10.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/11.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/12.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/13.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/14.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/15.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/16.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/17.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/18.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/19.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/20.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/21.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/22.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/03.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/04.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/05.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/06.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/07.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/08.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/09.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/11.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/13.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/14.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/16.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/17.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/18.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/19.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/20.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/21.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/22.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/23.png trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone4ResizableSkin.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/SkinMap.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOsTimeComposite.java Log: https://issues.jboss.org/browse/JBIDE-10945 : BrowserSim: create more skins - added iPhone4 skin Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java 2012-04-17 14:58:20 UTC (rev 40246) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/DevicesListStorage.java 2012-04-17 16:46:34 UTC (rev 40247) @@ -33,7 +33,7 @@ private static final String DEFAULT_PREFERENCES_RESOURCE = "config/devices.cfg"; private static final String USER_PREFERENCES_FOLDER = "org.jboss.tools.vpe.browsersim"; private static final String USER_PREFERENCES_FILE = "devices.cfg"; - private static final int CURRENT_CONFIG_VERSION = 3; + private static final int CURRENT_CONFIG_VERSION = 4; public static void saveUserDefinedDevicesList(DevicesList devicesList) { File configFolder = new File(USER_PREFERENCES_FOLDER); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/SkinMap.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/SkinMap.java 2012-04-17 14:58:20 UTC (rev 40246) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/model/SkinMap.java 2012-04-17 16:46:34 UTC (rev 40247) @@ -8,6 +8,7 @@ import org.jboss.tools.vpe.browsersim.ui.skin.NativeSkin; import org.jboss.tools.vpe.browsersim.ui.skin.android.AndroidResizableSkin; import org.jboss.tools.vpe.browsersim.ui.skin.ios.AppleIPhone3ResizableSkin; +import org.jboss.tools.vpe.browsersim.ui.skin.ios.AppleIPhone4ResizableSkin; public class SkinMap { public static final Class<? extends BrowserSimSkin> DEFAULT_SKIN_CLASS = NativeSkin.class; @@ -17,7 +18,8 @@ private SkinMap(){ map = new HashMap<String, Class<? extends BrowserSimSkin>>(); - map.put("Apple iPhone 3", AppleIPhone3ResizableSkin.class); + map.put("iPhone 3", AppleIPhone3ResizableSkin.class); + map.put("iPhone 4", AppleIPhone4ResizableSkin.class); map.put("Android", AndroidResizableSkin.class); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2012-04-17 14:58:20 UTC (rev 40246) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2012-04-17 16:46:34 UTC (rev 40247) @@ -1,10 +1,10 @@ -ConfigVersion=3 +ConfigVersion=4 SelectedDeviceIndex=2 UseSkins=true Desktop (Default User-Agent) 1024 768 -Apple iPad 2 768 1024 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5 Apple iPhone 3 -Apple iPhone 3 320 480 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 Apple iPhone 3 -Apple iPhone 4 640 960 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 Apple iPhone 3 +Apple iPad 2 768 1024 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5 iPhone 4 +Apple iPhone 3 320 480 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 iPhone 3 +Apple iPhone 4 640 960 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7 iPhone 4 RIM BlackBerry Bold Touch 9900 640 480 Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+ Android Samsung Galaxy S 480 800 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android Samsung Galaxy S II 480 800 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/03.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/03.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/04.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/04.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/05.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/05.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/06.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/06.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/08.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/08.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/10.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/10.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/11.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/11.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/12.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/12.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/13.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/13.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/14.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/14.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/15.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/15.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/16.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/17.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/17.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/18.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/18.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/19.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/19.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/20.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/20.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/21.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/21.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/22.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/horizontal/22.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/03.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/03.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/04.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/04.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/05.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/05.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/06.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/06.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/07.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/07.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/08.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/08.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/09.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/09.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/11.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/11.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/13.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/13.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/14.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/14.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/16.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/17.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/17.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/18.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/18.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/19.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/19.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/20.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/20.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/21.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/21.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/22.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/22.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/23.png =================================================================== (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/ios/iphone4/vertical/23.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone4ResizableSkin.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone4ResizableSkin.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/AppleIPhone4ResizableSkin.java 2012-04-17 16:46:34 UTC (rev 40247) @@ -0,0 +1,106 @@ +package org.jboss.tools.vpe.browsersim.ui.skin.ios; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.vpe.browsersim.ui.skin.DeviceComposite; +import org.jboss.tools.vpe.browsersim.ui.skin.ImageDescriptor; + +public class AppleIPhone4ResizableSkin extends AppleIPhone3ResizableSkin { + private static final Point NORMAL_SCREEN_SIZE = new Point(236, 198); + private static final Point NORMAL_SKIN_SIZE = new Point(292, 429); + private static final Point VERTICAL_BORDERS_SIZE = new Point(NORMAL_SKIN_SIZE.x - NORMAL_SCREEN_SIZE.x, NORMAL_SKIN_SIZE.y - NORMAL_SCREEN_SIZE.y); + private static final Point HORIZONTAL_BORDERS_SIZE = new Point(VERTICAL_BORDERS_SIZE.y, VERTICAL_BORDERS_SIZE.x); + private static final int[] VISIBLE_REGION_VERTICAL = {40, 0, 254, 0, 255, 1, 261, 1, 262, 2, 265, 2, 266, 3, 267, 3, 268, 4, 270, 4, 271, 5, 272, 5, 274, 7, 275, 7, 278, 10, 279, 10, 282, 13, 282, 14, 285, 17, 285, 18, 287, 20, 287, 21, 288, 22, 288, 23, 289, 24, 289, 26, 290, 27, 290, 29, 291, 30, 291, 398, 290, 399, 290, 401, 289, 402, 289, 404, 288, 405, 288, 406, 287, 407, 287, 408, 285, 410, 285, 411, 283, 413, 283, 414, 278, 419, 277, 419, 275, 421, 274, 421, 272, 423, 271, 423, 270, 424, 269, 424, 268, 425, 266, 425, 265, 426, 263, 426, 262, 427, 257, 427, 256, 428, 38, 428, 37, 427, 33, 427, 32, 426, 30, 426, 29, 425, 27, 425, 26, 424, 25, 424, 24, 423, 23, 423, 22, 422, 21, 422, 18, 419, 17, 419, 11, 413, 11, 412, 9, 410, 9, 409, 8, 408, 8, 407, 7, 406, 7, 405, 6, 404, 6, 403, 5, 402, 5, 400, 4, 399, 4, 395, 3, 394, 3, 200, 2, 199, 0, 199, 0, 179, 2, 179, 3, 178, 3, 153, 2, 152, 0, 152, 0, 132, 2, 132, 3, 131, 3, 94, 2, 93, 1, 93, 0, 92, 0, 62, 1, 61, 2, 61, 3, 60! , 3, 35, 4, 34, 4, 30, 5, 29, 5, 26, 6, 25, 6, 24, 7, 23, 7, 22, 8, 21, 8, 20, 9, 19, 9, 18, 12, 15, 12, 14, 17, 9, 18, 9, 20, 7, 21, 7, 23, 5, 24, 5, 25, 4, 26, 4, 27, 3, 29, 3, 30, 2, 33, 2, 34, 1, 39, 1}; + private static final int[] VISIBLE_REGION_HORIZONTAL = {30, 0, 398, 0, 399, 1, 401, 1, 402, 2, 404, 2, 405, 3, 406, 3, 407, 4, 408, 4, 410, 6, 411, 6, 413, 8, 414, 8, 419, 13, 419, 14, 421, 16, 421, 17, 423, 19, 423, 20, 424, 21, 424, 22, 425, 23, 425, 25, 426, 26, 426, 28, 427, 29, 427, 34, 428, 35, 428, 253, 427, 254, 427, 258, 426, 259, 426, 261, 425, 262, 425, 264, 424, 265, 424, 266, 423, 267, 423, 268, 422, 269, 422, 270, 419, 273, 419, 274, 413, 280, 412, 280, 410, 282, 409, 282, 408, 283, 407, 283, 406, 284, 405, 284, 404, 285, 403, 285, 402, 286, 400, 286, 399, 287, 395, 287, 394, 288, 200, 288, 199, 289, 199, 291, 179, 291, 179, 289, 178, 288, 153, 288, 152, 289, 152, 291, 132, 291, 132, 289, 131, 288, 94, 288, 93, 289, 93, 290, 92, 291, 62, 291, 61, 290, 61, 289, 60, 288, 35, 288, 34, 287, 30, 287, 29, 286, 26, 286, 25, 285, 24, 285, 23, 284, 22, 284, 21, 283, 20, 283, 19, 282, 18, 282, 15, 279, 14, 279, 9, 274, 9, 273, 7, 271, 7, 270, 5, 268, 5, 267, 4, 266, 4! , 265, 3, 264, 3, 262, 2, 261, 2, 258, 1, 257, 1, 252, 0, 251, 0, 37, 1, 36, 1, 30, 2, 29, 2, 26, 3, 25, 3, 24, 4, 23, 4, 21, 5, 20, 5, 19, 7, 17, 7, 16, 10, 13, 10, 12, 13, 9, 14, 9, 17, 6, 18, 6, 20, 4, 21, 4, 22, 3, 23, 3, 24, 2, 26, 2, 27, 1, 29, 1}; + private static final IPhoneSkinDescriptor VERTICAL_DESCRIPTOR; + static { + String bd = "ios/iphone4/vertical/"; + ImageDescriptor iOsDescriptor = new ImageDescriptor(null, 5, 2, SWT.VERTICAL | SWT.HORIZONTAL); + ImageDescriptor[] bodyGridImageDescriptors = { + new ImageDescriptor(bd + "03.png"), new ImageDescriptor(bd + "04.png"), new ImageDescriptor(bd + "05.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(bd + "06.png"), new ImageDescriptor(bd + "07.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(bd + "08.png"), new ImageDescriptor(bd + "09.png"), + new ImageDescriptor(bd + "11.png"), iOsDescriptor, new ImageDescriptor(bd + "13.png"), + new ImageDescriptor(bd + "14.png", 1, 1, SWT.VERTICAL), new ImageDescriptor(bd + "16.png", 1, 1, SWT.VERTICAL), + new ImageDescriptor(bd + "17.png"), new ImageDescriptor(bd + "18.png"), new ImageDescriptor(bd + "19.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(bd + "20.png"), new ImageDescriptor(bd + "21.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(bd + "22.png"), new ImageDescriptor(bd + "23.png"), + }; + int bodyGridSize = 7; + + String bd2 = "ios/"; + ButtonDescriptor backButtonDescriptor; + { + FormData formData = new FormData(); + formData.left = new FormAttachment(0, 52); + formData.bottom = new FormAttachment(100, -124); + backButtonDescriptor = new ButtonDescriptor(formData, bd2 + "back.png", bd2 + "back-disabled.png", bd2 + "back-selected.png"); + } + + ButtonDescriptor forwardButtonDescriptor; + { + FormData formData = new FormData(); + formData.left = new FormAttachment(15, 52); + formData.bottom = new FormAttachment(100, -124); + forwardButtonDescriptor = new ButtonDescriptor(formData, bd2 + "forward.png", bd2 + "forward-disabled.png", bd2 + "forward-selected.png"); + } + VERTICAL_DESCRIPTOR = new IPhoneSkinDescriptor(bodyGridSize, bodyGridImageDescriptors, iOsDescriptor, backButtonDescriptor, forwardButtonDescriptor); + } + private static final IPhoneSkinDescriptor HORIZONTAL_DESCRIPTOR; + static { + String bd = "ios/iphone4/horizontal/"; + ImageDescriptor iOsDescriptor = new ImageDescriptor(null, 2, 5, SWT.VERTICAL | SWT.HORIZONTAL); + ImageDescriptor[] bodyGridImageDescriptors = { + new ImageDescriptor(bd + "03.png"), new ImageDescriptor(bd + "04.png"), new ImageDescriptor(bd + "05.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(bd + "06.png"), + new ImageDescriptor(bd + "08.png"), iOsDescriptor, new ImageDescriptor(bd + "10.png"), + new ImageDescriptor(bd + "11.png", 1, 1, SWT.VERTICAL), new ImageDescriptor(bd + "12.png", 1, 1, SWT.VERTICAL), + new ImageDescriptor(bd + "13.png"), new ImageDescriptor(bd + "14.png"), + new ImageDescriptor(bd + "15.png", 1, 1, SWT.VERTICAL), new ImageDescriptor(bd + "16.png", 1, 1, SWT.VERTICAL), + new ImageDescriptor(bd + "17.png"), new ImageDescriptor(bd + "18.png"), + new ImageDescriptor(bd + "19.png"), new ImageDescriptor(bd + "20.png"), new ImageDescriptor(bd + "21.png", 1, 1, SWT.HORIZONTAL), new ImageDescriptor(bd + "22.png") + }; + int bodyGridSize = 4; + String bd2 = "ios/"; + ButtonDescriptor backButtonDescriptor; + { + FormData formData = new FormData(); + formData.left = new FormAttachment(0, 145); + formData.bottom = new FormAttachment(100, -33); + backButtonDescriptor = new ButtonDescriptor(formData, bd2 + "back.png", bd2 + "back-disabled.png", bd2 + "back-selected.png"); + } + + ButtonDescriptor forwardButtonDescriptor; + { + FormData formData = new FormData(); + formData.left = new FormAttachment(15, 145); + formData.bottom = new FormAttachment(100, -33); + forwardButtonDescriptor = new ButtonDescriptor(formData, bd2 + "forward.png", bd2 + "forward-disabled.png", bd2 + "forward-selected.png"); + } + HORIZONTAL_DESCRIPTOR = new IPhoneSkinDescriptor(bodyGridSize, bodyGridImageDescriptors, iOsDescriptor, backButtonDescriptor, forwardButtonDescriptor); + } + + @Override + protected Point getBordersSize(boolean vertical) { + Point bordersSize = vertical ? VERTICAL_BORDERS_SIZE : HORIZONTAL_BORDERS_SIZE; + return bordersSize; + } + + @Override + protected DeviceComposite createDeviceComposite(Composite parent, boolean vertical) { + IPhoneSkinDescriptor skinDescriptor; + if (vertical) { + skinDescriptor = VERTICAL_DESCRIPTOR; + } else { + skinDescriptor = HORIZONTAL_DESCRIPTOR; + } + return new AppleIPhoneComposite(parent, skinDescriptor); + } + + @Override + protected int[] getNormalRegion(boolean vertical) { + if (vertical) { + return VISIBLE_REGION_VERTICAL; + } else { + return VISIBLE_REGION_HORIZONTAL; + } + } +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOsTimeComposite.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOsTimeComposite.java 2012-04-17 14:58:20 UTC (rev 40246) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ios/IOsTimeComposite.java 2012-04-17 16:46:34 UTC (rev 40247) @@ -14,7 +14,6 @@ public IOsTimeComposite(Composite parent, ImageList imageList) { super(parent, imageList); - System.out.println("ss"); } protected ImageDescriptor[] getBodyDescriptor() {

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40246 - trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test.

by jbosstools-commits＠lists.jboss.org

Author: sbunciak Date: 2012-04-17 10:58:20 -0400 (Tue, 17 Apr 2012) New Revision: 40246 Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateAppAS7.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateDomain.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/SSHKeyManagement.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java Log: Added logging Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateAppAS7.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateAppAS7.java 2012-04-17 14:15:11 UTC (rev 40245) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateAppAS7.java 2012-04-17 14:58:20 UTC (rev 40246) @@ -23,22 +23,32 @@ appNameText.setText(TestProperties .getProperty("openshift.jbossapp.name")); + log.info("OpenShift SWTBot Tests: Application name set."); + SWTBotCombo appTypeCombo = bot.comboBoxInGroup("New application"); bot.waitUntil(Conditions.widgetIsEnabled(appNameText)); appTypeCombo.setSelection(OpenShiftUI.AppType.JBOSS); + log.info("OpenShift SWTBot Tests: Application type selected."); + bot.button(IDELabel.Button.NEXT).click(); bot.waitUntil(Conditions.widgetIsEnabled(bot .button(IDELabel.Button.FINISH))); bot.button(IDELabel.Button.FINISH).click(); + log.info("OpenShift SWTBot Tests: Application creation started."); + bot.waitForShell("Information", 500); bot.text(0).setText(TestProperties.getPassphrase()); bot.button(IDELabel.Button.OK).click(); + log.info("OpenShift SWTBot Tests: SSH passphrase given."); + bot.waitUntil(Conditions.shellCloses(bot.activeShell()), TIME_20S); + log.info("OpenShift SWTBot Tests: 'New Application wizard' was closed."); + assertNotNull("OpenShift Server runtime is not in the Servers View!", servers.findServerByName(servers.show().bot().tree(), TestProperties.getProperty("openshift.jbossapp.name"))); Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateDomain.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateDomain.java 2012-04-17 14:15:11 UTC (rev 40245) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateDomain.java 2012-04-17 14:58:20 UTC (rev 40246) @@ -29,16 +29,9 @@ domainText.setText(TestProperties.getProperty("openshift.domain")); bot.button(IDELabel.Button.FINISH).click(); - bot.waitUntil(new NonSystemJobRunsCondition()); - - bot.waitForShell("New OpenShift Express Application", 100); + log.info("OpenShift SWTBot Tests: Domain name set."); - //@SuppressWarnings("unchecked") - //Matcher<Widget> matcher = WidgetMatcherFactory.allOf( - // WidgetMatcherFactory.widgetOfType(Shell.class), - // WidgetMatcherFactory.withText("New OpenShift Express Application")); - - //bot.waitUntilWidgetAppears(Conditions.waitForWidget(matcher)); + // wait while the domain is being created bot.waitWhile(new ICondition() { @Override public boolean test() { @@ -57,6 +50,13 @@ }, TIME_20S, TIME_1S); + log.info("OpenShift SWTBot Tests: Domain created."); + log.info("OpenShift SWTBot Tests: Waiting for 'New Application wizard'."); + + bot.waitForShell("New OpenShift Express Application", 100); + + log.info("OpenShift SWTBot Tests: 'New Application wizard' created."); + bot.waitUntil(new NonSystemJobRunsCondition()); } Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/SSHKeyManagement.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/SSHKeyManagement.java 2012-04-17 14:15:11 UTC (rev 40245) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/SSHKeyManagement.java 2012-04-17 14:58:20 UTC (rev 40246) @@ -24,9 +24,13 @@ bot.waitUntilWidgetAppears(Conditions.waitForWidget(matcher)); + log.info("OpenShift SWTBot Tests: SSH Keys creation."); + bot.link(0).click("SSH2 Preferences"); bot.waitForShell(IDELabel.Shell.PREFERENCES); + log.info("OpenShift SWTBot Tests: SSH Preferences opened."); + //SWTBotText sshDirText = bot.text(1); //sshDirText.setText(System.getProperty("user.home") + "/.ssh2"); @@ -38,6 +42,8 @@ bot.text(0).setText(TestProperties.getPassphrase()); bot.button(IDELabel.Button.OK).click(); + log.info("OpenShift SWTBot Tests: SSH Keys created."); + bot.waitUntilWidgetAppears(Conditions.waitForWidget(matcher)); } Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java 2012-04-17 14:15:11 UTC (rev 40245) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java 2012-04-17 14:58:20 UTC (rev 40246) @@ -63,6 +63,8 @@ storePasswordThenForward(); bot.waitForShell("", 100); + + log.info("OpenShift SWTBot Tests: Credentials validated."); } /* @@ -72,14 +74,7 @@ private void storePasswordThenForward() { if (bot.waitForShell(IDELabel.Shell.SECURE_STORAGE) != null) { bot.text(0).setText(TestProperties.getPassphrase()); - if (bot.text(1) != null){ - bot.text(1).setText(TestProperties.getPassphrase()); - bot.button(IDELabel.Button.OK).click(); - bot.waitForShell(IDELabel.Shell.SECURE_STORAGE); - bot.button(IDELabel.Button.CANCEL).click(); - } else { - bot.button(IDELabel.Button.OK).click(); - } + bot.button(IDELabel.Button.OK).click(); } }

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40245 - trunk/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-04-17 10:15:11 -0400 (Tue, 17 Apr 2012) New Revision: 40245 Modified: trunk/build/pom.xml Log: remove central's dependency on jbpm, flow, and esb Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2012-04-17 13:45:41 UTC (rev 40244) +++ trunk/build/pom.xml 2012-04-17 14:15:11 UTC (rev 40245) @@ -612,9 +612,6 @@ <module>../seam</module> <module>../portlet</module> <module>../examples</module> - <module>../esb</module> - <module>../jbpm</module> - <module>../flow</module> <module>../maven</module> <module>../central</module> </modules>

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40244 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: rest/completion and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-04-17 09:45:41 -0400 (Tue, 17 Apr 2012) New Revision: 40244 Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulSupportTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/ti/wizard/RESTFullExplorerWizard.java Log: huge refactoring of rest bot tests Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-04-17 13:44:25 UTC (rev 40243) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-04-17 13:45:41 UTC (rev 40244) @@ -11,23 +11,10 @@ package org.jboss.tools.ws.ui.bot.test.rest; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.TestConfigurator; -import org.jboss.tools.ui.bot.ext.gen.IPreference; -import org.jboss.tools.ui.bot.ext.helper.BuildPathHelper; -import org.jboss.tools.ui.bot.ext.view.ProblemsView; import org.jboss.tools.ws.ui.bot.test.WSTestBase; -import org.jboss.tools.ws.ui.bot.test.utils.NodeContextUtil; /** * Test base for bot tests using RESTFul support @@ -38,16 +25,13 @@ @Require(server = @Server(), perspective = "Java EE") public class RESTfulTestBase extends WSTestBase { - protected final String PATH_PARAM_VALID_ERROR = "Invalid @PathParam value"; - protected final String VALIDATION_PREFERENCE = "Validation"; - protected final String ENABLE_ALL = "Enable All"; - protected final String JAX_RS_VALIDATOR = "JAX-RS Metamodel Validator"; + protected final RESTfulHelper restfulHelper = new RESTfulHelper(); + protected final String CONFIGURE_MENU_LABEL = "Configure"; protected final String REST_SUPPORT_MENU_LABEL_ADD = "Add JAX-RS 1.1 support..."; protected final String REST_SUPPORT_MENU_LABEL_REMOVE = "Remove JAX-RS 1.1 support..."; protected final String REST_EXPLORER_LABEL = "JAX-RS REST Web Services"; protected final String REST_EXPLORER_LABEL_BUILD = "Building RESTful Web Services..."; - protected final String VALIDATION_SETTINGS_CHANGED = "Validation Settings Changed"; protected final String BASIC_WS_RESOURCE = "/resources/restful/BasicRestfulWS.java.ws"; @@ -57,164 +41,42 @@ protected final String SIMPLE_REST_WS_RESOURCE = "/resources/restful/SimpleRestWS.java.ws"; - private enum ConfigureOption { - ADD, REMOVE; + protected String getWsPackage() { + return "org.rest.test"; } - + + protected String getWsName() { + return "RestService"; + } + @Override public void setup() { + prepareRestProject(); + } + + protected void prepareRestProject() { + if (!projectExists(getWsProjectName())) { - projectHelper.createProject(getWsProjectName()); - if (!isRestSupportEnabled(getWsProjectName())) { + + //importing project without targeted runtime set + importWSTestProject("/resources/projects/" + + getWsProjectName(), getWsProjectName()); + //set target runtime - TO DO + projectHelper.addDefaultRuntimeIntoProject(getWsProjectName()); + + projectExplorer.selectProject(getWsProjectName()); + eclipse.cleanAllProjects(); + bot.sleep(Timing.time3S()); + + if (!restfulHelper.isRestSupportEnabled(getWsProjectName())) { // workaround for EAP 5.1 if (configuredState.getServer().type.equals("EAP") && configuredState.getServer().version.equals("5.1")) { - addRestEasyLibs(getWsProjectName()); + restfulHelper.addRestEasyLibs(getWsProjectName()); } - addRestSupport(getWsProjectName()); + restfulHelper.addRestSupport(getWsProjectName()); } } - - if (!projectExplorer.isFilePresent(getWsProjectName(), "Java Resources", - "src", getWsPackage(), getWsName() + ".java")) { - projectHelper.createClass(getWsProjectName(), getWsPackage(), getWsName()); - } } - protected SWTBotTreeItem[] getRESTValidationErrors(String wsProjectName) { - return ProblemsView.getFilteredErrorsTreeItems(bot, - PATH_PARAM_VALID_ERROR, "/" + wsProjectName, null, null); - } - - protected void enableRESTValidation() { - modifyRESTValidation(ConfigureOption.ADD); - } - - protected void disableRESTValidation() { - modifyRESTValidation(ConfigureOption.REMOVE); - } - - /** - * DO IT BETTER!!!!!!!!!!!!!!!!!! - */ - protected void modifyRESTValidation(ConfigureOption option) { - - SWTBot validationBot = openPreferencePage(VALIDATION_PREFERENCE, - new ArrayList<String>()); - - validationBot.button(ENABLE_ALL).click(); - - if (option == ConfigureOption.REMOVE) { - - SWTBotTable validatorTable = validationBot.table(); - int restValidationRow = -1; - for (int row = 0; row < validatorTable.rowCount(); row++) { - if (validatorTable.getTableItem(row).getText() - .equals(JAX_RS_VALIDATOR)) { - restValidationRow = row; - break; - } - } - - assertTrue(restValidationRow >= 0); - - validatorTable.click(restValidationRow, 1); - validatorTable.click(restValidationRow, 2); - } - - validationBot.button("OK").click(); - if (bot.activeShell().getText().equals(VALIDATION_SETTINGS_CHANGED)) { - bot.activeShell().bot().button("Yes").click(); - } - - bot.sleep(Timing.time3S()); - util.waitForNonIgnoredJobs(); - - } - - protected void addRestSupport(String wsProjectName) { - configureRestSupport(wsProjectName, ConfigureOption.ADD); - } - - protected void removeRestSupport(String wsProjectName) { - configureRestSupport(wsProjectName, ConfigureOption.REMOVE); - } - - protected boolean isRestSupportEnabled(String wsProjectName) { - return (projectExplorer.isFilePresent(wsProjectName, - RESTFulAnnotations.REST_EXPLORER_LABEL.getLabel()) || projectExplorer - .isFilePresent(wsProjectName, - RESTFulAnnotations.REST_EXPLORER_LABEL_BUILD.getLabel())); - } - - - @SuppressWarnings("static-access") - private List<String> addRestEasyLibs(String wsProjectName) { - - List<File> restLibsPaths = getPathForRestLibs(); - - List<String> variables = new ArrayList<String>(); - - BuildPathHelper buildPathHelper = new BuildPathHelper(); - - for (File f : restLibsPaths) { - variables.add(buildPathHelper.addExternalJar(f.getPath(), getWsProjectName(), true)); - } - - return variables; - - } - - private List<File> getPathForRestLibs() { - - assertTrue(TestConfigurator.currentConfig.getServer().type.equals("EAP")); - - String runtimeHome = TestConfigurator.currentConfig.getServer().runtimeHome; - - // index of last occurence of "/" in EAP runtime path: jboss-eap-5.1/jboss-as - int indexOfAS = runtimeHome.lastIndexOf("/"); - - // jboss-eap-5.1/jboss-as --> jboss-eap-5.1 - String eapDirHome = runtimeHome.substring(0, indexOfAS); - - String restEasyDirPath = eapDirHome + "/" + "resteasy"; - File restEasyDir = new File(restEasyDirPath); - - String[] restEasyLibs = {"jaxrs-api.jar"}; - - return resourceHelper.searchAllFiles(restEasyDir, restEasyLibs); - } - - private void configureRestSupport(String wsProjectName, - ConfigureOption option) { - projectExplorer.selectProject(wsProjectName); - SWTBotTree tree = projectExplorer.bot().tree(); - SWTBotTreeItem item = tree.getTreeItem(wsProjectName); - item.expand(); - NodeContextUtil.nodeContextMenu(tree, item, - RESTFulAnnotations.CONFIGURE_MENU_LABEL.getLabel(), - option == ConfigureOption.ADD ? RESTFulAnnotations.REST_SUPPORT_MENU_LABEL_ADD - .getLabel() : RESTFulAnnotations.REST_SUPPORT_MENU_LABEL_REMOVE - .getLabel()).click(); - bot.sleep(Timing.time2S()); - util.waitForAll(); - - } - - private SWTBot openPreferencePage(final String name, - final List<String> groupPath) { - return open.preferenceOpen(new IPreference() { - - @Override - public String getName() { - return name; - } - - @Override - public List<String> getGroupPath() { - return groupPath; - } - }); - } - } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-04-17 13:44:25 UTC (rev 40243) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-04-17 13:45:41 UTC (rev 40244) @@ -16,7 +16,8 @@ import org.jboss.tools.ui.bot.ext.helper.ContentAssistHelper; import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase; -import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulExplorerTest; +import org.junit.After; +import org.junit.Before; import org.junit.Test; /** @@ -26,10 +27,6 @@ */ public class RESTfulCompletionTest extends RESTfulTestBase{ - private final String GET_METHOD_PATH = "/{userId}"; - - private final String EMPTY_PATH_PARAM = ""; - private final String CORRECT_PATH_PARAM = "userId"; private final String INCORRECT_PATH_PARAM = "someId"; @@ -40,25 +37,24 @@ private final List<String> EXP_EMPTY_COMPLETION_RESULT = Arrays.asList("No Default Proposals"); - protected String getWsProjectName() { - return "RestServicesCompletion"; + @Before + public void setup() { + } - protected String getWsPackage() { - return "org.rest.services.completion.test"; + @After + public void cleanup() { + projectExplorer.deleteAllProjects(); } - - protected String getWsName() { - return "RestService"; - } @Test public void testWithEmptyPrefix() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), - false, getWsPackage(), getWsName(), GET_METHOD_PATH, EMPTY_PATH_PARAM); + setWsProjectName("restCompletion1"); + prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); ContentAssistHelper.checkContentAssistContent(bot, getWsName() + ".java", PATH_PARAM_NAVIGATION, PATH_PARAM_NAVIGATION.length() + 1, 0, EXP_NON_EMPTY_COMPLETION_RESULT); @@ -68,10 +64,11 @@ @Test public void testWithValidPrefixAtTheEnd() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), - false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM); + setWsProjectName("restCompletion2"); + prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); ContentAssistHelper.checkContentAssistContent(bot, getWsName() + ".java", PATH_PARAM_NAVIGATION, PATH_PARAM_NAVIGATION.length() + CORRECT_PATH_PARAM.length() + 1, @@ -82,10 +79,11 @@ @Test public void testWithValidPrefixInTheBeginning() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), - false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM); + setWsProjectName("restCompletion2"); + prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); ContentAssistHelper.checkContentAssistContent(bot, getWsName() + ".java", PATH_PARAM_NAVIGATION, PATH_PARAM_NAVIGATION.length() + 1, 0, EXP_NON_EMPTY_COMPLETION_RESULT); @@ -95,10 +93,11 @@ @Test public void testWithInvalidPrefixAtTheEnd() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), - false, getWsPackage(), getWsName(), GET_METHOD_PATH, INCORRECT_PATH_PARAM); + setWsProjectName("restCompletion3"); + prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); ContentAssistHelper.checkContentAssistContent(bot, getWsName() + ".java", PATH_PARAM_NAVIGATION, PATH_PARAM_NAVIGATION.length() + INCORRECT_PATH_PARAM.length() + 1, @@ -109,10 +108,11 @@ @Test public void testWithInvalidPrefixInTheBeginning() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), - false, getWsPackage(), getWsName(), GET_METHOD_PATH, INCORRECT_PATH_PARAM); + setWsProjectName("restCompletion3"); + prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); ContentAssistHelper.checkContentAssistContent(bot, getWsName() + ".java", PATH_PARAM_NAVIGATION, PATH_PARAM_NAVIGATION.length() + 1, 0, EXP_NON_EMPTY_COMPLETION_RESULT); @@ -122,10 +122,11 @@ @Test public void testWithAllInvalidParamSelection() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), - false, getWsPackage(), getWsName(), GET_METHOD_PATH, INCORRECT_PATH_PARAM); + setWsProjectName("restCompletion3"); + prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); ContentAssistHelper.checkContentAssistContent(bot, getWsName() + ".java", PATH_PARAM_NAVIGATION, PATH_PARAM_NAVIGATION.length() + 1, INCORRECT_PATH_PARAM.length(), EXP_NON_EMPTY_COMPLETION_RESULT); Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-04-17 13:44:25 UTC (rev 40243) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-04-17 13:45:41 UTC (rev 40244) @@ -16,6 +16,8 @@ import org.jboss.tools.ws.ui.bot.test.rest.RESTFulAnnotations; import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase; import org.jboss.tools.ws.ui.bot.test.ti.wizard.RESTFullExplorerWizard; +import org.junit.After; +import org.junit.Before; import org.junit.Test; /** @@ -27,28 +29,26 @@ public class RESTfulExplorerTest extends RESTfulTestBase { private RESTFullExplorerWizard restfulWizard = null; + + private String restBasicProjectName = "restBasic"; + private String restAdvancedProjectName = "restAdvanced"; - protected String getWsProjectName() { - return "RestServicesExplorer"; + @Before + public void setup() { + } - protected String getWsPackage() { - return "org.rest.explorer.services.test"; + @After + public void cleanup() { + projectExplorer.deleteAllProjects(); } - - protected String getWsName() { - return "RestService"; - } @Test public void testAddingSimpleRESTMethods() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class. - getResourceAsStream(BASIC_WS_RESOURCE), - false, getWsPackage(), getWsName()); + setWsProjectName(restBasicProjectName); + prepareRestProject(); - bot.sleep(Timing.time2S()); restfulWizard = new RESTFullExplorerWizard(getWsProjectName()); SWTBotTreeItem[] restServices = restfulWizard.getAllRestServices(); @@ -67,14 +67,11 @@ @Test public void testAddingAdvancedRESTMethods() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class. - getResourceAsStream(ADVANCED_WS_RESOURCE), - false, getWsPackage(), getWsName()); + setWsProjectName(restAdvancedProjectName); + prepareRestProject(); - bot.sleep(Timing.time2S()); restfulWizard = new RESTFullExplorerWizard(getWsProjectName()); - SWTBotTreeItem[] restServices = restfulWizard.getAllRestServices(); + SWTBotTreeItem[] restServices = restfulWizard.getAllRestServices(); assertTrue(restServices.length + " RESTful services was found instead of 4.", restServices.length == 4); @@ -109,18 +106,17 @@ @Test public void testEditingSimpleRESTMethods() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class. - getResourceAsStream(BASIC_WS_RESOURCE), - false, getWsPackage(), getWsName()); + setWsProjectName(restBasicProjectName); + prepareRestProject(); - bot.sleep(Timing.time2S()); restfulWizard = new RESTFullExplorerWizard(getWsProjectName()); SWTBotTreeItem[] restServices = restfulWizard.getAllRestServices(); assertTrue("All RESTful services (GET, DELETE, POST, PUT) should be present but they are not", allRestServicesArePresent(restServices)); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); resourceHelper.replaceInEditor(bot.activeEditor().toTextEditor(), "@DELETE", "@GET"); bot.sleep(Timing.time2S()); @@ -141,12 +137,9 @@ @Test public void testEditingAdvancedRESTMethods() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class. - getResourceAsStream(ADVANCED_WS_RESOURCE), - false, getWsPackage(), getWsName()); + setWsProjectName(restAdvancedProjectName); + prepareRestProject(); - bot.sleep(Timing.time2S()); restfulWizard = new RESTFullExplorerWizard(getWsProjectName()); SWTBotTreeItem[] restServices = restfulWizard.getAllRestServices(); @@ -159,6 +152,8 @@ } } + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); resourceHelper.replaceInEditor(bot.activeEditor().toTextEditor(), "/delete/{id}", "delete/edited/{id}"); resourceHelper.replaceInEditor(bot.activeEditor().toTextEditor(), "@DELETE", "@DELETE" + LINE_SEPARATOR + "@Produces(\"text/plain\")"); @@ -178,18 +173,17 @@ @Test public void testDeletingRESTMethods() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class. - getResourceAsStream(BASIC_WS_RESOURCE), - false, getWsPackage(), getWsName()); + setWsProjectName(restBasicProjectName); + prepareRestProject(); - bot.sleep(Timing.time2S()); restfulWizard = new RESTFullExplorerWizard(getWsProjectName()); SWTBotTreeItem[] restServices = restfulWizard.getAllRestServices(); assertTrue(restServices.length + " RESTful services was found instead of 4.", restServices.length == 4); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), RESTfulExplorerTest.class. getResourceAsStream(EMPTY_WS_RESOURCE), Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulSupportTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulSupportTest.java 2012-04-17 13:44:25 UTC (rev 40243) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulSupportTest.java 2012-04-17 13:45:41 UTC (rev 40244) @@ -26,14 +26,6 @@ return "RestExplorerTest"; } - protected String getWsPackage() { - return "org.rest.explorer.validation.test"; - } - - protected String getWsName() { - return "RestService"; - } - @Before public void setup() { if (!projectExists(getWsProjectName())) { @@ -45,8 +37,8 @@ @Test public void test_JAXRS_ExplorerSupport() { - addRestSupport(getWsProjectName()); - assertTrue(isRestSupportEnabled(getWsProjectName())); + restfulHelper.addRestSupport(getWsProjectName()); + assertTrue(restfulHelper.isRestSupportEnabled(getWsProjectName())); } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-04-17 13:44:25 UTC (rev 40243) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-04-17 13:45:41 UTC (rev 40244) @@ -13,6 +13,8 @@ import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase; import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulExplorerTest; +import org.junit.After; +import org.junit.Before; import org.junit.Test; /** @@ -26,84 +28,81 @@ private final String CORRECT_PATH_PARAM = "id"; private final String BAD_PATH_PARAM = "customerId"; - protected String getWsProjectName() { - return "RestServicesValidation"; + @Before + public void setup() { + } - protected String getWsPackage() { - return "org.rest.validation.services.test"; + @After + public void cleanup() { + projectExplorer.deleteAllProjects(); } - - protected String getWsName() { - return "RestService"; - } @Test public void testCorrectValueValidation() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), - false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM); + setWsProjectName("restValidation1"); + prepareRestProject(); - assertTrue(getRESTValidationErrors(getWsProjectName()).length == 0); + assertTrue(restfulHelper.getRESTValidationErrors(getWsProjectName()).length == 0); } @Test public void testBadValueValidation() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), - false, getWsPackage(), getWsName(), GET_METHOD_PATH, BAD_PATH_PARAM); + setWsProjectName("restValidation2"); + prepareRestProject(); - assertTrue("" + getRESTValidationErrors(getWsProjectName()).length, - getRESTValidationErrors(getWsProjectName()).length == 1); + assertTrue("" + restfulHelper.getRESTValidationErrors(getWsProjectName()).length, + restfulHelper.getRESTValidationErrors(getWsProjectName()).length == 1); } @Test public void testCorrectToBadValueValidation() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), - false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM); + setWsProjectName("restValidation1"); + prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), false, getWsPackage(), getWsName(), GET_METHOD_PATH, BAD_PATH_PARAM); - assertTrue("" + getRESTValidationErrors(getWsProjectName()).length, - getRESTValidationErrors(getWsProjectName()).length == 1); + assertTrue("" + restfulHelper.getRESTValidationErrors(getWsProjectName()).length, + restfulHelper.getRESTValidationErrors(getWsProjectName()).length == 1); } @Test public void testBadToCorrectValueValidation() { - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), - false, getWsPackage(), getWsName(), GET_METHOD_PATH, BAD_PATH_PARAM); + setWsProjectName("restValidation2"); + prepareRestProject(); + packageExplorer.openFile(getWsProjectName(), "src", + getWsPackage(), getWsName() + ".java").toTextEditor(); resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), false, getWsPackage(), getWsName(), GET_METHOD_PATH, CORRECT_PATH_PARAM); - assertTrue("" + getRESTValidationErrors(getWsProjectName()).length, - getRESTValidationErrors(getWsProjectName()).length == 0); + assertTrue("" + restfulHelper.getRESTValidationErrors(getWsProjectName()).length, + restfulHelper.getRESTValidationErrors(getWsProjectName()).length == 0); } @Test public void testJAX_RS_Validator() { - disableRESTValidation(); + restfulHelper.disableRESTValidation(); - resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"), - RESTfulExplorerTest.class.getResourceAsStream(SIMPLE_REST_WS_RESOURCE), - false, getWsPackage(), getWsName(), GET_METHOD_PATH, BAD_PATH_PARAM); + setWsProjectName("restValidation2"); + prepareRestProject(); - assertTrue("" + getRESTValidationErrors(getWsProjectName()).length, - getRESTValidationErrors(getWsProjectName()).length == 0); + assertTrue("" + restfulHelper.getRESTValidationErrors(getWsProjectName()).length, + restfulHelper.getRESTValidationErrors(getWsProjectName()).length == 0); - enableRESTValidation(); + restfulHelper.enableRESTValidation(); - assertTrue("" + getRESTValidationErrors(getWsProjectName()).length, - getRESTValidationErrors(getWsProjectName()).length == 1); + assertTrue("" + restfulHelper.getRESTValidationErrors(getWsProjectName()).length, + restfulHelper. getRESTValidationErrors(getWsProjectName()).length == 1); } } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/ti/wizard/RESTFullExplorerWizard.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/ti/wizard/RESTFullExplorerWizard.java 2012-04-17 13:44:25 UTC (rev 40243) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/ti/wizard/RESTFullExplorerWizard.java 2012-04-17 13:45:41 UTC (rev 40244) @@ -21,7 +21,8 @@ public RESTFullExplorerWizard(String wsProjectName) { String[] pathToRestExplorer = {wsProjectName}; - restFulExplorer = projectExplorer.selectTreeItem(RESTFulAnnotations.REST_EXPLORER_LABEL.getLabel(), + restFulExplorer = projectExplorer.selectTreeItem( + RESTFulAnnotations.REST_EXPLORER_LABEL.getLabel(), pathToRestExplorer).expand(); }

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40243 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-04-17 09:44:25 -0400 (Tue, 17 Apr 2012) New Revision: 40243 Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathParameterTest.java Log: template of new test added Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathParameterTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathParameterTest.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/ApplicationPathParameterTest.java 2012-04-17 13:44:25 UTC (rev 40243) @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2010-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.ws.ui.bot.test.rest.validation; + +import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class ApplicationPathParameterTest extends RESTfulTestBase { + + @Override + public String getWsProjectName() { + return "restApplication1"; + } + + @Before + public void setup() { + + } + + @After + public void cleanup() { + projectExplorer.deleteAllProjects(); + } + + @Test + public void testMultipleAppClasses() { + + } + + @Test + public void testWebXmlApplicationOption() { + + } + +}

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40242 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2012-04-17 09:43:22 -0400 (Tue, 17 Apr 2012) New Revision: 40242 Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java Log: include new test Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-04-17 13:43:05 UTC (rev 40241) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-04-17 13:43:22 UTC (rev 40242) @@ -15,6 +15,7 @@ import org.jboss.tools.ws.ui.bot.test.rest.completion.RESTfulCompletionTest; import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulExplorerTest; import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulSupportTest; +import org.jboss.tools.ws.ui.bot.test.rest.validation.ApplicationPathParameterTest; import org.jboss.tools.ws.ui.bot.test.rest.validation.RESTfulValidationTest; import org.jboss.tools.ws.ui.bot.test.sample.test.SampleRESTWebServiceTest; import org.jboss.tools.ws.ui.bot.test.sample.test.SampleSoapWebServiceTest; @@ -59,6 +60,7 @@ RESTfulExplorerTest.class, RESTfulValidationTest.class, RESTfulCompletionTest.class, + ApplicationPathParameterTest.class, BottomUpWSTest.class, TopDownWSTest.class, WsClientTest.class, @@ -66,6 +68,6 @@ EAPFromJavaTest.class, EAPFromWSDLTest.class }) -public class WSAllBotTests { +public class WSAllBotTests extends AbstractTestSuite { }

13 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits April 2012