JBoss Tools SVN: r13159 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-01-21 04:46:34 -0500 (Wed, 21 Jan 2009)
New Revision: 13159
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java
Log:
JBIDE-3475 - disabled automatic multicast discovery
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java 2009-01-21 08:52:19 UTC (rev 13158)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java 2009-01-21 09:46:34 UTC (rev 13159)
@@ -124,6 +124,7 @@
"org.jboss.naming:org.jnp.interfaces");
props.put("java.naming.provider.url", "jnp://" + jbs.getHost() + ":"
+ port);
+ props.put("jnp.disableDiscovery", "true");
}
return props;
}
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r13158 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-01-21 03:52:19 -0500 (Wed, 21 Jan 2009)
New Revision: 13158
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java
Log:
JBIDE-3461 - thread.yield and a sleep(100) should fix this issue.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2009-01-21 05:54:33 UTC (rev 13157)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2009-01-21 08:52:19 UTC (rev 13158)
@@ -58,10 +58,12 @@
ILaunchConfigurationWorkingCopy wc = createLaunchConfiguration(server);
ILaunch launch = wc.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor());
IProcess stopProcess = launch.getProcesses()[0];
- while( !stopProcess.isTerminated() && server.getServerState() == IServer.STATE_STOPPING) {}
- if( !stopProcess.isTerminated()) {
- stopProcess.terminate();
- return false;
+ while( !stopProcess.isTerminated()) {
+ try {
+ Thread.yield();
+ Thread.sleep(100);
+ } catch(InterruptedException ie) {
+ }
}
return stopProcess.getExitValue() == 0 ? true : false;
} catch( CoreException ce ) {
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r13157 - trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/bin.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-01-21 00:54:33 -0500 (Wed, 21 Jan 2009)
New Revision: 13157
Modified:
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/bin/
Log:
Property changes on: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/bin
___________________________________________________________________
Name: svn:ignore
+ org
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r13156 - trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-01-21 00:48:49 -0500 (Wed, 21 Jan 2009)
New Revision: 13156
Modified:
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF
Log:
[JBIDE-3399] tests still don't run - add jbpm and common to reqs of jbpm-convert builder
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF 2009-01-21 00:49:32 UTC (rev 13155)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF 2009-01-21 05:48:49 UTC (rev 13156)
@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.jboss.tools.jbpm.convert.test;singleton:=true
Bundle-Version: 1.0.0
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.jboss.tools.jbpm.convert;bundle-version="1.0.0"
+Require-Bundle: org.jboss.tools.jbpm.convert
Import-Package: junit.framework,
org.eclipse.core.resources,
org.eclipse.core.runtime;version="3.4.0",
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r13155 - trunk/vpe/features/org.jboss.tools.xulrunner.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-01-20 19:49:32 -0500 (Tue, 20 Jan 2009)
New Revision: 13155
Modified:
trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties
trunk/vpe/features/org.jboss.tools.xulrunner.feature/license.html
Log:
https://jira.jboss.org/jira/browse/JBIDE-3468 license updated to MPL
Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties 2009-01-20 23:32:03 UTC (rev 13154)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties 2009-01-21 00:49:32 UTC (rev 13155)
@@ -28,8 +28,7 @@
description=A feature that provides Mozilla's XULRunner as various platform-dependent plug-ins for Eclipse.
# "copyright" property - text of the "Feature Update Copyright"
-copyright=Copyright (c) 2008 JBoss, a division of Red Hat and others.\nAll rights reserved. This program and the accompanying materials\n
-are made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp\://www.eclipse.org/legal/epl-v10.html\n\nContributors\:\nJBoss, a division of Red Hat - Initial implementation.\n
+copyright=Copyright (C) 2007 Mozilla and others
############### end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
@@ -38,5 +37,5 @@
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
-license=ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\nMarch 17, 2005\n\nUsage Of Content\n\nTHE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\nOTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\nUSE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\nAGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\nNOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\nAGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\nAND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\nOR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\nTERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\nOF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\nBELOW, THEN YOU MAY NOT USE THE CONTENT.\n\nApplicable Licenses\n\nUnless otherwise indicated, all Content made available by the Eclipse Foundation\nis provided to you under the terms and conditio!
ns of the Eclipse Public\nLicense Version 1.0 ("EPL"). A copy of the EPL is provided with this\nContent and is also available at http\://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.\n\nContent includes, but is not limited to, source code, object code,\ndocumentation and other files maintained in the Eclipse.org CVS\nrepository ("Repository") in CVS modules ("Modules") and made available\nas downloadable archives ("Downloads").\n\n- Content may be structured and packaged into modules to facilitate delivering,\nextending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\nplug-in fragments ("Fragments"), and features ("Features").\n- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\nin a directory named "plugins".\n- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\nEach Feature may be packaged as a sub-directory in a directory!
named "features".\nWithin a Feature, files named "feature.xml" may co
ntain a list of the names and version\nnumbers of the Plug-ins and/or Fragments associated with that Feature.\n- Features may also include other Features ("Included Features"). Within a Feature, files\nnamed "feature.xml" may contain a list of the names and version numbers of Included Features.\n\nFeatures may also include other Features ("Included Features"). Files named\n"feature.xml" may contain a list of the names and version numbers of\nIncluded Features.\n\nThe terms and conditions governing Plug-ins and Fragments should be\ncontained in files named "about.html" ("Abouts"). The terms and\nconditions governing Features and Included Features should be contained\nin files named "license.html" ("Feature Licenses"). Abouts and Feature\nLicenses may be located in any directory of a Download or Module\nincluding, but not limited to the following locations\:\n\n- The top-level (root) directory\n- Plug-in and Fragment directories\n- Inside Plug-ins and Fragments packaged as JAR!
s\n- Sub-directories of the directory named "src" of certain Plug-ins\n- Feature directories\n\nNote\: if a Feature made available by the Eclipse Foundation is installed using the\nEclipse Update Manager, you must agree to a license ("Feature Update\nLicense") during the installation process. If the Feature contains\nIncluded Features, the Feature Update License should either provide you\nwith the terms and conditions governing the Included Features or inform\nyou where you can locate them. Feature Update Licenses may be found in\nthe "license" property of files named "feature.properties". Such Abouts,\nFeature Licenses and Feature Update Licenses contain the terms and\nconditions (or references to such terms and conditions) that govern your\nuse of the associated Content in that directory.\n\nTHE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\nTO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\nSOME OF THESE OTHER LICENSE AGREEMENTS MA!
Y INCLUDE (BUT ARE NOT LIMITED TO)\:\n\n- Common Public License Versio
n 1.0 (available at http\://www.eclipse.org/legal/cpl-v10.html)\n- Apache Software License 1.1 (available at http\://www.apache.org/licenses/LICENSE)\n- Apache Software License 2.0 (available at http\://www.apache.org/licenses/LICENSE-2.0)\n- IBM Public License 1.0 (available at http\://oss.software.ibm.com/developerworks/opensource/license10.html)\n- Metro Link Public License 1.00 (available at http\://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n- Mozilla Public License Version 1.1 (available at http\://www.mozilla.org/MPL/MPL-1.1.html)\n\nIT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\nTO USE OF THE CONTENT. If no About, Feature License or Feature Update License\nis provided, please contact the Eclipse Foundation to determine what terms and conditions\ngovern that particular Content.\n\nCryptography\n\nContent may contain encryption software. The country in which you are\ncurrently may have restrictions on the import, posse!
ssion, and use,\nand/or re-export to another country, of encryption software. BEFORE\nusing any encryption software, please check the country's laws,\nregulations and policies concerning the import, possession, or use,\nand re-export of encryption software, to see if this is permitted.\n\nJava and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+license=\n MOZILLA PUBLIC LICENSE\n Version 1.1\n\n ---------------\n\n1. Definitions.\n\n 1.0.1. "Commercial Use" means distribution or otherwise making the\n Covered Code available to a third party.\n\n 1.1. "Contributor" means each entity that creates or contributes to\n the creation of Modifications.\n\n 1.2. "Contributor Version" means the combination of the Original\n Code, prior Modifications used by a Contributor, and the Modifications\n made by that particular Contributor.\n\n 1.3. "Covered Code" means the Original Code or Modifications or the\n combination of the Original Code and Modifications, in each case\n including portions thereof.\n\n 1.4. "Electronic Distribution Mechanism" means a mechanism generally\n accepted in the software development community for the electronic\n transfer of data.\n\n 1.5. "Executable" means Covered Code in any fo!
rm other than Source\n Code.\n\n 1.6. "Initial Developer" means the individual or entity identified\n as the Initial Developer in the Source Code notice required by Exhibit\n A.\n\n 1.7. "Larger Work" means a work which combines Covered Code or\n portions thereof with code not governed by the terms of this License.\n\n 1.8. "License" means this document.\n\n 1.8.1. "Licensable" means having the right to grant, to the maximum\n extent possible, whether at the time of the initial grant or\n subsequently acquired, any and all of the rights conveyed herein.\n\n 1.9. "Modifications" means any addition to or deletion from the\n substance or structure of either the Original Code or any previous\n Modifications. When Covered Code is released as a series of files, a\n Modification is:\n A. Any addition to or deletion from the contents of a file\n containing Original Code or previous Modifications.\n\n !
B. Any new file that contains any part of the Original Code or\n
previous Modifications.\n\n 1.10. "Original Code" means Source Code of computer software code\n which is described in the Source Code notice required by Exhibit A as\n Original Code, and which, at the time of its release under this\n License is not already Covered Code governed by this License.\n\n 1.10.1. "Patent Claims" means any patent claim(s), now owned or\n hereafter acquired, including without limitation, method, process,\n and apparatus claims, in any patent Licensable by grantor.\n\n 1.11. "Source Code" means the preferred form of the Covered Code for\n making modifications to it, including all modules it contains, plus\n any associated interface definition files, scripts used to control\n compilation and installation of an Executable, or source code\n differential comparisons against either the Original Code or another\n well known, available Covered Code of the Contributor's choice. The\n Source Code ca!
n be in a compressed or archival form, provided the\n appropriate decompression or de-archiving software is widely available\n for no charge.\n\n 1.12. "You" (or "Your") means an individual or a legal entity\n exercising rights under, and complying with all of the terms of, this\n License or a future version of this License issued under Section 6.1.\n For legal entities, "You" includes any entity which controls, is\n controlled by, or is under common control with You. For purposes of\n this definition, "control" means (a) the power, direct or indirect,\n to cause the direction or management of such entity, whether by\n contract or otherwise, or (b) ownership of more than fifty percent\n (50%) of the outstanding shares or beneficial ownership of such\n entity.\n\n2. Source Code License.\n\n 2.1. The Initial Developer Grant.\n The Initial Developer hereby grants You a world-wide, royalty-free,\n non-exclusive licens!
e, subject to third party intellectual property\n claims:\n
(a) under intellectual property rights (other than patent or\n trademark) Licensable by Initial Developer to use, reproduce,\n modify, display, perform, sublicense and distribute the Original\n Code (or portions thereof) with or without Modifications, and/or\n as part of a Larger Work; and\n\n (b) under Patents Claims infringed by the making, using or\n selling of Original Code, to make, have made, use, practice,\n sell, and offer for sale, and/or otherwise dispose of the\n Original Code (or portions thereof).\n\n (c) the licenses granted in this Section 2.1(a) and (b) are\n effective on the date Initial Developer first distributes\n Original Code under the terms of this License.\n\n (d) Notwithstanding Section 2.1(b) above, no patent license is\n granted: 1) for code that You delete from the Original Code; 2)\n separate from the Original Code; o!
r 3) for infringements caused\n by: i) the modification of the Original Code or ii) the\n combination of the Original Code with other software or devices.\n\n 2.2. Contributor Grant.\n Subject to third party intellectual property claims, each Contributor\n hereby grants You a world-wide, royalty-free, non-exclusive license\n\n (a) under intellectual property rights (other than patent or\n trademark) Licensable by Contributor, to use, reproduce, modify,\n display, perform, sublicense and distribute the Modifications\n created by such Contributor (or portions thereof) either on an\n unmodified basis, with other Modifications, as Covered Code\n and/or as part of a Larger Work; and\n\n (b) under Patent Claims infringed by the making, using, or\n selling of Modifications made by that Contributor either alone\n and/or in combination with its Contributor Version (or por!
tions\n of such combination), to make, use, sell, offer for s
ale, have\n made, and/or otherwise dispose of: 1) Modifications made by that\n Contributor (or portions thereof); and 2) the combination of\n Modifications made by that Contributor with its Contributor\n Version (or portions of such combination).\n\n (c) the licenses granted in Sections 2.2(a) and 2.2(b) are\n effective on the date Contributor first makes Commercial Use of\n the Covered Code.\n\n (d) Notwithstanding Section 2.2(b) above, no patent license is\n granted: 1) for any code that Contributor has deleted from the\n Contributor Version; 2) separate from the Contributor Version;\n 3) for infringements caused by: i) third party modifications of\n Contributor Version or ii) the combination of Modifications made\n by that Contributor with other software (except as part of the\n Contributor Version) or other devices; or 4) under Patent Claim!
s\n infringed by Covered Code in the absence of Modifications made by\n that Contributor.\n\n3. Distribution Obligations.\n\n 3.1. Application of License.\n The Modifications which You create or to which You contribute are\n governed by the terms of this License, including without limitation\n Section 2.2. The Source Code version of Covered Code may be\n distributed only under the terms of this License or a future version\n of this License released under Section 6.1, and You must include a\n copy of this License with every copy of the Source Code You\n distribute. You may not offer or impose any terms on any Source Code\n version that alters or restricts the applicable version of this\n License or the recipients' rights hereunder. However, You may include\n an additional document offering the additional rights described in\n Section 3.5.\n\n 3.2. Availability of Source Code.\n Any Modification which Y!
ou create or to which You contribute must be\n made available in S
ource Code form under the terms of this License\n either on the same media as an Executable version or via an accepted\n Electronic Distribution Mechanism to anyone to whom you made an\n Executable version available; and if made available via Electronic\n Distribution Mechanism, must remain available for at least twelve (12)\n months after the date it initially became available, or at least six\n (6) months after a subsequent version of that particular Modification\n has been made available to such recipients. You are responsible for\n ensuring that the Source Code version remains available even if the\n Electronic Distribution Mechanism is maintained by a third party.\n\n 3.3. Description of Modifications.\n You must cause all Covered Code to which You contribute to contain a\n file documenting the changes You made to create that Covered Code and\n the date of any change. You must include a prominent statement that\n t!
he Modification is derived, directly or indirectly, from Original\n Code provided by the Initial Developer and including the name of the\n Initial Developer in (a) the Source Code, and (b) in any notice in an\n Executable version or related documentation in which You describe the\n origin or ownership of the Covered Code.\n\n 3.4. Intellectual Property Matters\n (a) Third Party Claims.\n If Contributor has knowledge that a license under a third party's\n intellectual property rights is required to exercise the rights\n granted by such Contributor under Sections 2.1 or 2.2,\n Contributor must include a text file with the Source Code\n distribution titled "LEGAL" which describes the claim and the\n party making the claim in sufficient detail that a recipient will\n know whom to contact. If Contributor obtains such knowledge after\n the Modification is made available as describ!
ed in Section 3.2,\n Contributor shall promptly modify the LE
GAL file in all copies\n Contributor makes available thereafter and shall take other steps\n (such as notifying appropriate mailing lists or newsgroups)\n reasonably calculated to inform those who received the Covered\n Code that new knowledge has been obtained.\n\n (b) Contributor APIs.\n If Contributor's Modifications include an application programming\n interface and Contributor has knowledge of patent licenses which\n are reasonably necessary to implement that API, Contributor must\n also include this information in the LEGAL file.\n\n (c) Representations.\n Contributor represents that, except as disclosed pursuant to\n Section 3.4(a) above, Contributor believes that Contributor's\n Modifications are Contributor's original creation(s) and/or\n Contributor has sufficient rights to grant the rights conveyed by\n this License.\n\n !
3.5. Required Notices.\n You must duplicate the notice in Exhibit A in each file of the Source\n Code. If it is not possible to put such notice in a particular Source\n Code file due to its structure, then You must include such notice in a\n location (such as a relevant directory) where a user would be likely\n to look for such a notice. If You created one or more Modification(s)\n You may add your name as a Contributor to the notice described in\n Exhibit A. You must also duplicate this License in any documentation\n for the Source Code where You describe recipients' rights or ownership\n rights relating to Covered Code. You may choose to offer, and to\n charge a fee for, warranty, support, indemnity or liability\n obligations to one or more recipients of Covered Code. However, You\n may do so only on Your own behalf, and not on behalf of the Initial\n Developer or any Contributor. You must make it absolutely clear !
than\n any such warranty, support, indemnity or liability obligati
on is\n offered by You alone, and You hereby agree to indemnify the Initial\n Developer and every Contributor for any liability incurred by the\n Initial Developer or such Contributor as a result of warranty,\n support, indemnity or liability terms You offer.\n\n 3.6. Distribution of Executable Versions.\n You may distribute Covered Code in Executable form only if the\n requirements of Section 3.1-3.5 have been met for that Covered Code,\n and if You include a notice stating that the Source Code version of\n the Covered Code is available under the terms of this License,\n including a description of how and where You have fulfilled the\n obligations of Section 3.2. The notice must be conspicuously included\n in any notice in an Executable version, related documentation or\n collateral in which You describe recipients' rights relating to the\n Covered Code. You may distribute the Executable version of Covered\n Code o!
r ownership rights under a license of Your choice, which may\n contain terms different from this License, provided that You are in\n compliance with the terms of this License and that the license for the\n Executable version does not attempt to limit or alter the recipient's\n rights in the Source Code version from the rights set forth in this\n License. If You distribute the Executable version under a different\n license You must make it absolutely clear that any terms which differ\n from this License are offered by You alone, not by the Initial\n Developer or any Contributor. You hereby agree to indemnify the\n Initial Developer and every Contributor for any liability incurred by\n the Initial Developer or such Contributor as a result of any such\n terms You offer.\n\n 3.7. Larger Works.\n You may create a Larger Work by combining Covered Code with other code\n not governed by the terms of this License and distribute!
the Larger\n Work as a single product. In such a case, You must m
ake sure the\n requirements of this License are fulfilled for the Covered Code.\n\n4. Inability to Comply Due to Statute or Regulation.\n\n If it is impossible for You to comply with any of the terms of this\n License with respect to some or all of the Covered Code due to\n statute, judicial order, or regulation then You must: (a) comply with\n the terms of this License to the maximum extent possible; and (b)\n describe the limitations and the code they affect. Such description\n must be included in the LEGAL file described in Section 3.4 and must\n be included with all distributions of the Source Code. Except to the\n extent prohibited by statute or regulation, such description must be\n sufficiently detailed for a recipient of ordinary skill to be able to\n understand it.\n\n5. Application of this License.\n\n This License applies to code to which the Initial Developer has\n attached the notice in Exhibit A and to related!
Covered Code.\n\n6. Versions of the License.\n\n 6.1. New Versions.\n Netscape Communications Corporation ("Netscape") may publish revised\n and/or new versions of the License from time to time. Each version\n will be given a distinguishing version number.\n\n 6.2. Effect of New Versions.\n Once Covered Code has been published under a particular version of the\n License, You may always continue to use it under the terms of that\n version. You may also choose to use such Covered Code under the terms\n of any subsequent version of the License published by Netscape. No one\n other than Netscape has the right to modify the terms applicable to\n Covered Code created under this License.\n\n 6.3. Derivative Works.\n If You create or use a modified version of this License (which you may\n only do in order to apply it to code which is not already Covered Code\n governed by this License), You must (a) rename Your license so!
that\n the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",\n
"MPL", "NPL" or any confusingly similar phrase do not appear in your\n license (except to note that your license differs from this License)\n and (b) otherwise make it clear that Your version of the license\n contains terms which differ from the Mozilla Public License and\n Netscape Public License. (Filling in the name of the Initial\n Developer, Original Code or Contributor in the notice described in\n Exhibit A shall not of themselves be deemed to be modifications of\n this License.)\n\n7. DISCLAIMER OF WARRANTY.\n\n COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,\n WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,\n WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF\n DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.\n THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE\n IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN A!
NY RESPECT,\n YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE\n COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER\n OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF\n ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.\n\n8. TERMINATION.\n\n 8.1. This License and the rights granted hereunder will terminate\n automatically if You fail to comply with terms herein and fail to cure\n such breach within 30 days of becoming aware of the breach. All\n sublicenses to the Covered Code which are properly granted shall\n survive any termination of this License. Provisions which, by their\n nature, must remain in effect beyond the termination of this License\n shall survive.\n\n 8.2. If You initiate litigation by asserting a patent infringement\n claim (excluding declatory judgment actions) against Initial Developer\n or a Contributor (the Initial De!
veloper or Contributor against whom\n You file such action is refe
rred to as "Participant") alleging that:\n\n (a) such Participant's Contributor Version directly or indirectly\n infringes any patent, then any and all rights granted by such\n Participant to You under Sections 2.1 and/or 2.2 of this License\n shall, upon 60 days notice from Participant terminate prospectively,\n unless if within 60 days after receipt of notice You either: (i)\n agree in writing to pay Participant a mutually agreeable reasonable\n royalty for Your past and future use of Modifications made by such\n Participant, or (ii) withdraw Your litigation claim with respect to\n the Contributor Version against such Participant. If within 60 days\n of notice, a reasonable royalty and payment arrangement are not\n mutually agreed upon in writing by the parties or the litigation claim\n is not withdrawn, the rights granted by Participant to You under\n Sections 2.1 and/or 2.2 automatically terminate at the expiration o!
f\n the 60 day notice period specified above.\n\n (b) any software, hardware, or device, other than such Participant's\n Contributor Version, directly or indirectly infringes any patent, then\n any rights granted to You by such Participant under Sections 2.1(b)\n and 2.2(b) are revoked effective as of the date You first made, used,\n sold, distributed, or had made, Modifications made by that\n Participant.\n\n 8.3. If You assert a patent infringement claim against Participant\n alleging that such Participant's Contributor Version directly or\n indirectly infringes any patent where such claim is resolved (such as\n by license or settlement) prior to the initiation of patent\n infringement litigation, then the reasonable value of the licenses\n granted by such Participant under Sections 2.1 or 2.2 shall be taken\n into account in determining the amount or value of any payment or\n license.\n\n 8.4. In the even!
t of termination under Sections 8.1 or 8.2 above,\n all end user l
icense agreements (excluding distributors and resellers)\n which have been validly granted by You or any distributor hereunder\n prior to termination shall survive termination.\n\n9. LIMITATION OF LIABILITY.\n\n UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT\n (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL\n DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,\n OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR\n ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY\n CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,\n WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER\n COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN\n INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF\n LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY\n RESULTING FROM SUCH PARTY'S N!
EGLIGENCE TO THE EXTENT APPLICABLE LAW\n PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE\n EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO\n THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.\n\n10. U.S. GOVERNMENT END USERS.\n\n The Covered Code is a "commercial item," as that term is defined in\n 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer\n software" and "commercial computer software documentation," as such\n terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48\n C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),\n all U.S. Government End Users acquire Covered Code with only those\n rights set forth herein.\n\n11. MISCELLANEOUS.\n\n This License represents the complete agreement concerning subject\n matter hereof. If any provision of this License is held to be\n unenforceable, such provision shall be reformed only to the extent\n !
necessary to make it enforceable. This License shall be governed by
\n California law provisions (except to the extent applicable law, if\n any, provides otherwise), excluding its conflict-of-law provisions.\n With respect to disputes in which at least one party is a citizen of,\n or an entity chartered or registered to do business in the United\n States of America, any litigation relating to this License shall be\n subject to the jurisdiction of the Federal Courts of the Northern\n District of California, with venue lying in Santa Clara County,\n California, with the losing party responsible for costs, including\n without limitation, court costs and reasonable attorneys' fees and\n expenses. The application of the United Nations Convention on\n Contracts for the International Sale of Goods is expressly excluded.\n Any law or regulation which provides that the language of a contract\n shall be construed against the drafter shall not apply to this\n License.\n\n12. RESPONSIBILITY FOR CLA!
IMS.\n\n As between Initial Developer and the Contributors, each party is\n responsible for claims and damages arising, directly or indirectly,\n out of its utilization of rights under this License and You agree to\n work with Initial Developer and Contributors to distribute such\n responsibility on an equitable basis. Nothing herein is intended or\n shall be deemed to constitute any admission of liability.\n\n13. MULTIPLE-LICENSED CODE.\n\n Initial Developer may designate portions of the Covered Code as\n "Multiple-Licensed". "Multiple-Licensed" means that the Initial\n Developer permits you to utilize portions of the Covered Code under\n Your choice of the NPL or the alternative licenses, if any, specified\n by the Initial Developer in the file described in Exhibit A.\n\nEXHIBIT A -Mozilla Public License.\n\n ``The contents of this file are subject to the Mozilla Public License\n Version 1.1 (the "License"); you may not!
use this file except in\n compliance with the License. You may ob
tain a copy of the License at\n http://www.mozilla.org/MPL/\n\n Software distributed under the License is distributed on an "AS IS"\n basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the\n License for the specific language governing rights and limitations\n under the License.\n\n The Original Code is ______________________________________.\n\n The Initial Developer of the Original Code is ________________________.\n Portions created by ______________________ are Copyright (C) ______\n _______________________. All Rights Reserved.\n\n Contributor(s): ______________________________________.\n\n Alternatively, the contents of this file may be used under the terms\n of the _____ license (the "[___] License"), in which case the\n provisions of [______] License are applicable instead of those\n above. If you wish to allow use of your version of this file only\n under the terms of the [____] License an!
d not to allow others to use\n your version of this file under the MPL, indicate your decision by\n deleting the provisions above and replace them with the notice and\n other provisions required by the [___] License. If you do not delete\n the provisions above, a recipient may use your version of this file\n under either the MPL or the [___] License."\n\n [NOTE: The text of this Exhibit A may differ slightly from the text of\n the notices in the Source Code files of the Original Code. You should\n use the text of this Exhibit A rather than the text found in the\n Original Code Source Code for Your Modifications.]\n
########### end of license property ##########################################
Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/license.html
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/license.html 2009-01-20 23:32:03 UTC (rev 13154)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/license.html 2009-01-21 00:49:32 UTC (rev 13155)
@@ -1,79 +1,389 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en"><head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-<h3>Usage Of Content</h3>
+ <title>Mozilla Public License version 1.1</title>
+ <style type="text/css">
+ .very-strong{
+ text-transform:uppercase;
+ }
+ dt{
+ font-weight:bold;
+ }
+ dd p{
+ margin:0;
+ }
+ </style>
+</head><body>
+ <p><small>(<a href="http://www.mozilla.org/MPL/MPL-1.1.txt">Plain text version</a>)</small></p>
+<small> </small><h1><small>Mozilla Public License Version 1.1</small></h1>
+<small> </small><h2 id="section-1"><small>1. Definitions.</small></h2>
+<small> </small><dl>
+<small> <dt id="section-1.0.1">1.0.1. "Commercial Use"
+ </dt><dd>means distribution or otherwise making the Covered Code available to a third party.
+ </dd><dt id="section-1.1">1.1. "Contributor"
+ </dt><dd>means each entity that creates or contributes to the creation of Modifications.
+ </dd><dt id="section-1.2">1.2. "Contributor Version"
+ </dt><dd>means the combination of the Original Code, prior Modifications used by a Contributor,
+ and the Modifications made by that particular Contributor.
+ </dd><dt id="section-1.3">1.3. "Covered Code"
+ </dt><dd>means the Original Code or Modifications or the combination of the Original Code and
+ Modifications, in each case including portions thereof.
+ </dd><dt id="section-1.4">1.4. "Electronic Distribution Mechanism"
+ </dt><dd>means a mechanism generally accepted in the software development community for the
+ electronic transfer of data.
+ </dd><dt id="section-1.5">1.5. "Executable"
+ </dt><dd>means Covered Code in any form other than Source Code.
+ </dd><dt id="section-1.6">1.6. "Initial Developer"
+ </dt><dd>means the individual or entity identified as the Initial Developer in the Source Code
+ notice required by <a href="#exhibit-a">Exhibit A</a>.
+ </dd><dt id="section-1.7">1.7. "Larger Work"
+ </dt><dd>means a work which combines Covered Code or portions thereof with code not governed
+ by the terms of this License.
+ </dd><dt id="section-1.8">1.8. "License"
+ </dt><dd>means this document.
+ </dd><dt id="section-1.8.1">1.8.1. "Licensable"
+ </dt><dd>means having the right to grant, to the maximum extent possible, whether at the
+ time of the initial grant or subsequently acquired, any and all of the rights
+ conveyed herein.
+ </dd><dt id="section-1.9">1.9. "Modifications"
+ </dt><dd>
+ <p>means any addition to or deletion from the substance or structure of either the
+ Original Code or any previous Modifications. When Covered Code is released as a
+ series of files, a Modification is:
+ </p><ol type="a">
+ <li id="section-1.9-a">Any addition to or deletion from the contents of a file
+ containing Original Code or previous Modifications.
+ </li><li id="section-1.9-b">Any new file that contains any part of the Original Code or
+ previous Modifications.
+ </li></ol>
+ </dd><dt id="section-1.10">1.10. "Original Code"
+ </dt><dd>means Source Code of computer software code which is described in the Source Code
+ notice required by <a href="#exhibit-a">Exhibit A</a> as Original Code, and which,
+ at the time of its release under this License is not already Covered Code governed
+ by this License.
+ </dd><dt id="section-1.10.1">1.10.1. "Patent Claims"
+ </dt><dd>means any patent claim(s), now owned or hereafter acquired, including without
+ limitation, method, process, and apparatus claims, in any patent Licensable by
+ grantor.
+ </dd><dt id="section-1.11">1.11. "Source Code"
+ </dt><dd>means the preferred form of the Covered Code for making modifications to it,
+ including all modules it contains, plus any associated interface definition files,
+ scripts used to control compilation and installation of an Executable, or source
+ code differential comparisons against either the Original Code or another well known,
+ available Covered Code of the Contributor's choice. The Source Code can be in a
+ compressed or archival form, provided the appropriate decompression or de-archiving
+ software is widely available for no charge.
+ </dd><dt id="section-1.12">1.12. "You" (or "Your")
+ </dt><dd>means an individual or a legal entity exercising rights under, and complying with
+ all of the terms of, this License or a future version of this License issued under
+ <a href="#section-6.1">Section 6.1.</a> For legal entities, "You" includes any entity
+ which controls, is controlled by, or is under common control with You. For purposes of
+ this definition, "control" means (a) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or otherwise, or (b)
+ ownership of more than fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+ </dd></small></dl>
+<small> </small><h2 id="section-2"><small>2. Source Code License.</small></h2>
+<small> </small><h3 id="section-2.1"><small>2.1. The Initial Developer Grant.</small></h3>
+<small> </small><p><small>The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive
+ license, subject to third party intellectual property claims:
+ </small></p><ol type="a">
+<small> </small><li id="section-2.1-a"><small>under intellectual property rights (other than patent or
+ trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform,
+ sublicense and distribute the Original Code (or portions thereof) with or without
+ Modifications, and/or as part of a Larger Work; and
+ </small></li><li id="section-2.1-b"><small>under Patents Claims infringed by the making, using or selling
+ of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or
+ otherwise dispose of the Original Code (or portions thereof).
+ </small></li><li id="section-2.1-c"><small>the licenses granted in this Section 2.1
+ (<a href="#section-2.1-a">a</a>) and (<a href="#section-2.1-b">b</a>) are effective on
+ the date Initial Developer first distributes Original Code under the terms of this
+ License.
+ </small></li><li id="section-2.1-d"><small>Notwithstanding Section 2.1 (<a href="#section-2.1-b">b</a>)
+ above, no patent license is granted: 1) for code that You delete from the Original Code;
+ 2) separate from the Original Code; or 3) for infringements caused by: i) the
+ modification of the Original Code or ii) the combination of the Original Code with other
+ software or devices.
+ </small></li></ol>
+<small> </small><h3 id="section-2.2"><small>2.2. Contributor Grant.</small></h3>
+<small> </small><p><small>Subject to third party intellectual property claims, each Contributor hereby grants You
+ a world-wide, royalty-free, non-exclusive license
+ </small></p><ol type="a">
+<small> </small><li id="section-2.2-a"><small>under intellectual property rights (other than patent or trademark)
+ Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and
+ distribute the Modifications created by such Contributor (or portions thereof) either on
+ an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger
+ Work; and
+ </small></li><li id="section-2.2-b"><small>under Patent Claims infringed by the making, using, or selling of
+ Modifications made by that Contributor either alone and/or in combination with its
+ Contributor Version (or portions of such combination), to make, use, sell, offer for
+ sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor
+ (or portions thereof); and 2) the combination of Modifications made by that Contributor
+ with its Contributor Version (or portions of such combination).
+ </small></li><li id="section-2.2-c"><small>the licenses granted in Sections 2.2
+ (<a href="#section-2.2-a">a</a>) and 2.2 (<a href="#section-2.2-b">b</a>) are effective
+ on the date Contributor first makes Commercial Use of the Covered Code.
+ </small></li><li id="section-2.2-d"><small>Notwithstanding Section 2.2 (<a href="#section-2.2-b">b</a>)
+ above, no patent license is granted: 1) for any code that Contributor has deleted from
+ the Contributor Version; 2) separate from the Contributor Version; 3) for infringements
+ caused by: i) third party modifications of Contributor Version or ii) the combination of
+ Modifications made by that Contributor with other software (except as part of the
+ Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code
+ in the absence of Modifications made by that Contributor.
+ </small></li></ol>
+<small> </small><h2 id="section-3"><small>3. Distribution Obligations.</small></h2>
+<small> </small><h3 id="section-3.1"><small>3.1. Application of License.</small></h3>
+<small> </small><p><small>The Modifications which You create or to which You contribute are governed by the terms
+ of this License, including without limitation Section <a href="#section-2.2">2.2</a>. The
+ Source Code version of Covered Code may be distributed only under the terms of this License
+ or a future version of this License released under Section <a href="#section-6.1">6.1</a>,
+ and You must include a copy of this License with every copy of the Source Code You
+ distribute. You may not offer or impose any terms on any Source Code version that alters or
+ restricts the applicable version of this License or the recipients' rights hereunder.
+ However, You may include an additional document offering the additional rights described in
+ Section <a href="#section-3.5">3.5</a>.
+ </small></p><h3 id="section-3.2"><small>3.2. Availability of Source Code.</small></h3>
+<small> </small><p><small>Any Modification which You create or to which You contribute must be made available in
+ Source Code form under the terms of this License either on the same media as an Executable
+ version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an
+ Executable version available; and if made available via Electronic Distribution Mechanism,
+ must remain available for at least twelve (12) months after the date it initially became
+ available, or at least six (6) months after a subsequent version of that particular
+ Modification has been made available to such recipients. You are responsible for ensuring
+ that the Source Code version remains available even if the Electronic Distribution
+ Mechanism is maintained by a third party.
+ </small></p><h3 id="section-3.3"><small>3.3. Description of Modifications.</small></h3>
+<small> </small><p><small>You must cause all Covered Code to which You contribute to contain a file documenting the
+ changes You made to create that Covered Code and the date of any change. You must include a
+ prominent statement that the Modification is derived, directly or indirectly, from Original
+ Code provided by the Initial Developer and including the name of the Initial Developer in
+ (a) the Source Code, and (b) in any notice in an Executable version or related documentation
+ in which You describe the origin or ownership of the Covered Code.
+ </small></p><h3 id="section-3.4"><small>3.4. Intellectual Property Matters</small></h3>
+<small> </small><h4 id="section-3.4-a"><small>(a) Third Party Claims</small></h4>
+<small> </small><p><small>If Contributor has knowledge that a license under a third party's intellectual property
+ rights is required to exercise the rights granted by such Contributor under Sections
+ <a href="#section-2.1">2.1</a> or <a href="#section-2.2">2.2</a>, Contributor must include a
+ text file with the Source Code distribution titled "LEGAL" which describes the claim and the
+ party making the claim in sufficient detail that a recipient will know whom to contact. If
+ Contributor obtains such knowledge after the Modification is made available as described in
+ Section <a href="#section-3.2">3.2</a>, Contributor shall promptly modify the LEGAL file in
+ all copies Contributor makes available thereafter and shall take other steps (such as
+ notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who
+ received the Covered Code that new knowledge has been obtained.
+ </small></p><h4 id="section-3.4-b"><small>(b) Contributor APIs</small></h4>
+<small> </small><p><small>If Contributor's Modifications include an application programming interface and Contributor
+ has knowledge of patent licenses which are reasonably necessary to implement that
+ <abbr>API</abbr>, Contributor must also include this information in the
+ <strong class="very-strong">legal</strong> file.
+ </small></p><h4 id="section-3.4-c"><small>(c) Representations.</small></h4>
+<small> </small><p><small>Contributor represents that, except as disclosed pursuant to Section 3.4
+ (<a href="#section-3.4-a">a</a>) above, Contributor believes that Contributor's Modifications
+ are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the
+ rights conveyed by this License.
+ </small></p><h3 id="section-3.5"><small>3.5. Required Notices.</small></h3>
+<small> </small><p><small>You must duplicate the notice in <a href="#exhibit-a">Exhibit A</a> in each file of the
+ Source Code. If it is not possible to put such notice in a particular Source Code file due to
+ its structure, then You must include such notice in a location (such as a relevant directory)
+ where a user would be likely to look for such a notice. If You created one or more
+ Modification(s) You may add your name as a Contributor to the notice described in
+ <a href="#exhibit-a">Exhibit A</a>. You must also duplicate this License in any documentation
+ for the Source Code where You describe recipients' rights or ownership rights relating to
+ Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity
+ or liability obligations to one or more recipients of Covered Code. However, You may do so
+ only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You
+ must make it absolutely clear than any such warranty, support, indemnity or liability
+ obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer
+ and every Contributor for any liability incurred by the Initial Developer or such Contributor
+ as a result of warranty, support, indemnity or liability terms You offer.
+ </small></p><h3 id="section-3.6"><small>3.6. Distribution of Executable Versions.</small></h3>
+<small> </small><p><small>You may distribute Covered Code in Executable form only if the requirements of Sections
+ <a href="#section-3.1">3.1</a>, <a href="#section-3.2">3.2</a>,
+ <a href="#section-3.3">3.3</a>, <a href="#section-3.4">3.4</a> and
+ <a href="#section-3.5">3.5</a> have been met for that Covered Code, and if You include a
+ notice stating that the Source Code version of the Covered Code is available under the terms
+ of this License, including a description of how and where You have fulfilled the obligations
+ of Section <a href="#section-3.2">3.2</a>. The notice must be conspicuously included in any
+ notice in an Executable version, related documentation or collateral in which You describe
+ recipients' rights relating to the Covered Code. You may distribute the Executable version of
+ Covered Code or ownership rights under a license of Your choice, which may contain terms
+ different from this License, provided that You are in compliance with the terms of this
+ License and that the license for the Executable version does not attempt to limit or alter the
+ recipient's rights in the Source Code version from the rights set forth in this License. If
+ You distribute the Executable version under a different license You must make it absolutely
+ clear that any terms which differ from this License are offered by You alone, not by the
+ Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and
+ every Contributor for any liability incurred by the Initial Developer or such Contributor as
+ a result of any such terms You offer.
+ </small></p><h3 id="section-3.7"><small>3.7. Larger Works.</small></h3>
+<small> </small><p><small>You may create a Larger Work by combining Covered Code with other code not governed by the
+ terms of this License and distribute the Larger Work as a single product. In such a case,
+ You must make sure the requirements of this License are fulfilled for the Covered Code.
+ </small></p><h2 id="section-4"><small>4. Inability to Comply Due to Statute or Regulation.</small></h2>
+<small> </small><p><small>If it is impossible for You to comply with any of the terms of this License with respect to
+ some or all of the Covered Code due to statute, judicial order, or regulation then You must:
+ (a) comply with the terms of this License to the maximum extent possible; and (b) describe
+ the limitations and the code they affect. Such description must be included in the
+ <strong class="very-strong">legal</strong> file described in Section
+ <a href="#section-3.4">3.4</a> and must be included with all distributions of the Source Code.
+ Except to the extent prohibited by statute or regulation, such description must be
+ sufficiently detailed for a recipient of ordinary skill to be able to understand it.
+ </small></p><h2 id="section-5"><small>5. Application of this License.</small></h2>
+<small> </small><p><small>This License applies to code to which the Initial Developer has attached the notice in
+ <a href="#exhibit-a">Exhibit A</a> and to related Covered Code.
+ </small></p><h2 id="section-6"><small>6. Versions of the License.</small></h2>
+<small> </small><h3 id="section-6.1"><small>6.1. New Versions</small></h3>
+<small> </small><p><small>Netscape Communications Corporation ("Netscape") may publish revised and/or new versions
+ of the License from time to time. Each version will be given a distinguishing version number.
+ </small></p><h3 id="section-6.2"><small>6.2. Effect of New Versions</small></h3>
+<small> </small><p><small>Once Covered Code has been published under a particular version of the License, You may
+ always continue to use it under the terms of that version. You may also choose to use such
+ Covered Code under the terms of any subsequent version of the License published by Netscape.
+ No one other than Netscape has the right to modify the terms applicable to Covered Code
+ created under this License.
+ </small></p><h3 id="section-6.3"><small>6.3. Derivative Works</small></h3>
+<small> </small><p><small>If You create or use a modified version of this License (which you may only do in order to
+ apply it to code which is not already Covered Code governed by this License), You must (a)
+ rename Your license so that the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "MPL",
+ "NPL" or any confusingly similar phrase do not appear in your license (except to note that
+ your license differs from this License) and (b) otherwise make it clear that Your version of
+ the license contains terms which differ from the Mozilla Public License and Netscape Public
+ License. (Filling in the name of the Initial Developer, Original Code or Contributor in the
+ notice described in <a href="#exhibit-a">Exhibit A</a> shall not of themselves be deemed to
+ be modifications of this License.)
+ </small></p><h2 id="section-7"><small>7. <strong class="very-strong">Disclaimer of warranty</strong></small></h2>
+<small> </small><p><small><strong class="very-strong">Covered code is provided under this license on an "as is"
+ basis, without warranty of any kind, either expressed or implied, including, without
+ limitation, warranties that the covered code is free of defects, merchantable, fit for a
+ particular purpose or non-infringing. The entire risk as to the quality and performance of
+ the covered code is with you. Should any covered code prove defective in any respect, you
+ (not the initial developer or any other contributor) assume the cost of any necessary
+ servicing, repair or correction. This disclaimer of warranty constitutes an essential part
+ of this license. No use of any covered code is authorized hereunder except under this
+ disclaimer.</strong>
+ </small></p><h2 id="section-8"><small>8. Termination</small></h2>
+<small> </small><p id="section-8.1"><small>8.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to cure such breach
+ within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which
+ are properly granted shall survive any termination of this License. Provisions which, by
+ their nature, must remain in effect beyond the termination of this License shall survive.
+ </small></p><p id="section-8.2"><small>8.2. If You initiate litigation by asserting a patent infringement
+ claim (excluding declatory judgment actions) against Initial Developer or a Contributor
+ (the Initial Developer or Contributor against whom You file such action is referred to
+ as "Participant") alleging that:
+ </small></p><ol type="a">
+<small> </small><li id="section-8.2-a"><small>such Participant's Contributor Version directly or indirectly
+ infringes any patent, then any and all rights granted by such Participant to You under
+ Sections <a href="#section-2.1">2.1</a> and/or <a href="#section-2.2">2.2</a> of this
+ License shall, upon 60 days notice from Participant terminate prospectively, unless if
+ within 60 days after receipt of notice You either: (i) agree in writing to pay
+ Participant a mutually agreeable reasonable royalty for Your past and future use of
+ Modifications made by such Participant, or (ii) withdraw Your litigation claim with
+ respect to the Contributor Version against such Participant. If within 60 days of
+ notice, a reasonable royalty and payment arrangement are not mutually agreed upon in
+ writing by the parties or the litigation claim is not withdrawn, the rights granted by
+ Participant to You under Sections <a href="#section-2.1">2.1</a> and/or
+ <a href="#section-2.2">2.2</a> automatically terminate at the expiration of the 60 day
+ notice period specified above.
+ </small></li><li id="section-8.2-b"><small>any software, hardware, or device, other than such Participant's
+ Contributor Version, directly or indirectly infringes any patent, then any rights
+ granted to You by such Participant under Sections 2.1(<a href="#section-2.1-b">b</a>)
+ and 2.2(<a href="#section-2.2-b">b</a>) are revoked effective as of the date You first
+ made, used, sold, distributed, or had made, Modifications made by that Participant.
+ </small></li></ol>
+<small> </small><p id="section-8.3"><small>8.3. If You assert a patent infringement claim against Participant
+ alleging that such Participant's Contributor Version directly or indirectly infringes
+ any patent where such claim is resolved (such as by license or settlement) prior to the
+ initiation of patent infringement litigation, then the reasonable value of the licenses
+ granted by such Participant under Sections <a href="#section-2.1">2.1</a> or
+ <a href="#section-2.2">2.2</a> shall be taken into account in determining the amount or
+ value of any payment or license.
+ </small></p><p id="section-8.4"><small>8.4. In the event of termination under Sections
+ <a href="#section-8.1">8.1</a> or <a href="#section-8.2">8.2</a> above, all end user
+ license agreements (excluding distributors and resellers) which have been validly
+ granted by You or any distributor hereunder prior to termination shall survive
+ termination.
+ </small></p><h2 id="section-9"><small>9. <strong class="very-strong">Limitation of liability</strong></small></h2>
+<small> </small><p><small><strong class="very-strong">Under no circumstances and under no legal theory, whether
+ tort (including negligence), contract, or otherwise, shall you, the initial developer,
+ any other contributor, or any distributor of covered code, or any supplier of any of
+ such parties, be liable to any person for any indirect, special, incidental, or
+ consequential damages of any character including, without limitation, damages for loss
+ of goodwill, work stoppage, computer failure or malfunction, or any and all other
+ commercial damages or losses, even if such party shall have been informed of the
+ possibility of such damages. This limitation of liability shall not apply to liability
+ for death or personal injury resulting from such party's negligence to the extent
+ applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion
+ or limitation of incidental or consequential damages, so this exclusion and limitation
+ may not apply to you.</strong>
+ </small></p><h2 id="section-10"><small>10. <abbr title="United States">U.S.</abbr> government end users</small></h2>
+<small> </small><p><small>The Covered Code is a "commercial item," as that term is defined in 48
+ <abbr>C.F.R.</abbr> 2.101 (<abbr title="October">Oct.</abbr> 1995), consisting of
+ "commercial computer software" and "commercial computer software documentation," as such
+ terms are used in 48 <abbr>C.F.R.</abbr> 12.212 (<abbr title="September">Sept.</abbr>
+ 1995). Consistent with 48 <abbr>C.F.R.</abbr> 12.212 and 48 <abbr>C.F.R.</abbr>
+ 227.7202-1 through 227.7202-4 (June 1995), all <abbr>U.S.</abbr> Government End Users
+ acquire Covered Code with only those rights set forth herein.
+ </small></p><h2 id="section-11"><small>11. Miscellaneous</small></h2>
+<small> </small><p><small>This License represents the complete agreement concerning subject matter hereof. If
+ any provision of this License is held to be unenforceable, such provision shall be
+ reformed only to the extent necessary to make it enforceable. This License shall be
+ governed by California law provisions (except to the extent applicable law, if any,
+ provides otherwise), excluding its conflict-of-law provisions. With respect to
+ disputes in which at least one party is a citizen of, or an entity chartered or
+ registered to do business in the United States of America, any litigation relating to
+ this License shall be subject to the jurisdiction of the Federal Courts of the
+ Northern District of California, with venue lying in Santa Clara County, California,
+ with the losing party responsible for costs, including without limitation, court
+ costs and reasonable attorneys' fees and expenses. The application of the United
+ Nations Convention on Contracts for the International Sale of Goods is expressly
+ excluded. Any law or regulation which provides that the language of a contract
+ shall be construed against the drafter shall not apply to this License.
+ </small></p><h2 id="section-12"><small>12. Responsibility for claims</small></h2>
+<small> </small><p><small>As between Initial Developer and the Contributors, each party is responsible for
+ claims and damages arising, directly or indirectly, out of its utilization of rights
+ under this License and You agree to work with Initial Developer and Contributors to
+ distribute such responsibility on an equitable basis. Nothing herein is intended or
+ shall be deemed to constitute any admission of liability.
+ </small></p><h2 id="section-13"><small>13. Multiple-licensed code</small></h2>
+<small> </small><p><small>Initial Developer may designate portions of the Covered Code as
+ "Multiple-Licensed". "Multiple-Licensed" means that the Initial Developer permits
+ you to utilize portions of the Covered Code under Your choice of the <abbr>MPL</abbr>
+ or the alternative licenses, if any, specified by the Initial Developer in the file
+ described in <a href="#exhibit-a">Exhibit A</a>.
+ </small></p><h2 id="exhibit-a"><small>Exhibit A - Mozilla Public License.</small></h2>
+<small> </small><pre><small>"The contents of this file are subject to the Mozilla Public License
+Version 1.1 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
+Software distributed under the License is distributed on an "AS IS"
+basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+License for the specific language governing rights and limitations
+under the License.
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
+The Original Code is ______________________________________.
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
+The Initial Developer of the Original Code is ________________________.
+Portions created by ______________________ are Copyright (C) ______
+_______________________. All Rights Reserved.
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+Contributor(s): ______________________________________.
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
+Alternatively, the contents of this file may be used under the terms
+of the _____ license (the "[___] License"), in which case the
+provisions of [______] License are applicable instead of those
+above. If you wish to allow use of your version of this file only
+under the terms of the [____] License and not to allow others to use
+your version of this file under the MPL, indicate your decision by
+deleting the provisions above and replace them with the notice and
+other provisions required by the [___] License. If you do not delete
+the provisions above, a recipient may use your version of this file
+under either the MPL or the [___] License."</small></pre>
+<small> </small><p><small>NOTE: The text of this Exhibit A may differ slightly from the text of
+ the notices in the Source Code files of the Original Code. You should
+ use the text of this Exhibit A rather than the text found in the
+ Original Code Source Code for Your Modifications.
+</small></p></body></html>
\ No newline at end of file
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r13154 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-01-20 18:32:03 -0500 (Tue, 20 Jan 2009)
New Revision: 13154
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java
Log:
JBIDE-3414 Trouble during expanding project view in package explorer.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2009-01-20 17:34:56 UTC (rev 13153)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2009-01-20 23:32:03 UTC (rev 13154)
@@ -19,6 +19,7 @@
import org.apache.tools.ant.types.FilterSetCollection;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -256,9 +257,10 @@
IProjectFacet sf = ProjectFacetsManager.getProjectFacet("jst.ejb");
IProjectFacetVersion pfv = ProjectFacetsManager.create(ejbProjectToBeImported).getInstalledVersion(sf);
ClasspathHelper.addClasspathEntries(ejbProjectToBeImported, pfv);
-
+ WtpUtils.reconfigure(ejbProjectToBeImported,monitor);
IProject earProjectToBeImported = wsRoot.getProject(earProjectName);
ResourcesUtils.importExistingProject(earProjectToBeImported, wsPath + "/" + earProjectName, earProjectName, monitor, false);
+ WtpUtils.reconfigure(earProjectToBeImported, monitor);
}
IProject testProjectToBeImported = wsRoot.getProject(testProjectName);
@@ -270,10 +272,12 @@
if (!testLevel.equals(level)) {
JavaFacetUtils.setCompilerLevel(testProjectToBeImported, level);
}
-
+ testProjectToBeImported.refreshLocal(IResource.DEPTH_INFINITE, monitor);
SeamFacetAbstractInstallDelegate.toggleHibernateOnProject(testProjectToBeImported, consoleName);
createSeamProjectPreferenes();
+ WtpUtils.reconfigure(seamWebProject, monitor);
+ WtpUtils.reconfigure(testProjectToBeImported, monitor);
}
/**
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java 2009-01-20 17:34:56 UTC (rev 13153)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java 2009-01-20 23:32:03 UTC (rev 13154)
@@ -30,9 +30,12 @@
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaModelStatus;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaConventions;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.core.JavaElementInfo;
+import org.eclipse.jdt.internal.core.JavaProject;
import org.eclipse.jdt.internal.ui.util.CoreUtility;
import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.jdt.ui.PreferenceConstants;
@@ -175,6 +178,11 @@
if(outputFolder != null) {
CoreUtility.createDerivedFolder(project.getFolder(outputFolder), true, true, new NullProgressMonitor());
}
+ IFolder newSourceFolder= javaProject.getProject().getFolder(path);
+ if (!newSourceFolder.exists()) {
+ CoreUtility.createFolder(newSourceFolder, true, true, new NullProgressMonitor());
+ }
+
IClasspathEntry newEntry = JavaCore.newSourceEntry(newSourceFolderPath,new Path[]{},new Path[]{},outputFolder!=null?project.getFullPath().append(outputFolder):null);
if (projectEntryIndex != -1) {
@@ -199,11 +207,6 @@
}
}
- IFolder newSourceFolder= javaProject.getProject().getFolder(path);
- if (!newSourceFolder.exists()) {
- CoreUtility.createFolder(newSourceFolder, true, true, new NullProgressMonitor());
- }
-
javaProject.setRawClasspath(newClasspathEntries, newOutputLocation, new NullProgressMonitor());
return newSourceFolder;
} catch (CoreException e) {
@@ -260,4 +263,23 @@
jProject.setRawClasspath(cps, monitor);
}
+ public static void reconfigure(IProject project, IProgressMonitor monitor) throws CoreException {
+ if (project == null || !project.exists() || !project.isOpen() || !project.hasNature(JavaCore.NATURE_ID)) {
+ return;
+ }
+ project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+ IJavaProject javaProject = JavaCore.create(project);
+ if (javaProject != null && javaProject.exists() && javaProject.isOpen() && javaProject instanceof JavaProject) {
+ Object object = ((JavaProject) javaProject).getElementInfo();
+ if (object instanceof JavaElementInfo) {
+ // copied from JavaProject.buildStructure(...)
+ JavaElementInfo info = (JavaElementInfo) object;
+ IClasspathEntry[] resolvedClasspath = ((JavaProject) javaProject).getResolvedClasspath();
+ IPackageFragmentRoot[] children = ((JavaProject) javaProject).computePackageFragmentRoots(resolvedClasspath,false, null /* no reverse map */);
+ info.setChildren(children);
+ ((JavaProject) javaProject).getPerProjectInfo().rememberExternalLibTimestamps();
+ }
+ }
+ }
+
}
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r13153 - in trunk/jmx/docs/reference/en: images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2009-01-20 12:34:56 -0500 (Tue, 20 Jan 2009)
New Revision: 13153
Added:
trunk/jmx/docs/reference/en/images/eclipse-jmx_0.2.png
trunk/jmx/docs/reference/en/images/link-with-editor_0.2.0.png
trunk/jmx/docs/reference/en/images/mbean-editor-horizontal-layout_0.2.0.png
trunk/jmx/docs/reference/en/images/mbean-editor-layout-buttons_0.2.0.png
trunk/jmx/docs/reference/en/images/mbean-editor_0.2.0.png
trunk/jmx/docs/reference/en/images/mbean-explorer-features_0.2.0.png
trunk/jmx/docs/reference/en/images/open-mbean-dialog_0.2.0.png
Modified:
trunk/jmx/docs/reference/en/master.xml
trunk/jmx/docs/reference/en/modules/introduction.xml
trunk/jmx/docs/reference/en/modules/mbean_editor.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-528
screens are added to JMX guide, chapter is split into several ones, structure is defined
Added: trunk/jmx/docs/reference/en/images/eclipse-jmx_0.2.png
===================================================================
(Binary files differ)
Property changes on: trunk/jmx/docs/reference/en/images/eclipse-jmx_0.2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jmx/docs/reference/en/images/link-with-editor_0.2.0.png
===================================================================
(Binary files differ)
Property changes on: trunk/jmx/docs/reference/en/images/link-with-editor_0.2.0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jmx/docs/reference/en/images/mbean-editor-horizontal-layout_0.2.0.png
===================================================================
(Binary files differ)
Property changes on: trunk/jmx/docs/reference/en/images/mbean-editor-horizontal-layout_0.2.0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jmx/docs/reference/en/images/mbean-editor-layout-buttons_0.2.0.png
===================================================================
(Binary files differ)
Property changes on: trunk/jmx/docs/reference/en/images/mbean-editor-layout-buttons_0.2.0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jmx/docs/reference/en/images/mbean-editor_0.2.0.png
===================================================================
(Binary files differ)
Property changes on: trunk/jmx/docs/reference/en/images/mbean-editor_0.2.0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jmx/docs/reference/en/images/mbean-explorer-features_0.2.0.png
===================================================================
(Binary files differ)
Property changes on: trunk/jmx/docs/reference/en/images/mbean-explorer-features_0.2.0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jmx/docs/reference/en/images/open-mbean-dialog_0.2.0.png
===================================================================
(Binary files differ)
Property changes on: trunk/jmx/docs/reference/en/images/open-mbean-dialog_0.2.0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jmx/docs/reference/en/master.xml
===================================================================
--- trunk/jmx/docs/reference/en/master.xml 2009-01-20 17:05:49 UTC (rev 13152)
+++ trunk/jmx/docs/reference/en/master.xml 2009-01-20 17:34:56 UTC (rev 13153)
@@ -3,6 +3,12 @@
"http://www.docbook.org/xml/4.3/docbookx.dtd"
[<!ENTITY introduction SYSTEM "modules/introduction.xml">
+<!ENTITY mbean_editor SYSTEM "modules/mbean_editor.xml">
+<!ENTITY mbean_explorer SYSTEM "modules/mbean_explorer.xml">
+<!ENTITY connection SYSTEM "modules/connection.xml">
+<!ENTITY how_to SYSTEM "modules/how_to.xml">
+
+
<!--ENTITY runtimes_servers SYSTEM "modules/runtimes_servers.xml">
<!ENTITY perspective SYSTEM "modules/perspective.xml">
<!ENTITY webtools SYSTEM "modules/webtools.xml">
@@ -55,10 +61,9 @@
<toc/>
&introduction;
- <!-- &runtimes_servers;
- &perspective;
- &webtools;
- &modules;
- &tptp_support; -->
+ &mbean_editor;
+ &mbean_explorer;
+ &connection;
+ &how_to;
</book>
Modified: trunk/jmx/docs/reference/en/modules/introduction.xml
===================================================================
--- trunk/jmx/docs/reference/en/modules/introduction.xml 2009-01-20 17:05:49 UTC (rev 13152)
+++ trunk/jmx/docs/reference/en/modules/introduction.xml 2009-01-20 17:34:56 UTC (rev 13153)
@@ -1,12 +1,21 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<chapter id="intruduction" xreflabel="introduction">
<?dbhtml filename="introduction.html"?>
-
+
<title>Introduction</title>
-
+
<para>This chapter covers the basics of working with JMX plugin, which is used to manage Java
- applications through JMX and its RMI Connector.</para>
+ applications through JMX and its RMI Connector.</para>
+ <figure>
+ <title>Eclipse JMX</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/eclipse-jmx_0.2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
<section>
<title> Requirements </title>
<para> Requirements to use eclipse-jmx are the following: </para>
@@ -26,151 +35,70 @@
<section>
<title>Installation</title>
- <para>eclipse-jmx can be installed either by using Eclipse update manager or by downloading it and installing it manually in Eclipse.</para>
+ <para>eclipse-jmx can be installed either by using Eclipse update manager or by downloading it and installing it manually in Eclipse.</para>
- <tip><title>Tip</title>
- <para>Check Requirements to see what is required to install and use eclipse-jmx. </para></tip>
+ <tip><title>Tip</title>
+ <para>Check Requirements to see what is required to install and use eclipse-jmx. </para></tip>
- <section> <title>Manual Installation</title>
- <para> Follow the next steps to install the plugin manually: </para>
+ <section> <title>Manual Installation</title>
+ <para> Follow the next steps to install the plugin manually: </para>
+
+ <itemizedlist>
+ <listitem> <para>Download the latest release from http://code.google.com/p/eclipse-jmx/downloads/list</para></listitem>
+ <listitem> <para> Unzip the file in you Eclipse installation</para></listitem>
+ <listitem><para>(Re)Start Eclipse </para></listitem>
+ </itemizedlist>
+ </section>
- <itemizedlist>
- <listitem> <para>Download the latest release from http://code.google.com/p/eclipse-jmx/downloads/list</para></listitem>
-<listitem> <para> Unzip the file in you Eclipse installation</para></listitem>
- <listitem><para>(Re)Start Eclipse </para></listitem>
- </itemizedlist>
- </section>
+ <section> <title> Installation using Eclipes update manager</title>
+
+ <para>In Eclipse:</para>
+
+ <itemizedlist>
+ <listitem> <para> go to Help > Software Updates > Find and Install...</para></listitem>
+ <listitem> <para> check Search for new features to install and click Next </para></listitem>
+ <listitem> <para> click on New Remote Site...</para></listitem>
+ <listitem> <para> in the New Update Site window, type:</para></listitem>
+ <listitem> <para> Name: eclipse-jmx</para></listitem>
+ <listitem> <para> URL: http://eclipse-jmx.googlecode.com/svn/trunk/net.jmesnil.jmx.update/ </para></listitem>
+ <listitem> <para> click on OK</para></listitem>
+ <listitem> <para> check eclipse-jmx and click on Finish</para></listitem>
+ <listitem> <para> expand the features and select the latest one. Then click on Next </para></listitem>
+ <listitem> <para> check I accept the terms in the license agreement and click on Next </para></listitem>
+ <listitem> <para> click on Finish</para></listitem>
+ <listitem> <para> once all the plug-ins are downloaded, click on Install All</para></listitem>
+ <listitem> <para> finally, when ask to restart Eclipse, click on Yes</para></listitem>
+ </itemizedlist>
+ </section>
- <section> <title> Installation using Eclipes update manager</title>
-
- <para>In Eclipse:</para>
-
- <itemizedlist>
- <listitem> <para> go to Help > Software Updates > Find and Install...</para></listitem>
-<listitem> <para> check Search for new features to install and click Next </para></listitem>
-<listitem> <para> click on New Remote Site...</para></listitem>
-<listitem> <para> in the New Update Site window, type:</para></listitem>
-<listitem> <para> Name: eclipse-jmx</para></listitem>
-<listitem> <para> URL: http://eclipse-jmx.googlecode.com/svn/trunk/net.jmesnil.jmx.update/ </para></listitem>
-<listitem> <para> click on OK</para></listitem>
-<listitem> <para> check eclipse-jmx and click on Finish</para></listitem>
-<listitem> <para> expand the features and select the latest one. Then click on Next </para></listitem>
-<listitem> <para> check I accept the terms in the license agreement and click on Next </para></listitem>
-<listitem> <para> click on Finish</para></listitem>
-<listitem> <para> once all the plug-ins are downloaded, click on Install All</para></listitem>
-<listitem> <para> finally, when ask to restart Eclipse, click on Yes</para></listitem>
- </itemizedlist>
- </section>
-
</section>
<section>
- <title>Quick Start</title>
-
-
- <para>To start using it, it's necessary to open JMX perspective. Go to Window > Open Perspective >
- Other... and then select JMX and click OK </para>
-
- <para>The JMX perspective is composed of a single view - MBean Explorer which lists the mbeans.
- When you double-click on a MBean in the MBean Explorer view, it opens a multi-page editor to
- manage the MBean. The MBeanEditor is composed of these pages:</para>
-
- <itemizedlist>
- <listitem>
- <para> Attributes to get/set the attributes of the MBean</para>
- </listitem>
- <listitem>
- <para>Operations to invoke operations on the MBean</para>
- </listitem>
- <listitem>
- <para> Notifications to receive notifications from the MBean</para>
- </listitem>
- <listitem>
- <para> Info which displays general information about the MBean </para>
- </listitem>
- </itemizedlist>
-
- <para>There is a button to update the MBean attribute value (if it is writable)</para>
+ <title>Quick Start</title>
+
+ <para>To start using it, it's necessary to open JMX perspective. Go to Window > Open Perspective >
+ Other... and then select JMX and click OK </para>
+
+ <para>The JMX perspective is composed of a single view - MBean Explorer which lists the mbeans.
+ When you double-click on a MBean in the MBean Explorer view, it opens a multi-page editor to
+ manage the MBean. The MBeanEditor is composed of these pages:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para> Attributes to get/set the attributes of the MBean</para>
+ </listitem>
+ <listitem>
+ <para>Operations to invoke operations on the MBean</para>
+ </listitem>
+ <listitem>
+ <para> Notifications to receive notifications from the MBean</para>
+ </listitem>
+ <listitem>
+ <para> Info which displays general information about the MBean </para>
+ </listitem>
+ </itemizedlist>
+
+ <para>There is a button to update the MBean attribute value (if it is writable)</para>
</section>
-
-
-<section>
- <title>How to Manage Tomcat </title>
- <para>It's possible to manage Tomcat using eclipse-jmx</para>
- <para> Currently, eclipse-jmx is able to connect to Tomcat without authentication or with password-based authentication.</para>
- <para> Using SSL for authentication is not supported: you need to make sure that the System property com.sun.management.jmxremote.ssl is set to false.
- </para>
- <para> More information to manage Tomcat can be found in Tomcat management documentation </para>
- <para> Instructions to manage remotely Tomcat are available in Tomcat's monitoring documentation.</para>
-
-</section>
-
- <section>
- <title>How to manage Eclipse Equinox using eclipse-jmx</title>
-
-
-<para> You can manage Equinox using eclipse-jmx through Equinox monitoring framework.</para>
-<para> Once you have installed Equinox monitoring framework and restarted Eclipse:</para>
-<itemizedlist>
- <listitem><para> Go to Window > Open Perspective > Other... and select the JMX Resource Management perspective</para></listitem>
-<listitem><para> Select JMX Server > Open Connection and click on OK</para></listitem>
- <listitem><para> Switch to eclipse-jmx perspective by going to Window > Open Perspective > Other... and selecting the JMX perspective</para></listitem>
- <listitem><para> click on the Connect... icon () in the MBean Explorer menu bar </para></listitem>
-<listitem><para> select the Advanced tab and set the JMX URL to service:jmx:rmi:///jndi/rmi://:8118/jmxserver </para></listitem>
-</itemizedlist>
-<para> You now have access to the MBeans exposed by Equinox. </para>
- </section>
-
-
-
- <section id="Connection">
- <title>Connection</title>
- <para> There are two ways to connect to an application with remote management enabled:</para>
- <para> The first step is the same for both - to connect to a MBean Server - click on the
- Connect... icon () in the MBean Explorer menu bar, </para>
- <para>Then to follow the simple one you just need to specify host, port (and optionally user
- name & password) and click OK</para>
- <para>The default JMX URL is service:jmx:rmi:///jndi/rmi://localhost:3000/jmxrmi </para>
-
- <para> In case you need to connect to an application which has not used the "standard" JMX URL
- (e.g. Eclipse Equinox), you need chose more advance way, where it's necessary to specify
- explicitly a JMX URL in the Advanced Tab of the JMX Connection window </para>
-
- <note>
- <title>Note</title>
- <para>only JMX URL based on RMI are supported </para>
- </note>
- </section>
-
- <section id="MBeanExporter">
-
- <title>MBean Explorer</title>
- <para>The MBean explorer displays the MBean features (both attributes and operations) in its
- hierarchy. Double-clicking on a feature will open a MBean Editor, display the page
- corresponding to the feature type and select the feature.</para>
- <para>Since It's possible to have many MBean Editors opened at the same time, the MBean Explorer
- has a Link With Editor checkbox to synchronize selections between the active MBean Editor and
- the MBean explorer(and vice versa) </para>
-
- <!-- screens -http://code.google.com/p/eclipse-jmx/wiki/NewAndNoteworthy_0_1_2 -->
- <para>The MBean Explorer has also a filter text that can be used to filter among all the MBeans
- the few ones, which interest you.</para>
-
- <para>For example, if you are only interested by MBeans related to memory, typing memo will show
- only the MBeans registered under an ObjectName, which contains memo: </para>
-
- <para>A Collapse All button on the MBean Explorer toolbar is used to collapse all the MBeans and
- display only the domains. It is also possible to double click on a node to expand/collapse it. </para>
-
- </section>
-
- <section id="OpenMBeanAction">
- <title>Open MBean Action </title>
- <para>A Navigation action helps opening MBeans in a MBean Editor. This action is available
- either through the menu Navigate > Open MBean... or using the key shortcut Ctrl + Shift + M
- (⌘+ Shift + M on Mac OS X)</para>
- </section>
-
-
</chapter>
\ No newline at end of file
Modified: trunk/jmx/docs/reference/en/modules/mbean_editor.xml
===================================================================
--- trunk/jmx/docs/reference/en/modules/mbean_editor.xml 2009-01-20 17:05:49 UTC (rev 13152)
+++ trunk/jmx/docs/reference/en/modules/mbean_editor.xml 2009-01-20 17:34:56 UTC (rev 13153)
@@ -3,33 +3,57 @@
<?dbhtml filename="mbean_editor.html"?>
<title>MBean Editor</title>
- <!-- images -http://code.google.com/p/eclipse-jmx/wiki/NewAndNoteworthy_0_2_0 -->
+ <figure>
+ <title>MBean Editor Pages</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/mbean-editor_0.2.0.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
<para>The MBean Editor is composed of several pages:</para>
- <orderedlist><listitem><para>the Attributes page</para></listitem>
+ <orderedlist><listitem><para>the Attributes page</para></listitem>
<listitem><para>the Operations page</para></listitem>
<listitem><para>the Info page </para></listitem>
- </orderedlist>
+ </orderedlist>
- <para> The Attributes & Operations pages display a list for either the MBean attributes or operations as well as details for the selection.</para>
+ <para> The Attributes & Operations pages display a list for either the MBean attributes or operations as well as details for the selection.</para>
- <para> It is possible to toggle the layout between the list and the details either vertically (by default) or horizontally.</para>
+ <para> It is possible to toggle the layout between the list and the details either vertically (by default) or horizontally.</para>
+ <figure>
+ <title>Layout Buttons</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/mbean-editor-layout-buttons_0.2.0.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <figure>
+ <title>MBean Editor Horizontal Layout</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/mbean-editor-horizontal-layout_0.2.0.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
<section>
<title>Notifications Page</title>
- <!-- images could be found here - http://code.google.com/p/eclipse-jmx/wiki/NewAndNoteworthy_0_2_1-->
- <!-- also so usefull info could be found here http://code.google.com/p/eclipse-jmx/wiki/ReleaseNotes_0_2_1 -->
<para>One more page in MBean Editor is a Notifications Page, which gives the possibility to subscribe (resp. unsubscribe) to a MBean to receive its notifications by checking (resp. unchecking) the Subscribe checkbox. </para>
<para>The list of notifications is refreshed every time a new notification is received:</para>
<note><title>Note</title>
- <para>It is only possible to subscribe to MBean which emits notifications (they must be NotificationBroadcaster).</para></note>
+ <para>It is only possible to subscribe to MBean, which emits notifications (they must be NotificationBroadcaster).</para></note>
- </section>
+ </section>
<section id="AttributeDisplayExtensionPoints">
<title>Attribute Display Extension Points</title>
- <para>The value of the MBean attributes which are displayed in the MBean Editor is now contributed through 2 extension points:</para>
+ <para>The value of the MBean attributes that are displayed in the MBean Editor is now contributed through 2 extension points:</para>
<orderedlist>
<listitem><para>net.jmesnil.jmx.ui.attribute.controls</para></listitem>
<listitem><para>net.jmesnil.jmx.ui.attribute.bindings</para> </listitem>
@@ -37,4 +61,23 @@
<para>This means that you can now contribute new display for MBean attributes (see some use cases and a simple example in net.jmesnil.jmx.ui.test.interactive plugin.xml)</para>
</section>
- </chapter>
\ No newline at end of file
+
+
+ <section id="OpenMBeanAction">
+ <title>Open MBean Action </title>
+ <para>A Navigation action helps opening MBeans in a MBean Editor. This action is available
+ either through the menu Navigate > Open MBean... or using the key shortcut Ctrl + Shift + M
+ (⌘+ Shift + M on Mac OS X)</para>
+
+ <figure>
+ <title>Opening MBean Dialog</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/open-mbean-dialog_0.2.0.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ </section>
+
+</chapter>
\ No newline at end of file
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r13152 - workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap.
by jbosstools-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-01-20 12:05:49 -0500 (Tue, 20 Jan 2009)
New Revision: 13152
Added:
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaEntity.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaMember.java
Modified:
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaEntity.java
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaMember.java
Log:
Added interfaced for some of the MetaXXX classes. The idea being to be able to create second set of MetaXXX implementation backed by xml conmfiguration
Added: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaEntity.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaEntity.java (rev 0)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaEntity.java 2009-01-20 17:05:49 UTC (rev 13152)
@@ -0,0 +1,43 @@
+// $Id:$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.jboss.jpa.metamodel.ap;
+
+import javax.lang.model.element.Name;
+import javax.lang.model.element.Element;
+import java.util.List;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public interface IMetaEntity extends ImportContext {
+ String getSimpleName();
+
+ String getQualifiedName();
+
+ String getPackageName();
+
+ List<IMetaMember> getMembers();
+
+ String generateImports();
+
+ String importType(String fqcn);
+
+ String staticImport(String fqcn, String member);
+
+ String importType(Name qualifiedName);
+}
Added: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaMember.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaMember.java (rev 0)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/IMetaMember.java 2009-01-20 17:05:49 UTC (rev 13152)
@@ -0,0 +1,25 @@
+// $Id:$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.jboss.jpa.metamodel.ap;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public interface IMetaMember {
+ String getDeclarationString();
+}
Modified: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java 2009-01-20 16:41:50 UTC (rev 13151)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java 2009-01-20 17:05:49 UTC (rev 13152)
@@ -27,7 +27,7 @@
private static final String ORM_XML_LOCATION = "/META-INF/orm.xml";
- private static final Map<String, MetaEntity> metaEntities = new HashMap<String, MetaEntity>();
+ private static final Map<String, IMetaEntity> metaEntities = new HashMap<String, IMetaEntity>();
public JPAMetaModelEntityProcessor() {
}
@@ -118,17 +118,15 @@
}
}
- private void writeFile(MetaEntity entity) {
+ private void writeFile(IMetaEntity entity) {
try {
- Name metaModelPackage = entity.getPackageName();
+ String metaModelPackage = entity.getPackageName();
-
StringBuffer body = generateBody(entity);
FileObject fo = processingEnv.getFiler().createSourceFile(
- metaModelPackage + "." + entity.getSimpleName() + "_",
- entity.getOriginalElement());
+ metaModelPackage + "." + entity.getSimpleName() + "_");
OutputStream os = fo.openOutputStream();
PrintWriter pw = new PrintWriter(os);
@@ -161,7 +159,7 @@
*
* @return body content
*/
- private StringBuffer generateBody(MetaEntity entity) {
+ private StringBuffer generateBody(IMetaEntity entity) {
StringWriter sw = new StringWriter();
PrintWriter pw = null;
@@ -177,9 +175,9 @@
pw.println();
- List<MetaMember> members = entity.getMembers();
+ List<IMetaMember> members = entity.getMembers();
- for (MetaMember metaMember : members) {
+ for (IMetaMember metaMember : members) {
pw.println(" " + metaMember.getDeclarationString());
}
pw.println();
Modified: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaEntity.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaEntity.java 2009-01-20 16:41:50 UTC (rev 13151)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaEntity.java 2009-01-20 17:05:49 UTC (rev 13152)
@@ -21,7 +21,7 @@
import javax.lang.model.util.SimpleTypeVisitor6;
import javax.tools.Diagnostic.Kind;
-public class MetaEntity implements ImportContext {
+public class MetaEntity implements IMetaEntity {
final TypeElement element;
final protected ProcessingEnvironment pe;
@@ -34,26 +34,26 @@
importContext = new ImportContextImpl(getPackageName().toString());
}
- public Name getSimpleName() {
- return element.getSimpleName();
+ public String getSimpleName() {
+ return element.getSimpleName().toString();
}
public Element getOriginalElement() {
return element;
}
- public Name getQualifiedName() {
- return element.getQualifiedName();
+ public String getQualifiedName() {
+ return element.getQualifiedName().toString();
}
- public Name getPackageName() {
+ public String getPackageName() {
PackageElement packageOf = pe.getElementUtils().getPackageOf(element);
- return pe.getElementUtils().getName(packageOf.getQualifiedName() + ".metamodel");
+ return pe.getElementUtils().getName(packageOf.getQualifiedName() + ".metamodel").toString();
}
- public List<MetaMember> getMembers() {
+ public List<IMetaMember> getMembers() {
- List<MetaMember> members = new ArrayList<MetaMember>();
+ List<IMetaMember> members = new ArrayList<IMetaMember>();
if (useFields()) {
Modified: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaMember.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaMember.java 2009-01-20 16:41:50 UTC (rev 13151)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/MetaMember.java 2009-01-20 17:05:49 UTC (rev 13152)
@@ -7,7 +7,7 @@
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.Name;
-public abstract class MetaMember {
+public abstract class MetaMember implements IMetaMember {
final protected Element element;
final protected MetaEntity parent;
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r13151 - workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap.
by jbosstools-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-01-20 11:41:50 -0500 (Tue, 20 Jan 2009)
New Revision: 13151
Modified:
workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java
Log:
Modified: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java
===================================================================
--- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java 2009-01-20 16:05:23 UTC (rev 13150)
+++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java 2009-01-20 16:41:50 UTC (rev 13151)
@@ -27,7 +27,7 @@
private static final String ORM_XML_LOCATION = "/META-INF/orm.xml";
- private static final Map<String, Entity> xmlEntitiesMap = new HashMap<String, Entity>();
+ private static final Map<String, MetaEntity> metaEntities = new HashMap<String, MetaEntity>();
public JPAMetaModelEntityProcessor() {
}
@@ -52,10 +52,22 @@
Unmarshaller unmarshaller = jc.createUnmarshaller();
EntityMappings mappings = (EntityMappings) unmarshaller.unmarshal(ormStream);
Collection<Entity> entities = mappings.getEntity();
- for ( Entity entity : entities ) {
- xmlEntitiesMap.put(entity.getClazz(), entity);
+ String packageName = mappings.getPackage();
+ for (Entity entity : entities) {
+ String fullyQualifiedClassName = packageName + "." + entity.getClazz();
+ Element typeElement = processingEnv.getElementUtils().getTypeElement(fullyQualifiedClassName);
+ MetaEntity metaEntity = new MetaEntity(processingEnv, (TypeElement) typeElement);
+
+ // TODO
+ // here we would like to somehow take the XML info and merge it into the MetaEntity
+ // or maybe create interfaces for the MetaXXX classes. One set of implementation could be backed by
+ // TypeEelement and one by the xml Entity
+
+
+
+ // keep track of alreay processed entities
+ metaEntities.put(fullyQualifiedClassName, metaEntity);
}
- System.out.println(xmlEntitiesMap);
} catch (JAXBException e) {
System.err.println("Error unmarshalling orm.xml");
e.printStackTrace();
@@ -174,7 +186,7 @@
pw.println("}");
return sw.getBuffer();
} finally {
- if (pw !=null) pw.close();
- }
- }
+ if (pw != null) pw.close();
+ }
+ }
}
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r13150 - trunk/jst/plugins/org.jboss.tools.jst.jsp.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2009-01-20 11:05:23 -0500 (Tue, 20 Jan 2009)
New Revision: 13150
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3289
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-01-20 15:38:35 UTC (rev 13149)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-01-20 16:05:23 UTC (rev 13150)
@@ -332,7 +332,6 @@
<action
class="org.jboss.tools.jst.jsp.outline.cssdialog.OpenCSSDialogActionDelegate"
definitionId="org.jboss.tools.jst.jsp.commands.openCSSDialog"
- enablesFor="+"
hoverIcon="images/cssdialog/color_large.gif"
icon="images/cssdialog/color_large.gif"
id="org.jboss.tools.jst.jsp.openCSSDialogEditor"
15 years, 11 months
- 1
- 0