JBoss Tools SVN: r36691 - in workspace/yradtsevich/browsersim/swt-webkit-browsersim: org.jboss.tools.vpe.browsersim.feature and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2011-11-28 08:10:44 -0500 (Mon, 28 Nov 2011)
New Revision: 36691
Added:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/.project
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/build.properties
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/epl-v10.html
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/feature.properties
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/feature.xml
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/license.html
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- created browsersim feature
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/.project
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/.project (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/.project 2011-11-28 13:10:44 UTC (rev 36691)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.vpe.browsersim.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/build.properties
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/build.properties (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/build.properties 2011-11-28 13:10:44 UTC (rev 36691)
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ license.html
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/epl-v10.html
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/epl-v10.html (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/epl-v10.html 2011-11-28 13:10:44 UTC (rev 36691)
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+ body {
+ size: 8.5in 11.0in;
+ margin: 0.25in 0.5in 0.25in 0.5in;
+ tab-interval: 0.5in;
+ }
+ p {
+ margin-left: auto;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ }
+ p.list {
+ margin-left: 0.5in;
+ margin-top: 0.05em;
+ margin-bottom: 0.05em;
+ }
+ </style>
+
+</head>
+
+<body lang="EN-US">
+
+<p align=center><b>Eclipse Public License - v 1.0</b></p>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>"Contribution" means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>"Contributor" means any person or entity that distributes
+the Program.</p>
+
+<p>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>"Program" means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/feature.properties
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/feature.properties (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/feature.properties 2011-11-28 13:10:44 UTC (rev 36691)
@@ -0,0 +1,45 @@
+###############################################################################
+# Copyright (c) 2007-2011 Red Hat, Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss Tools Mobile Browser Simulator
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=Provides a WebKit-based browser, which allows you to view web pages as if they are opened by a mobile phone.
+
+copyright=Copyright (c) 2007-2011 Exadel, Inc and Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+licenseURL=license.html
+license=Red Hat, Inc. licenses these features and plugins to you under \
+certain open source licenses (or aggregations of such licenses), which \
+in a particular case may include the Eclipse Public License, the GNU \
+Lesser General Public License, and/or certain other open source \
+licenses. For precise licensing details, consult the corresponding \
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
+Raleigh NC 27606 USA.
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/feature.xml
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/feature.xml (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/feature.xml 2011-11-28 13:10:44 UTC (rev 36691)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature id="org.jboss.tools.vpe.browsersim.feature" label="%featureName" version="3.3.0.qualifier" provider-name="%providerName">
+
+ <description url="http://www.jboss.org/tools">
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin id="org.jboss.tools.vpe.browsersim" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+ <plugin id="org.jboss.tools.vpe.browsersim.browser" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+ <plugin id="org.jboss.tools.vpe.browsersim.eclipse" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+</feature>
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/license.html
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/license.html (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/license.html 2011-11-28 13:10:44 UTC (rev 36691)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/pom.xml
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/pom.xml (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.feature/pom.xml 2011-11-28 13:10:44 UTC (rev 36691)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.vpe.browsersim</groupId>
+ <artifactId>features</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.vpe.browsersim.features</groupId>
+ <artifactId>org.jboss.tools.vpe.browsersim.feature</artifactId>
+
+ <packaging>eclipse-feature</packaging>
+</project>
13 years, 1 month
JBoss Tools SVN: r36690 - in workspace/yradtsevich/browsersim/swt-webkit-browsersim: org.jboss.tools.vpe.browsersim.browser and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2011-11-28 07:56:19 -0500 (Mon, 28 Nov 2011)
New Revision: 36690
Added:
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/pom.xml
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/pom.xml
workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- added build scripts for browsersim plugins
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/pom.xml
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/pom.xml (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim/pom.xml 2011-11-28 12:56:19 UTC (rev 36690)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>vpe</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.vpe.browsersim</groupId>
+ <artifactId>org.jboss.tools.vpe.browsersim</artifactId>
+
+ <packaging>eclipse-plugin</packaging>
+</project>
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/pom.xml
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/pom.xml (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.browser/pom.xml 2011-11-28 12:56:19 UTC (rev 36690)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>vpe</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.vpe.browsersim</groupId>
+ <artifactId>org.jboss.tools.vpe.browsersim.browser</artifactId>
+
+ <packaging>eclipse-plugin</packaging>
+</project>
Added: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/pom.xml
===================================================================
--- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/pom.xml (rev 0)
+++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.vpe.browsersim.eclipse/pom.xml 2011-11-28 12:56:19 UTC (rev 36690)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>vpe</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.vpe.browsersim</groupId>
+ <artifactId>org.jboss.tools.vpe.browsersim.eclipse</artifactId>
+
+ <packaging>eclipse-plugin</packaging>
+</project>
13 years, 1 month
JBoss Tools SVN: r36689 - trunk.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-11-28 06:50:49 -0500 (Mon, 28 Nov 2011)
New Revision: 36689
Removed:
trunk/DEPRECATED/
Log:
removed DEPRECATED - was missed in last commit
13 years, 1 month
JBoss Tools SVN: r36688 - trunk.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-11-28 06:36:24 -0500 (Mon, 28 Nov 2011)
New Revision: 36688
Added:
trunk/drools/
Log:
move drools back to root and remove DEPRECATED folder
13 years, 1 month
JBoss Tools SVN: r36687 - in trunk: examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model and 4 other directories.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2011-11-28 04:59:41 -0500 (Mon, 28 Nov 2011)
New Revision: 36687
Added:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultProjectExample.java
Removed:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultMavenProjectExample.java
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/AbstractImportProjectExample.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/IImportProjectExample.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/SiteDialog.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesJob.java
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java
Log:
JBIDE-10009 project examples should provide way to set the output direcotry
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java 2011-11-28 09:20:58 UTC (rev 36686)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java 2011-11-28 09:59:41 UTC (rev 36687)
@@ -64,6 +64,7 @@
public static String ProjectExamplesActivator_Waiting;
public static String ProjectExamplesPreferencePage_Add;
public static String ProjectExamplesPreferencePage_Edit;
+ public static String ProjectExamplesPreferencePage_Output_directory;
public static String ProjectExamplesPreferencePage_Remove;
public static String ProjectExamplesPreferencePage_Show_experimental_sites;
public static String ProjectExamplesPreferencePage_Show_invalid_sites;
@@ -81,7 +82,7 @@
public static String ProjectUtil_Test;
public static String SeamRuntimeFix_Invalid_seam_runtime_fix;
public static String SiteDialog_Add_Project_Example_Site;
- public static String SiteDialog_Browse;
+ public static String Browse;
public static String SiteDialog_Edit_Project_Example_Site;
public static String SiteDialog_Invalid_URL;
public static String SiteDialog_Name;
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2011-11-28 09:20:58 UTC (rev 36686)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2011-11-28 09:59:41 UTC (rev 36687)
@@ -93,7 +93,7 @@
import org.jboss.tools.project.examples.model.Project;
import org.jboss.tools.project.examples.model.ProjectFix;
import org.jboss.tools.project.examples.model.ProjectUtil;
-import org.jboss.tools.project.examples.wizard.ImportDefaultMavenProjectExample;
+import org.jboss.tools.project.examples.wizard.ImportDefaultProjectExample;
import org.jboss.tools.project.examples.wizard.NewProjectExamplesJob;
import org.osgi.framework.BundleContext;
@@ -102,8 +102,9 @@
*/
public class ProjectExamplesActivator extends AbstractUIPlugin {
- private static final String README_HTML = "/readme.html";
+ private static final String README_HTML = "/readme.html"; //$NON-NLS-1$
private static final String CHEATSHEET_XML = "/cheatsheet.xml"; //$NON-NLS-1$
+ private static final String PERIOD_CHEATSHEET_XML = "/.cheatsheet.xml"; //$NON-NLS-1$
// The plug-in ID
public static final String PLUGIN_ID = "org.jboss.tools.project.examples"; //$NON-NLS-1$
public static final String ALL_SITES = Messages.ProjectExamplesActivator_All;
@@ -114,6 +115,7 @@
public static final boolean SHOW_INVALID_SITES_VALUE = true;
public static final String MAVEN_ARCHETYPE = "mavenArchetype"; //$NON-NLS-1$
public static final Object PROJECT_EXAMPLES_FAMILY = new Object();
+ public static final String PROJECT_EXAMPLES_OUTPUT_DIRECTORY = "projectExamplesOutputDirectory"; //$NON-NLS-1$
private static final String IMPORT_PROJECT_EXAMPLES_EXTENSION_ID = "org.jboss.tools.project.examples.importProjectExamples"; //$NON-NLS-1$
private static final String NAME = "name"; //$NON-NLS-1$
@@ -144,7 +146,7 @@
};
private Map<String, IImportProjectExample> importProjectExamplesMap;
- private ImportDefaultMavenProjectExample defaultImportProjectExample;
+ private ImportDefaultProjectExample defaultImportProjectExample;
/**
* The constructor
@@ -297,7 +299,7 @@
private void initImportProjectExamples() {
if (importProjectExamplesMap == null) {
- defaultImportProjectExample = new ImportDefaultMavenProjectExample();
+ defaultImportProjectExample = new ImportDefaultProjectExample();
importProjectExamplesMap = new HashMap<String,IImportProjectExample>();
IExtensionRegistry registry = Platform.getExtensionRegistry();
IExtensionPoint extensionPoint = registry
@@ -437,23 +439,37 @@
if (project == null || project.isWelcome()) {
return;
}
+ checkCheatsheet(project);
+
+ }
+
+ protected static void checkCheatsheet(Project project) {
List<String> includedProjects = project.getIncludedProjects();
if (includedProjects == null || includedProjects.size() <= 0) {
return;
}
- String projectName = includedProjects.get(0);
- if (projectName == null || projectName.isEmpty()) {
- return;
+ for (String projectName : includedProjects) {
+ if (projectName == null || projectName.isEmpty()) {
+ continue;
+ }
+ IProject eclipseProject = ResourcesPlugin.getWorkspace().getRoot()
+ .getProject(projectName);
+ if (eclipseProject == null || !eclipseProject.exists()) {
+ continue;
+ }
+ if (checkCheatsheet(project, eclipseProject, PERIOD_CHEATSHEET_XML,
+ ProjectUtil.CHEATSHEETS)) {
+ return;
+ }
+ if (checkCheatsheet(project, eclipseProject, CHEATSHEET_XML,
+ ProjectUtil.CHEATSHEETS)) {
+ return;
+ }
+ if (checkCheatsheet(project, eclipseProject, README_HTML,
+ ProjectUtil.EDITOR)) {
+ return;
+ }
}
- IProject eclipseProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if (eclipseProject == null || !eclipseProject.exists()) {
- return;
- }
- if (checkCheatsheet(project, eclipseProject, CHEATSHEET_XML, ProjectUtil.CHEATSHEETS)) {
- return;
- }
- checkCheatsheet(project, eclipseProject, README_HTML, ProjectUtil.EDITOR);
-
}
private static boolean checkCheatsheet(Project project,
@@ -780,6 +796,9 @@
}
public void done(IJobChangeEvent event) {
+ if (!workspaceJob.getResult().isOK()) {
+ return;
+ }
List<Project> projects = workspaceJob.getProjects();
try {
ProjectExamplesActivator.updatePerspective(projects);
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties 2011-11-28 09:20:58 UTC (rev 36686)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties 2011-11-28 09:59:41 UTC (rev 36687)
@@ -51,6 +51,7 @@
ProjectExamplesActivator_Waiting=Waiting...
ProjectExamplesPreferencePage_Add=Add
ProjectExamplesPreferencePage_Edit=Edit
+ProjectExamplesPreferencePage_Output_directory=Output directory:
ProjectExamplesPreferencePage_Remove=Remove
ProjectExamplesPreferencePage_Show_experimental_sites=Show experimental sites
ProjectExamplesPreferencePage_Show_invalid_sites=Show invalid sites
@@ -69,7 +70,7 @@
NewProjectExamplesWizardPage_Site=Site\:
SeamRuntimeFix_Invalid_seam_runtime_fix=Invalid Seam runtime fix in {0}.
SiteDialog_Add_Project_Example_Site=Add Project Example Site
-SiteDialog_Browse=Browse...
+Browse=Browse...
SiteDialog_Edit_Project_Example_Site=Edit Project Example Site
SiteDialog_Invalid_URL=Invalid url.
SiteDialog_Name=Name:
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/AbstractImportProjectExample.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/AbstractImportProjectExample.java 2011-11-28 09:20:58 UTC (rev 36686)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/AbstractImportProjectExample.java 2011-11-28 09:59:41 UTC (rev 36687)
@@ -11,7 +11,10 @@
package org.jboss.tools.project.examples.model;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.jboss.tools.project.examples.ProjectExamplesActivator;
/**
@@ -45,5 +48,14 @@
public void fix(Project project, IProgressMonitor monitor) {
ProjectExamplesActivator.fix(project, monitor);
}
+
+ @Override
+ public IPath getLocation() {
+ String location = ProjectExamplesActivator.getDefault().getPreferenceStore().getString(ProjectExamplesActivator.PROJECT_EXAMPLES_OUTPUT_DIRECTORY);
+ if (location == null || location.isEmpty()) {
+ return Platform.getLocation();
+ }
+ return new Path(location);
+ }
}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/IImportProjectExample.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/IImportProjectExample.java 2011-11-28 09:20:58 UTC (rev 36686)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/IImportProjectExample.java 2011-11-28 09:59:41 UTC (rev 36687)
@@ -12,8 +12,8 @@
package org.jboss.tools.project.examples.model;
import java.io.File;
-import java.util.List;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
/**
@@ -34,4 +34,6 @@
String getName();
String getType();
+
+ IPath getLocation();
}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java 2011-11-28 09:20:58 UTC (rev 36686)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java 2011-11-28 09:59:41 UTC (rev 36687)
@@ -44,7 +44,7 @@
private ArchetypeModel archetypeModel = new ArchetypeModel();
private File file;
private IProjectExampleSite site;
- private String defaultProfiles ="";
+ private String defaultProfiles =""; //$NON-NLS-1$
public Project() {
name=""; //$NON-NLS-1$
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java 2011-11-28 09:20:58 UTC (rev 36686)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java 2011-11-28 09:59:41 UTC (rev 36687)
@@ -12,6 +12,7 @@
import java.net.URL;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.jface.viewers.ISelection;
@@ -32,7 +33,10 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.jboss.tools.project.examples.Messages;
@@ -55,6 +59,7 @@
private TreeViewer viewer;
private ProjectExampleSite selectedSite;
private Button showInvalidSites;
+ private Text outputDirectoryText;
@Override
protected Control createContents(Composite parent) {
@@ -73,6 +78,51 @@
showInvalidSites.setText(Messages.ProjectExamplesPreferencePage_Show_invalid_sites);
showInvalidSites.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_INVALID_SITES));
+ Composite outputDirectoryComposite = new Composite(composite, SWT.NONE);
+ layout = new GridLayout(3, false);
+ layout.marginWidth = 0;
+ layout.marginHeight = 0;
+ outputDirectoryComposite.setLayout(layout);
+ GridData gd = new GridData(SWT.FILL, SWT.FILL, true, false);
+ outputDirectoryComposite.setLayoutData(gd);
+
+ Label outputDirectoryLabel = new Label(outputDirectoryComposite,SWT.NONE);
+ gd = new GridData(SWT.FILL, SWT.FILL, false, false);
+ gd.verticalAlignment = SWT.CENTER;
+ outputDirectoryLabel.setLayoutData(gd);
+ outputDirectoryLabel.setText(Messages.ProjectExamplesPreferencePage_Output_directory);
+
+ outputDirectoryText = new Text(outputDirectoryComposite, SWT.SINGLE|SWT.BORDER);
+ gd = new GridData(SWT.FILL, SWT.FILL, true, false);
+ gd.verticalAlignment = SWT.CENTER;
+ outputDirectoryText.setLayoutData(gd);
+ String outputDirectoryValue = store.getString(ProjectExamplesActivator.PROJECT_EXAMPLES_OUTPUT_DIRECTORY);
+ outputDirectoryText.setText(outputDirectoryValue == null ? "" : outputDirectoryValue); //$NON-NLS-1$
+ Button outputDirectoryBrowse = new Button(outputDirectoryComposite, SWT.PUSH);
+ outputDirectoryBrowse.setText(Messages.Browse);
+ outputDirectoryBrowse.addSelectionListener(new SelectionListener(){
+
+ public void widgetSelected(SelectionEvent e) {
+ DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SINGLE);
+ String value = outputDirectoryText.getText();
+ if (value.trim().length() == 0) {
+ value = Platform.getLocation().toOSString();
+ }
+ dialog.setFilterPath(value);
+
+ String result = dialog.open();
+ if (result == null || result.trim().length() == 0) {
+ return;
+ }
+ outputDirectoryText.setText(result);
+
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+
+ }
+ });
+
Group sitesGroup = new Group(composite,SWT.NONE);
sitesGroup.setText(Messages.ProjectExamplesPreferencePage_Sites);
GridLayout gl = new GridLayout(2,false);
@@ -197,22 +247,26 @@
protected void performDefaults() {
showExperimentalSites.setSelection(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES_VALUE);
showInvalidSites.setSelection(ProjectExamplesActivator.SHOW_INVALID_SITES_VALUE);
+ outputDirectoryText.setText(""); //$NON-NLS-1$
sites.getUserSites().clear();
- storeSites();
+ storePreferences();
super.performDefaults();
}
@Override
public boolean performOk() {
- storeSites();
+ storePreferences();
return super.performOk();
}
- private void storeSites() {
+ private void storePreferences() {
IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
store.setValue(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES, showExperimentalSites.getSelection());
store.setValue(ProjectExamplesActivator.SHOW_INVALID_SITES, showInvalidSites.getSelection());
-
+ String value = outputDirectoryText.getText();
+ if (!value.isEmpty()) {
+ store.setValue(ProjectExamplesActivator.PROJECT_EXAMPLES_OUTPUT_DIRECTORY, value);
+ }
try {
String userSites = ProjectUtil.getAsXML(sites.getUserSites());
store.setValue(ProjectExamplesActivator.USER_SITES, userSites);
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/SiteDialog.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/SiteDialog.java 2011-11-28 09:20:58 UTC (rev 36686)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/SiteDialog.java 2011-11-28 09:59:41 UTC (rev 36687)
@@ -141,7 +141,7 @@
nameText.setText(selectedSite.getName());
}
Button browse = new Button(container,SWT.PUSH);
- browse.setText(Messages.SiteDialog_Browse);
+ browse.setText(Messages.Browse);
browse.addSelectionListener(new SelectionListener(){
public void widgetSelected(SelectionEvent e) {
Deleted: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultMavenProjectExample.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultMavenProjectExample.java 2011-11-28 09:20:58 UTC (rev 36686)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultMavenProjectExample.java 2011-11-28 09:59:41 UTC (rev 36687)
@@ -1,217 +0,0 @@
-package org.jboss.tools.project.examples.wizard;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.core.JavaProject;
-import org.eclipse.jdt.internal.core.OpenableElementInfo;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.internal.wizards.datatransfer.ZipLeveledStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import org.jboss.tools.project.examples.Messages;
-import org.jboss.tools.project.examples.ProjectExamplesActivator;
-import org.jboss.tools.project.examples.model.AbstractImportProjectExample;
-import org.jboss.tools.project.examples.model.Project;
-
-public class ImportDefaultMavenProjectExample extends
- AbstractImportProjectExample {
-
- private static final IOverwriteQuery OVERWRITE_ALL_QUERY = new IOverwriteQuery() {
- public String queryOverwrite(String pathString) {
- return IOverwriteQuery.ALL;
- }
- };
-
- @Override
- public boolean importProject(Project projectDescription, File file,
- IProgressMonitor monitor) throws Exception {
- List<Project> projects = new ArrayList<Project>();
- if (projectDescription.getIncludedProjects() == null) {
- boolean ret = importSingleProject(projectDescription, file, monitor);
- projects.add(projectDescription);
- return ret;
- } else {
- List<String> projectNames = projectDescription.getIncludedProjects();
- for (final String projectName : projectNames) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IProject project = workspace.getRoot().getProject(projectName);
- final boolean[] ret = new boolean[1];
- if (project.exists()) {
- Display.getDefault().syncExec(new Runnable() {
-
- public void run() {
- ret[0] = MessageDialog.openQuestion(getActiveShell(),
- Messages.NewProjectExamplesWizard_Question, NLS.bind(Messages.NewProjectExamplesWizard_OverwriteProject,
- projectName));
- }
-
- });
- if (!ret[0]) {
- return false;
- }
- project.delete(true, true, monitor);
- }
- project.create(monitor);
- project.open(monitor);
- ZipFile sourceFile = new ZipFile(file);
- ZipLeveledStructureProvider structureProvider = new ZipLeveledStructureProvider(
- sourceFile);
-
- Enumeration<? extends ZipEntry> entries = sourceFile.entries();
- ZipEntry entry = null;
- List<ZipEntry> filesToImport = new ArrayList<ZipEntry>();
- List<ZipEntry> directories = new ArrayList<ZipEntry>();
- String prefix = projectName + "/"; //$NON-NLS-1$
- while (entries.hasMoreElements()) {
- entry = entries.nextElement();
- if (entry.getName().startsWith(prefix)) {
- if (!entry.isDirectory()) {
- filesToImport.add(entry);
- } else {
- directories.add(entry);
- }
- }
- }
-
- structureProvider.setStrip(1);
- ImportOperation operation = new ImportOperation(project.getFullPath(), structureProvider.getRoot(),
- structureProvider, OVERWRITE_ALL_QUERY, filesToImport);
- operation.setContext(getActiveShell());
- operation.run(monitor);
- for (ZipEntry directory:directories) {
- IPath resourcePath = new Path(directory.getName());
- try {
- if (resourcePath.segmentCount() > 1 && !workspace.getRoot().getFolder(resourcePath).exists()) {
- workspace.getRoot().getFolder(resourcePath).create(false, true, null);
- }
- } catch (Exception e) {
- ProjectExamplesActivator.log(e);
- return false;
- }
- }
- reconfigure(project, monitor);
- }
- }
- return true;
- }
-
- private boolean importSingleProject(Project projectDescription, File file,
- IProgressMonitor monitor) throws CoreException, ZipException,
- IOException, InvocationTargetException, InterruptedException {
- final String projectName = projectDescription.getName();
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IProject project = workspace.getRoot().getProject(projectName);
- final boolean[] ret = new boolean[1];
- if (project.exists()) {
- Display.getDefault().syncExec(new Runnable() {
-
- public void run() {
- ret[0] = MessageDialog.openQuestion(getActiveShell(),
- Messages.NewProjectExamplesWizard_Question, NLS.bind(Messages.NewProjectExamplesWizard_OverwriteProject,
- projectName));
- }
-
- });
- if (!ret[0]) {
- return false;
- }
- project.delete(true, true, monitor);
- }
- project.create(monitor);
- project.open(monitor);
- ZipFile sourceFile = new ZipFile(file);
- ZipLeveledStructureProvider structureProvider = new ZipLeveledStructureProvider(
- sourceFile);
-
- Enumeration<? extends ZipEntry> entries = sourceFile.entries();
- ZipEntry entry = null;
- List<ZipEntry> filesToImport = new ArrayList<ZipEntry>();
- List<ZipEntry> directories = new ArrayList<ZipEntry>();
- String prefix = projectName + "/"; //$NON-NLS-1$
- while (entries.hasMoreElements()) {
- entry = entries.nextElement();
- if (entry.getName().startsWith(prefix)) {
- if (!entry.isDirectory()) {
- filesToImport.add(entry);
- } else {
- directories.add(entry);
- }
- }
- }
-
- structureProvider.setStrip(1);
- ImportOperation operation = new ImportOperation(project.getFullPath(), structureProvider.getRoot(),
- structureProvider, OVERWRITE_ALL_QUERY, filesToImport);
- operation.setContext(getActiveShell());
- operation.run(monitor);
- for (ZipEntry directory:directories) {
- IPath resourcePath = new Path(directory.getName());
- try {
- if (resourcePath.segmentCount() > 1 && !workspace.getRoot().getFolder(resourcePath).exists()) {
- workspace.getRoot().getFolder(resourcePath).create(false, true, null);
- }
- } catch (Exception e) {
- ProjectExamplesActivator.log(e);
- return false;
- }
- }
- reconfigure(project, monitor);
- return true;
- }
-
- private static Shell getActiveShell() {
- Display display = Display.getDefault();
- final Shell[] ret = new Shell[1];
- display.syncExec(new Runnable() {
-
- public void run() {
- ret[0] = Display.getCurrent().getActiveShell();
- }
-
- });
- return ret[0];
- }
-
- private 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 OpenableElementInfo) {
- // copied from JavaProject.buildStructure(...)
- OpenableElementInfo info = (OpenableElementInfo) object;
- IClasspathEntry[] resolvedClasspath = ((JavaProject) javaProject).getResolvedClasspath();
- IPackageFragmentRoot[] children = ((JavaProject) javaProject).computePackageFragmentRoots(resolvedClasspath,false, null /* no reverse map */);
- info.setChildren(children);
- ((JavaProject) javaProject).getPerProjectInfo().rememberExternalLibTimestamps();
- }
- }
- }
-
-}
Copied: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultProjectExample.java (from rev 36677, trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultMavenProjectExample.java)
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultProjectExample.java (rev 0)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ImportDefaultProjectExample.java 2011-11-28 09:59:41 UTC (rev 36687)
@@ -0,0 +1,229 @@
+package org.jboss.tools.project.examples.wizard;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.internal.core.JavaProject;
+import org.eclipse.jdt.internal.core.OpenableElementInfo;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.dialogs.IOverwriteQuery;
+import org.eclipse.ui.internal.wizards.datatransfer.ZipLeveledStructureProvider;
+import org.eclipse.ui.wizards.datatransfer.ImportOperation;
+import org.jboss.tools.project.examples.Messages;
+import org.jboss.tools.project.examples.ProjectExamplesActivator;
+import org.jboss.tools.project.examples.model.AbstractImportProjectExample;
+import org.jboss.tools.project.examples.model.Project;
+
+public class ImportDefaultProjectExample extends
+ AbstractImportProjectExample {
+
+ private static final IOverwriteQuery OVERWRITE_ALL_QUERY = new IOverwriteQuery() {
+ public String queryOverwrite(String pathString) {
+ return IOverwriteQuery.ALL;
+ }
+ };
+
+ @Override
+ public boolean importProject(Project projectDescription, File file,
+ IProgressMonitor monitor) throws Exception {
+ List<Project> projects = new ArrayList<Project>();
+ if (projectDescription.getIncludedProjects() == null) {
+ boolean ret = importSingleProject(projectDescription, file, monitor);
+ projects.add(projectDescription);
+ return ret;
+ } else {
+ List<String> projectNames = projectDescription.getIncludedProjects();
+ for (final String projectName : projectNames) {
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IProject project = workspace.getRoot().getProject(projectName);
+ final boolean[] ret = new boolean[1];
+ if (project.exists()) {
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ ret[0] = MessageDialog.openQuestion(getActiveShell(),
+ Messages.NewProjectExamplesWizard_Question, NLS.bind(Messages.NewProjectExamplesWizard_OverwriteProject,
+ projectName));
+ }
+
+ });
+ if (!ret[0]) {
+ return false;
+ }
+ project.delete(true, true, monitor);
+ }
+ createProject(project, monitor);
+ project.open(monitor);
+ ZipFile sourceFile = new ZipFile(file);
+ ZipLeveledStructureProvider structureProvider = new ZipLeveledStructureProvider(
+ sourceFile);
+
+ Enumeration<? extends ZipEntry> entries = sourceFile.entries();
+ ZipEntry entry = null;
+ List<ZipEntry> filesToImport = new ArrayList<ZipEntry>();
+ List<ZipEntry> directories = new ArrayList<ZipEntry>();
+ String prefix = projectName + "/"; //$NON-NLS-1$
+ while (entries.hasMoreElements()) {
+ entry = entries.nextElement();
+ if (entry.getName().startsWith(prefix)) {
+ if (!entry.isDirectory()) {
+ filesToImport.add(entry);
+ } else {
+ directories.add(entry);
+ }
+ }
+ }
+
+ structureProvider.setStrip(1);
+ ImportOperation operation = new ImportOperation(project.getFullPath(), structureProvider.getRoot(),
+ structureProvider, OVERWRITE_ALL_QUERY, filesToImport);
+ operation.setContext(getActiveShell());
+ operation.run(monitor);
+ for (ZipEntry directory:directories) {
+ IPath resourcePath = new Path(directory.getName());
+ try {
+ if (resourcePath.segmentCount() > 1 && !workspace.getRoot().getFolder(resourcePath).exists()) {
+ workspace.getRoot().getFolder(resourcePath).create(false, true, null);
+ }
+ } catch (Exception e) {
+ ProjectExamplesActivator.log(e);
+ return false;
+ }
+ }
+ reconfigure(project, monitor);
+ }
+ }
+ return true;
+ }
+
+ private void createProject(IProject project, IProgressMonitor monitor) throws CoreException {
+ IPath location = getLocation();
+ if (!Platform.getLocation().equals(location)) {
+ IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
+ desc.setLocation(location.append(project.getName()));
+ project.create(desc, monitor);
+ } else
+ project.create(monitor);
+ }
+
+ private boolean importSingleProject(Project projectDescription, File file,
+ IProgressMonitor monitor) throws CoreException, ZipException,
+ IOException, InvocationTargetException, InterruptedException {
+ final String projectName = projectDescription.getName();
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IProject project = workspace.getRoot().getProject(projectName);
+ final boolean[] ret = new boolean[1];
+ if (project.exists()) {
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ ret[0] = MessageDialog.openQuestion(getActiveShell(),
+ Messages.NewProjectExamplesWizard_Question, NLS.bind(Messages.NewProjectExamplesWizard_OverwriteProject,
+ projectName));
+ }
+
+ });
+ if (!ret[0]) {
+ return false;
+ }
+ project.delete(true, true, monitor);
+ }
+ createProject(project, monitor);
+ project.open(monitor);
+ ZipFile sourceFile = new ZipFile(file);
+ ZipLeveledStructureProvider structureProvider = new ZipLeveledStructureProvider(
+ sourceFile);
+
+ Enumeration<? extends ZipEntry> entries = sourceFile.entries();
+ ZipEntry entry = null;
+ List<ZipEntry> filesToImport = new ArrayList<ZipEntry>();
+ List<ZipEntry> directories = new ArrayList<ZipEntry>();
+ String prefix = projectName + "/"; //$NON-NLS-1$
+ while (entries.hasMoreElements()) {
+ entry = entries.nextElement();
+ if (entry.getName().startsWith(prefix)) {
+ if (!entry.isDirectory()) {
+ filesToImport.add(entry);
+ } else {
+ directories.add(entry);
+ }
+ }
+ }
+
+ structureProvider.setStrip(1);
+ ImportOperation operation = new ImportOperation(project.getFullPath(), structureProvider.getRoot(),
+ structureProvider, OVERWRITE_ALL_QUERY, filesToImport);
+ operation.setContext(getActiveShell());
+ operation.run(monitor);
+ for (ZipEntry directory:directories) {
+ IPath resourcePath = new Path(directory.getName());
+ try {
+ if (resourcePath.segmentCount() > 1 && !workspace.getRoot().getFolder(resourcePath).exists()) {
+ workspace.getRoot().getFolder(resourcePath).create(false, true, null);
+ }
+ } catch (Exception e) {
+ ProjectExamplesActivator.log(e);
+ return false;
+ }
+ }
+ reconfigure(project, monitor);
+ return true;
+ }
+
+ private static Shell getActiveShell() {
+ Display display = Display.getDefault();
+ final Shell[] ret = new Shell[1];
+ display.syncExec(new Runnable() {
+
+ public void run() {
+ ret[0] = Display.getCurrent().getActiveShell();
+ }
+
+ });
+ return ret[0];
+ }
+
+ private 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 OpenableElementInfo) {
+ // copied from JavaProject.buildStructure(...)
+ OpenableElementInfo info = (OpenableElementInfo) object;
+ IClasspathEntry[] resolvedClasspath = ((JavaProject) javaProject).getResolvedClasspath();
+ IPackageFragmentRoot[] children = ((JavaProject) javaProject).computePackageFragmentRoots(resolvedClasspath,false, null /* no reverse map */);
+ info.setChildren(children);
+ ((JavaProject) javaProject).getPerProjectInfo().rememberExternalLibTimestamps();
+ }
+ }
+ }
+
+}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesJob.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesJob.java 2011-11-28 09:20:58 UTC (rev 36686)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesJob.java 2011-11-28 09:59:41 UTC (rev 36687)
@@ -37,6 +37,8 @@
selectedProject, monitor);
if (success) {
projects.add(selectedProject);
+ } else {
+ return Status.CANCEL_STATUS;
}
}
try {
@@ -53,10 +55,12 @@
"Cannot import a project of the '" + project.getImportType() + "' type.");
}
});
- return Status.OK_STATUS;
+ return Status.CANCEL_STATUS;
}
if (importProjectExample.importProject(project, project.getFile(), monitor)) {
importProjectExample.fix(project, monitor);
+ } else {
+ return Status.CANCEL_STATUS;
}
}
} catch (final Exception e) {
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java 2011-11-28 09:20:58 UTC (rev 36686)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenArchetypeProjectExample.java 2011-11-28 09:59:41 UTC (rev 36687)
@@ -19,11 +19,13 @@
import java.util.List;
import java.util.Set;
-import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.m2e.core.MavenPlugin;
@@ -31,6 +33,7 @@
import org.eclipse.m2e.core.project.LocalProjectScanner;
import org.eclipse.m2e.core.project.MavenProjectInfo;
import org.eclipse.m2e.core.project.ProjectImportConfiguration;
+import org.eclipse.m2e.core.ui.internal.UpdateConfigurationJob;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.jboss.tools.maven.project.examples.wizard.ArchetypeExamplesWizard;
@@ -49,11 +52,8 @@
final IProgressMonitor monitor) throws Exception {
List<Project> projects = new ArrayList<Project>();
projects.add(projectDescription);
- final IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- IPath rootPath = workspaceRoot.getLocation();
- IPath mavenProjectsRoot = rootPath;
- IPath path = mavenProjectsRoot;
- final File destination = new File(path.toOSString());
+ final IPath location = getLocation();
+ final File destination = new File(location.toOSString());
final boolean[] ret = new boolean[1];
ret[0] = true;
@@ -76,14 +76,13 @@
projectDescription.getIncludedProjects().clear();
String projectName = wizard.getProjectName();
includedProjects.add(projectName);
- IPath location = workspaceRoot.getLocation();
String artifactId = wizard.getArtifactId();
String projectFolder = location.append(artifactId).toFile()
.getAbsolutePath();
MavenModelManager mavenModelManager = MavenPlugin
.getMavenModelManager();
LocalProjectScanner scanner = new LocalProjectScanner(
- workspaceRoot.getLocation().toFile(), //
+ location.toFile(), //
projectFolder, true, mavenModelManager);
try {
scanner.run(monitor);
@@ -95,6 +94,7 @@
Set<MavenProjectInfo> projectSet = collectProjects(scanner
.getProjects());
ProjectImportConfiguration importConfiguration = new ProjectImportConfiguration();
+
for (MavenProjectInfo info : projectSet) {
try {
projectName = MavenProjectExamplesActivator
@@ -107,6 +107,35 @@
ret[0] = false;
}
}
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ if (project != null && project.isAccessible()) {
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+ } catch (CoreException e) {
+ // ignore
+ }
+ }
+ if (includedProjects.size() > 0) {
+ IProject[] selectedProjects = new IProject[includedProjects.size()];
+ int i = 0;
+
+ for (String selectedProjectName:includedProjects) {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject(selectedProjectName);
+ selectedProjects[i++] = project;
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+ } catch (CoreException e) {
+ // ignore
+ }
+ }
+ Job updateJob = new UpdateConfigurationJob(selectedProjects , true, false);
+ updateJob.schedule();
+ try {
+ updateJob.join();
+ } catch (InterruptedException e) {
+ // ignore
+ }
+ }
}
});
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java 2011-11-28 09:20:58 UTC (rev 36686)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExample.java 2011-11-28 09:59:41 UTC (rev 36687)
@@ -18,15 +18,12 @@
import org.apache.maven.model.Model;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.embedder.IMaven;
import org.eclipse.m2e.core.embedder.MavenModelManager;
import org.eclipse.m2e.core.project.AbstractProjectScanner;
import org.eclipse.m2e.core.project.LocalProjectScanner;
@@ -54,8 +51,7 @@
IProgressMonitor monitor) throws Exception {
List<Project> projects = new ArrayList<Project>();
projects.add(projectDescription);
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- IPath rootPath = workspaceRoot.getLocation();
+ IPath rootPath = getLocation();
IPath mavenProjectsRoot = rootPath;
String projectName = projectDescription.getName();
if (projectName == null || projectName.isEmpty()) {
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java 2011-11-28 09:20:58 UTC (rev 36686)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java 2011-11-28 09:59:41 UTC (rev 36687)
@@ -23,6 +23,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
@@ -32,6 +33,7 @@
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
import org.jboss.tools.maven.project.examples.MavenProjectExamplesActivator;
+import org.jboss.tools.project.examples.ProjectExamplesActivator;
import org.jboss.tools.project.examples.model.Project;
/**
@@ -99,10 +101,13 @@
try {
getContainer().run(true, false, op);
} catch (InterruptedException e) {
- return false;
+ ProjectExamplesActivator.log(e);
+ return true;
} catch (InvocationTargetException e) {
-
- return false;
+ ProjectExamplesActivator.log(e);
+ Throwable ex = e.getTargetException();
+ MessageDialog.openError(getShell(), "Error", ex.getMessage());
+ return true;
}
return true;
13 years, 1 month
JBoss Tools SVN: r36686 - trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-11-28 04:20:58 -0500 (Mon, 28 Nov 2011)
New Revision: 36686
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml
Log:
[JBIDE-10224] removed bundle activators, removed "lazy bundle activation", replaced bundle dependency by package dependency, commented hack
Modified: trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml 2011-11-28 09:05:53 UTC (rev 36685)
+++ trunk/as/features/org.jboss.ide.eclipse.as.serverAdapter.wtp.feature/feature.xml 2011-11-28 09:20:58 UTC (rev 36686)
@@ -84,6 +84,7 @@
<plugin id="org.jboss.ide.eclipse.as.core" download-size="0" install-size="0" version="0.0.0" unpack="false" />
<plugin id="org.jboss.ide.eclipse.as.management.as7" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+ <plugin id="org.jboss.ide.eclipse.as.management.as71" download-size="0" install-size="0" version="0.0.0" unpack="false" />
<plugin id="org.jboss.ide.eclipse.as.ui" download-size="0" install-size="0" version="0.0.0" unpack="false" />
<plugin id="org.jboss.ide.eclipse.as.classpath.core" download-size="0" install-size="0" version="0.0.0" unpack="false" />
<plugin id="org.jboss.ide.eclipse.as.classpath.ui" download-size="0" install-size="0" version="0.0.0" unpack="false" />
13 years, 1 month
JBoss Tools SVN: r36685 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-11-28 04:05:53 -0500 (Mon, 28 Nov 2011)
New Revision: 36685
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java
Log:
[JBIDE-10224] removed bundle activators, removed "lazy bundle activation", replaced bundle dependency by package dependency, commented hack
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2011-11-28 08:14:18 UTC (rev 36684)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2011-11-28 09:05:53 UTC (rev 36685)
@@ -23,7 +23,7 @@
public static IJBoss7ManagerService getService(IServer server) throws InvalidSyntaxException {
BundleContext context = JBossServerCorePlugin.getContext();
- skipLazyInit();
+// skipLazyInit();
JBoss7ManagerServiceProxy proxy = new JBoss7ManagerServiceProxy(context, getRequiredVersion(server));
proxy.open();
return proxy;
13 years, 1 month
JBoss Tools SVN: r36684 - trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test.
by jbosstools-commits@lists.jboss.org
Author: rawagner
Date: 2011-11-28 03:14:18 -0500 (Mon, 28 Nov 2011)
New Revision: 36684
Added:
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenProjectsTest.java
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedJSFProjectTest.java
Log:
new maven SWTBot tests
Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenProjectsTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenProjectsTest.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenProjectsTest.java 2011-11-28 08:14:18 UTC (rev 36684)
@@ -0,0 +1,108 @@
+package org.jboss.tools.maven.ui.bot.test;
+
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.junit.Test;
+
+@SuppressWarnings("restriction")
+public class CreateMavenProjectsTest extends AbstractMavenSWTBotTest{
+
+ public static final String JBOSS6_AS_HOME=System.getProperty("jbosstools.test.jboss.home.6.1", "/home/eiden/Java/RedHat/JBossASs/jboss-6.1.0.Final");
+ public static final String JBOSS7_AS_HOME=System.getProperty("jbosstools.test.jboss.home.7.0", "/home/eiden/Java/RedHat/JBossASs/jboss-as-7.0.1.Final1");
+ public static final String POM_FILE = "pom.xml";
+ public static final String PROJECT_NAME6="JSFProject6";
+ public static final String PROJECT_NAME7="JSFProject7";
+ public static final String SERVER_RUNTIME6="JBoss 6.x Runtime";
+ public static final String SERVER_RUNTIME7="JBoss 7.x Runtime";
+ public static final String SERVER6="JBoss AS 6.x";
+ public static final String SERVER7="JBoss AS 7.x";
+ public static final String GROUPID ="javax.faces";
+ public static final String ARTIFACTID ="jsf-api";
+ public static final String JSF_VERSION_1_1_02 ="1.1.02";
+ public static final String JSF_VERSION_1_2 ="2.0";
+ public static final String JSF_VERSION_2 ="2.0";
+
+
+
+ @Test
+ public void createSimpleJarProject() throws Exception{
+ String projectName = "MavenJar";
+ createSimpleMavenProject(projectName,"jar");
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ assertNoErrors(project);
+ }
+
+ @Test
+ public void createSimpleWarProject() throws Exception{
+ String projectName = "MavenWar";
+ createSimpleMavenProject(projectName, "war");
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ assertNoErrors(project);
+ }
+
+
+ @Test
+ public void createSimpleJarProjectArchetype() throws Exception{
+ String projectName = "ArchetypeQuickstart";
+ createSimpleMavenProjectArchetype(projectName, "maven-archetype-quickstart", "All Catalogs");
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ assertNoErrors(project);
+ }
+
+ @Test
+ public void createSimpleJsfProjectArchetype() throws Exception{
+ String projectName = "ArchetypeJSF";
+ createSimpleMavenProjectArchetype(projectName, "appfuse-basic-jsf", "All Catalogs");
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ assertNoErrors(project);
+ }
+
+
+
+
+ private void createSimpleMavenProjectArchetype(String projectName, String projectType, String catalog) throws InterruptedException, CoreException{
+ bot.menu("File").menu("New").menu("Other...").click();
+ SWTBot shell = bot.shell("New").activate().bot();
+ shell.tree().expandNode("Maven").select("Maven Project");
+ shell.button("Next >").click();
+ shell.checkBox("Create a simple project (skip archetype selection)").deselect();
+ shell.button("Next >").click();
+ Thread.sleep(1000);
+ shell.comboBox().setSelection(catalog);
+ Thread.sleep(1000);
+ int index = bot.table(0).indexOf(projectType,"Artifact Id");
+ if(index == -1){
+ fail(projectType + " not found");
+ }
+ shell.table(0).select(index);
+ shell.button("Next >").click();
+ shell.comboBoxWithLabel("Group Id:").setText(projectName);
+ shell.comboBoxWithLabel("Artifact Id:").setText(projectName);
+ shell.button("Finish").click();
+ waitForJobsToComplete();
+ }
+
+ private void createSimpleMavenProject(String projectName, String projectType) throws InterruptedException, CoreException{
+ bot.menu("File").menu("New").menu("Other...").click();
+ SWTBot shell = bot.shell("New").activate().bot();
+ shell.tree().expandNode("Maven").select("Maven Project").click() ;
+ shell.button("Next >").click();
+ shell.checkBox("Create a simple project (skip archetype selection)").select();
+ shell.button("Next >").click();
+ shell.comboBoxInGroup("Artifact", 0).setText(projectName);
+ shell.comboBoxInGroup("Artifact", 1).setText(projectName);
+ shell.comboBoxInGroup("Artifact", 4).setText(projectType);
+ shell.button("Finish").click();
+ waitForJobsToComplete();
+
+ }
+
+
+
+
+}
Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedJSFProjectTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedJSFProjectTest.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedJSFProjectTest.java 2011-11-28 08:14:18 UTC (rev 36684)
@@ -0,0 +1,296 @@
+package org.jboss.tools.maven.ui.bot.test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.StringWriter;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.m2e.tests.common.WorkspaceHelpers;
+import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
+
+@SuppressWarnings("restriction")
+public class CreateMavenizedJSFProjectTest{
+
+ public static final String JBOSS6_AS_HOME=System.getProperty("jbosstools.test.jboss.home.6.1", "/home/eiden/Java/RedHat/JBossASs/jboss-6.1.0.Final");
+ public static final String JBOSS7_AS_HOME=System.getProperty("jbosstools.test.jboss.home.7.0", "/home/eiden/Java/RedHat/JBossASs/jboss-as-7.0.1.Final1");
+ public static final String POM_FILE = "pom.xml";
+ public static final String PROJECT_NAME6="JSFProject6";
+ public static final String PROJECT_NAME7="JSFProject7";
+ public static final String PROJECT_NAME6_v1="JSFProject6_1.2";
+ public static final String PROJECT_NAME7_v1="JSFProject7_1.2";
+ public static final String SERVER_RUNTIME6="JBoss 6.x Runtime";
+ public static final String SERVER_RUNTIME7="JBoss 7.x Runtime";
+ public static final String SERVER6="JBoss AS 6.x";
+ public static final String SERVER7="JBoss AS 7.x";
+ public static final String GROUPID ="javax.faces";
+ public static final String ARTIFACTID ="jsf-api";
+ public static final String JSF_VERSION_1_1_02 ="1.1.02";
+ public static final String JSF_VERSION_1_2 ="2.0";
+ public static final String JSF_VERSION_2 ="2.0";
+
+ protected static SWTWorkbenchBot bot;
+
+ @BeforeClass
+ public final static void beforeClass() throws Exception {
+ bot = AbstractMavenSWTBotTest.initSWTBot();
+ }
+
+ @Test
+ public void createJSFProjectTest_AS6_v2() throws InterruptedException, CoreException{
+ createJSFProject(SERVER_RUNTIME6, SERVER6, JBOSS6_AS_HOME,"JSF 2.0", PROJECT_NAME6);
+ }
+
+ @Test
+ public void activateMavenFacet_AS6_v2() throws InterruptedException, CoreException{
+ activateMavenFacet(PROJECT_NAME6);
+ }
+
+ @Test
+ public void buildProject_AS6_v2() throws CoreException, ParserConfigurationException, SAXException, IOException, TransformerException, InterruptedException{
+ addDependencies(PROJECT_NAME6, JSF_VERSION_2);
+ buildProject(PROJECT_NAME6);
+ }
+ /*
+ @Test
+ public void deployProject_AS6_v2() throws ParserConfigurationException, SAXException, IOException, CoreException, TransformerException{
+ addServerToPom(PROJECT_NAME6, JBOSS6_AS_HOME);
+ deployModule(PROJECT_NAME6);
+ }
+ */
+
+ @Test
+ public void createJSFProjectTest_AS7_v2() throws InterruptedException, CoreException{
+ createJSFProject(SERVER_RUNTIME7, SERVER7, JBOSS7_AS_HOME,"JSF 2.0", PROJECT_NAME7);
+ }
+
+ @Test
+ public void activateMavenFacet_AS7_v2() throws InterruptedException, CoreException{
+ activateMavenFacet(PROJECT_NAME7);
+ }
+
+ @Test
+ public void buildProject_AS7_v2() throws CoreException, ParserConfigurationException, SAXException, IOException, TransformerException, InterruptedException{
+ addDependencies(PROJECT_NAME7, JSF_VERSION_2);
+ buildProject(PROJECT_NAME7);
+ }
+
+ @Test
+ public void createJSFProjectTest_AS6_v1() throws InterruptedException, CoreException{
+ createJSFProject(SERVER_RUNTIME6, SERVER6, JBOSS6_AS_HOME,"JSF 1.2", PROJECT_NAME6_v1);
+ }
+
+ @Test
+ public void activateMavenFacet_AS6_v1() throws InterruptedException, CoreException{
+ activateMavenFacet(PROJECT_NAME6_v1);
+ }
+
+ @Test
+ public void buildProject_AS6_v1() throws CoreException, ParserConfigurationException, SAXException, IOException, TransformerException, InterruptedException{
+ addDependencies(PROJECT_NAME6_v1, JSF_VERSION_1_2);
+ buildProject(PROJECT_NAME6_v1);
+ }
+
+ @Test
+ public void createJSFProjectTest_AS7_v1() throws InterruptedException, CoreException{
+ createJSFProject(SERVER_RUNTIME7, SERVER7, JBOSS7_AS_HOME,"JSF 1.2", PROJECT_NAME7_v1);
+ }
+
+ @Test
+ public void activateMavenFacet_AS7_v1() throws InterruptedException, CoreException{
+ activateMavenFacet(PROJECT_NAME7_v1);
+ }
+
+ @Test
+ public void buildProject_AS7_v1() throws CoreException, ParserConfigurationException, SAXException, IOException, TransformerException, InterruptedException{
+ addDependencies(PROJECT_NAME7_v1, JSF_VERSION_1_2);
+ buildProject(PROJECT_NAME7_v1);
+ }
+
+
+ private void createJSFProject(String serverRuntime, String server, String serverHome, String jsfVersion, String projectName) throws InterruptedException, CoreException{
+ bot.menu("File").menu("New").menu("Other...").click();
+ SWTBot shell = bot.shell("New").activate().bot();
+ shell.tree().expandNode("JBoss Tools Web").expandNode("JSF").select("JSF Project");
+ shell.button("Next >").click();
+ shell.textWithLabel("Project Name*").setText(projectName);
+ shell.comboBox(0).setSelection(jsfVersion);
+ shell.comboBox(1).setSelection("JSFKickStartWithoutLibs");
+ shell.button("Next >").click();
+ shell.button("New...").click();
+ SWTBot shellRuntime = bot.shell("New Server Runtime").activate().bot();
+ Thread.sleep(1000);
+ shellRuntime.tree().expandNode("JBoss Community").select(serverRuntime);
+ shellRuntime.button("Next >").click();
+ shellRuntime.textWithLabel("Home Directory").setText(serverHome);
+ shellRuntime.button("Finish").click();
+ Thread.sleep(1000);
+ shell.button(1).click();
+ shellRuntime = bot.shell("New Server").activate().bot();
+ shellRuntime.tree().expandNode("JBoss Community").select(server);
+ shellRuntime.button("Finish").click();
+ waitForIdle();
+ shell.button("Finish").click();;
+ waitForIdle();
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ assertNoErrors(project);
+ }
+
+
+ private void addDependencies(String projectName, String jsfVersion) throws ParserConfigurationException, SAXException, IOException, CoreException, TransformerException, InterruptedException{
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder docBuilder = factory.newDocumentBuilder();
+ Document docPom = docBuilder.parse(project.getFile("pom.xml").getContents());
+ Element dependenciesElement = docPom.createElement("dependencies");
+ Element dependencyElement = docPom.createElement("dependency");
+ Element groupIdElement = docPom.createElement("groupId");
+ Element artifactIdElement = docPom.createElement("artifactId");
+ Element versionElement = docPom.createElement("version");
+ groupIdElement.setTextContent(GROUPID);
+ artifactIdElement.setTextContent(ARTIFACTID);
+ versionElement.setTextContent(jsfVersion);
+ dependencyElement.appendChild(groupIdElement);
+ dependencyElement.appendChild(versionElement);
+ dependencyElement.appendChild(artifactIdElement);
+ dependenciesElement.appendChild(dependencyElement);
+ Element root = docPom.getDocumentElement();
+ root.appendChild(dependenciesElement);
+ //save pom
+ TransformerFactory transfac = TransformerFactory.newInstance();
+ Transformer trans = transfac.newTransformer();
+ StringWriter xmlAsWriter = new StringWriter();
+ StreamResult result = new StreamResult(xmlAsWriter);
+ DOMSource source = new DOMSource(docPom);
+ trans.transform(source, result);
+ project.getFile("pom.xml").setContents(new ByteArrayInputStream(xmlAsWriter.toString().getBytes("UTF-8")), 0, null);
+ waitForIdle();
+ }
+
+ private void activateMavenFacet(String projectName) throws InterruptedException, CoreException{
+ SWTBot explorer = bot.viewByTitle("Package Explorer").bot();
+ SWTBotTreeItem item = explorer.tree().getTreeItem(projectName).select();
+ item.pressShortcut(Keystrokes.ALT,Keystrokes.LF);
+ SWTBot shellProperties = bot.shell("Properties for "+projectName).activate().bot();
+ shellProperties.tree().select("Project Facets");
+ shellProperties.tree(1).getTreeItem("JBoss Maven Integration").check();
+ Thread.sleep(500);
+ SWTBotExt swtBot = new SWTBotExt();
+ swtBot.hyperlink("Further configuration required...").click();
+ swtBot.button("OK").click();
+ swtBot.button("OK").click();
+ waitForIdle();
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ assertNoErrors(project);
+ }
+
+ private void buildProject(String projectName) throws CoreException{
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ SWTBot explorer = bot.viewByTitle("Package Explorer").bot();
+ SWTBotTreeItem item = explorer.tree().getTreeItem(projectName).select();
+ SWTBotExt swtBot = new SWTBotExt();
+ item.contextMenu("Run As").menu("5 Maven build...").click();
+ swtBot.textWithLabel("Goals:").setText("clean package");
+ swtBot.button("Run").click();
+ waitForIdle();
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ project.getFolder("target").refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ IFolder warFolder = project.getFolder("target/" + projectName + "-0.0.1-SNAPSHOT");
+ assertTrue(warFolder +" is missing ", warFolder.exists());
+ IPath webInfPath = new Path("WEB-INF");
+ assertFalse(warFolder.getFolder(webInfPath.append("src")).exists());
+ assertFalse(warFolder.getFolder(webInfPath.append("dev")).exists());
+ assertTrue(warFolder.getFolder(webInfPath.append("lib")).exists());
+ }
+
+ private void addServerToPom(String projectName, String serverLocation) throws ParserConfigurationException, SAXException, IOException, CoreException, TransformerException{
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder docBuilder = factory.newDocumentBuilder();
+ Document docPom = docBuilder.parse(project.getFile("pom.xml").getContents());
+ Element pluginElement = docPom.createElement("plugin");
+ Element groupIdElement = docPom.createElement("groupId");
+ Element artifactIdElement = docPom.createElement("artifactId");
+ Element versionElement = docPom.createElement("version");
+ Element configurationElement = docPom.createElement("configuration");
+ Element jbossHomeElement = docPom.createElement("jbossHome");
+ Element serverNameElement = docPom.createElement("serverName");
+ Element fileNameElement = docPom.createElement("fileName");
+
+ groupIdElement.setTextContent("org.codehaus.mojo");
+ artifactIdElement.setTextContent("jboss-maven-plugin");
+ versionElement.setTextContent("1.5.0");
+ jbossHomeElement.setTextContent(serverLocation);
+ serverNameElement.setTextContent("default");
+ fileNameElement.setTextContent("target"+projectName+".war");
+
+ Element root = docPom.getDocumentElement();
+ Element buildElement = (Element)root.getElementsByTagName("build").item(0);
+ Node plugins = buildElement.getElementsByTagName("plugins").item(0);
+ configurationElement.appendChild(serverNameElement);
+ configurationElement.appendChild(jbossHomeElement);
+ configurationElement.appendChild(fileNameElement);
+ pluginElement.appendChild(configurationElement);
+ pluginElement.appendChild(versionElement);
+ pluginElement.appendChild(artifactIdElement);
+ pluginElement.appendChild(groupIdElement);
+ plugins.appendChild(pluginElement);
+ //save pom
+ TransformerFactory transfac = TransformerFactory.newInstance();
+ Transformer trans = transfac.newTransformer();
+ StringWriter xmlAsWriter = new StringWriter();
+ StreamResult result = new StreamResult(xmlAsWriter);
+ DOMSource source = new DOMSource(docPom);
+ trans.transform(source, result);
+ project.getFile("pom.xml").setContents(new ByteArrayInputStream(xmlAsWriter.toString().getBytes("UTF-8")), 0, null);
+ waitForIdle();
+ }
+
+ private void deployModule(String projectName){
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ SWTBot explorer = bot.viewByTitle("Package Explorer").bot();
+ SWTBotTreeItem item = explorer.tree().getTreeItem(projectName).select();
+ SWTBotExt swtBot = new SWTBotExt();
+ item.contextMenu("Run As").menu("5 Maven build...").click();
+ waitForIdle();
+ swtBot.textWithLabel("Goals:").setText("jboss:hard-deploy");
+ swtBot.button("Run").click();
+ waitForIdle();
+ }
+
+
+ private static void waitForIdle() {
+ AbstractMavenSWTBotTest.waitForIdle();
+ }
+
+ private static void assertNoErrors(IProject project) throws CoreException {
+ WorkspaceHelpers.assertNoErrors(project);
+ }
+}
13 years, 1 month
JBoss Tools SVN: r36683 - in trunk/maven/tests: org.jboss.tools.maven.ui.bot.test and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: rawagner
Date: 2011-11-28 03:11:32 -0500 (Mon, 28 Nov 2011)
New Revision: 36683
Modified:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.settings/org.eclipse.m2e.core.prefs
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/.project
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenProfileSelectionTest.java
Log:
new and updated maven SWTBot tests
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.settings/org.eclipse.m2e.core.prefs 2011-11-28 03:54:34 UTC (rev 36682)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/.settings/org.eclipse.m2e.core.prefs 2011-11-28 08:11:32 UTC (rev 36683)
@@ -1,4 +1,4 @@
-#Tue Aug 02 13:44:10 CEST 2011
+#Mon Nov 28 08:59:23 CET 2011
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/.project
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/.project 2011-11-28 03:54:34 UTC (rev 36682)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/.project 2011-11-28 08:11:32 UTC (rev 36683)
@@ -1,28 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.jboss.tools.maven.ui.bot.test</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.maven.ui.bot.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2011-11-28 03:54:34 UTC (rev 36682)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2011-11-28 08:11:32 UTC (rev 36683)
@@ -8,6 +8,9 @@
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.apache.log4j,
+ org.jboss.tools.ui.bot.ext,
+ org.eclipse.ui.ide;bundle-version="3.5.1",
+ org.eclipse.ui.forms;bundle-version="3.4.1",
org.eclipse.swtbot.eclipse.core,
org.eclipse.swtbot.swt.finder,
org.eclipse.swtbot.eclipse.finder,
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2011-11-28 03:54:34 UTC (rev 36682)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2011-11-28 08:11:32 UTC (rev 36683)
@@ -11,7 +11,6 @@
package org.jboss.tools.maven.ui.bot.test;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -26,8 +25,6 @@
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
@@ -35,7 +32,6 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.datatools.connectivity.ConnectionProfileConstants;
import org.eclipse.datatools.connectivity.ConnectionProfileException;
import org.eclipse.datatools.connectivity.ProfileManager;
@@ -47,27 +43,15 @@
import org.eclipse.datatools.connectivity.drivers.IPropertySet;
import org.eclipse.datatools.connectivity.drivers.PropertySetImpl;
import org.eclipse.datatools.connectivity.drivers.models.TemplateDescriptor;
-import org.eclipse.jface.bindings.keys.KeyStroke;
-import org.eclipse.jface.bindings.keys.ParseException;
import org.eclipse.m2e.core.internal.IMavenConstants;
-import org.eclipse.m2e.tests.common.AbstractMavenProjectTestCase;
-import org.eclipse.m2e.tests.common.JobHelpers;
import org.eclipse.m2e.tests.common.WorkspaceHelpers;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
-import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
-import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes;
-import org.eclipse.swtbot.swt.finder.results.Result;
-import org.eclipse.swtbot.swt.finder.results.VoidResult;
-import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotRadio;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
@@ -76,11 +60,7 @@
import org.eclipse.ui.IPerspectiveDescriptor;
import org.eclipse.ui.IPerspectiveRegistry;
import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferenceConstants;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.IPreferenceConstants;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.util.PrefUtil;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IRuntimeType;
@@ -108,8 +88,9 @@
* @author Snjeza
*
*/
+@SuppressWarnings("restriction")
@RunWith(SWTBotJunit4ClassRunner.class)
-public class CreateMavenizedSeamProjectTest {
+public class CreateMavenizedSeamProjectTest{
protected static final long IDLE_TIME = 1 * 60 * 1000L;
@@ -139,18 +120,18 @@
= "org.eclipse.datatools.connectivity.db.URL"; //$NON-NLS-1$
public static final String HSQL_PROFILE_ID = "org.eclipse.datatools.enablement.hsqldb.connectionProfile";
+
+ public static final String JBOSS_AS_HOME = System.getProperty("jbosstools.test.jboss.home.5.1", "/home/eiden/Java/RedHat/JBossASs/jboss-5.1.0.GA");//"E:\\JBossRuntimes\\jboss-5.1.0.GA");
- public static final String JBOSS_AS_HOME = System.getProperty("jbosstools.test.jboss.home.5.1", "E:\\JBossRuntimes\\jboss-5.1.0.GA");
-
public static final String JBOSS_AS_RUNTIME_ID = "org.jboss.ide.eclipse.as.runtime.51";
public static final String JBOSS_AS_SERVER_ID = "org.jboss.ide.eclipse.as.51";
- public static final String SEAM_HOME_PROPERTY = System.getProperty("jbosstools.test.seam.2.0.1.GA.home", "E:\\JBossRuntimes\\jboss-seam-2.2.1.CR3");
+ public static final String SEAM_HOME_PROPERTY = System.getProperty("jbosstools.test.seam.2.0.1.GA.home", "/home/eiden/Java/RedHat/libs/jboss-seam-2.2.1.Final");//E:\\JBossRuntimes\\jboss-seam-2.2.1.CR3");
public static final String HSQLDB_DRIVER_JAR_NAME = "hsqldb.jar"; //$NON-NLS-1$
- public static final String HSQLDB_DRIVER_LOCATION = "/common/lib/" + HSQLDB_DRIVER_JAR_NAME; //$NON-NLS-1$
+ public static final String HSQLDB_DRIVER_LOCATION = "/home/eiden/Java/RedHat/libs + HSQLDB_DRIVER_JAR_NAME"; //"/common/lib/" + HSQLDB_DRIVER_JAR_NAME; //$NON-NLS-1$
public static final String PROJECT_NAME_WAR = "MavenizedSeamProjectWar";
@@ -463,7 +444,7 @@
bot.button("Finish").click();
waitForIdle();
- }
+ }
@Test
public void testAsLocation() {
@@ -490,6 +471,7 @@
}
private void checkErrors(String projectName) throws CoreException {
+ waitForIdle();
List<IMarker> markers = new ArrayList<IMarker>();
IProject project = ResourcesPlugin.getWorkspace().getRoot()
.getProject(projectName);
@@ -526,21 +508,21 @@
// see https://jira.jboss.org/browse/JBIDE-6587
@Test
public void testMavenWarArchive() throws Exception {
- final SWTBotView packageExplorer = bot.viewByTitle(PACKAGE_EXPLORER);
+ final SWTBotView packageExplorer = bot.viewByTitle("Package Explorer");
SWTBot innerBot = packageExplorer.bot();
innerBot.activeShell().activate();
- final SWTBotTree tree = innerBot.tree();
+ SWTBotTree tree = innerBot.tree();
final SWTBotTreeItem warProjectItem = tree.getTreeItem(PROJECT_NAME_WAR);
warProjectItem.select();
SWTBotMenu runAs = tree.contextMenu("Run As");
runAs.menu("5 Maven build...").click();
-
+ waitForIdle();
SWTBotShell shell = bot.shell("Edit Configuration");
shell.activate();
-
- bot.textWithLabel("Goals:").setText("clean package");
- bot.button("Run").click();
+ SWTBot b = shell.bot();
+ b.textWithLabel("Goals:").setText("clean package");
+ b.button("Run").click();
waitForIdle();
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME_WAR);
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java 2011-11-28 03:54:34 UTC (rev 36682)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java 2011-11-28 08:11:32 UTC (rev 36683)
@@ -20,9 +20,10 @@
*/
@Suite.SuiteClasses({
- //MavenProfileSelectionTest.class, FIXME enable tests for profiles
- JBossPerspectiveTest.class,
+ MavenProfileSelectionTest.class,
CreateMavenizedSeamProjectTest.class,
+ CreateMavenizedJSFProjectTest.class,
+ CreateMavenProjectsTest.class
})
@RunWith(Suite.class)
public class MavenAllBotTests {
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenProfileSelectionTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenProfileSelectionTest.java 2011-11-28 03:54:34 UTC (rev 36682)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenProfileSelectionTest.java 2011-11-28 08:11:32 UTC (rev 36683)
@@ -1,17 +1,10 @@
-/*************************************************************************************
- * Copyright (c) 2008-2011 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * JBoss by Red Hat - Initial implementation.
- ************************************************************************************/
package org.jboss.tools.maven.ui.bot.test;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.bindings.keys.KeyStroke;
+import org.eclipse.jface.bindings.keys.ParseException;
+import org.eclipse.m2e.core.MavenPlugin;
+import org.eclipse.m2e.core.project.IMavenProjectFacade;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
@@ -26,31 +19,70 @@
@RunWith(SWTBotJunit4ClassRunner.class)
public class MavenProfileSelectionTest extends AbstractMavenSWTBotTest {
+ public static final String AUTOACTIVATED_PROFILE_IN_POM = "active-profile";
+ public static final String AUTOACTIVATED_PROFILE_IN_USER_SETTINGS = "environment";
+
+
+
@Test
- //FIXME Test fail due to Modal Dialog. Need to find a solution
public void testOpenMavenProfiles() throws Exception {
-
IProject project = importProject("projects/simple-jar/pom.xml");
waitForJobsToComplete();
//Select the project
- final SWTBotView packageExplorer = bot.viewByTitle(PACKAGE_EXPLORER);
+ testAutoActivatedProfiles();
+ final SWTBotView packageExplorer = bot.viewByTitle("Project Explorer");
SWTBot innerBot = packageExplorer.bot();
innerBot.activeShell().activate();
- final SWTBotTree tree = innerBot.tree();
- final SWTBotTreeItem projectItem = tree.getTreeItem(project.getName());
+ SWTBotTree tree = innerBot.tree();
+ SWTBotTreeItem projectItem = tree.getTreeItem(project.getName());
projectItem.select();
- //Open the profiles dialog
- projectItem.pressShortcut(Keystrokes.CTRL, Keystrokes.ALT, KeyStroke.getInstance("P"));
-
- //FIXME Either the dialog doesn't open abd the test fails
- //or SWTBot is blocked by the modal dialog
+ openProfilesDialog(projectItem);
+ Thread.sleep(2000);
+ //activate all profiles
+ SWTBot shell = bot.shell("Select Maven profiles").activate().bot();
+ shell.button("Select All").click();
+ String selectedProfiles = shell.textWithLabel("Active profiles for simple-jar :").getText();
+ shell.button("OK").click();
+
+ testActivatedProfiles(project.getName(), selectedProfiles);
+ Thread.sleep(1000);
+ openProfilesDialog(projectItem);
+
+ //disable all profiles
+ shell = bot.shell("Select Maven profiles").activate().bot();
+ shell.button("Deselect all").click();
+ selectedProfiles = bot.textWithLabel("Active profiles for simple-jar :").getText();
+ bot.button("OK").click();
+
+ testActivatedProfiles(project.getName(), selectedProfiles);
+ }
+
+ private void openProfilesDialog(SWTBotTreeItem projectItem) throws ParseException, InterruptedException{
+ projectItem.pressShortcut(Keystrokes.CTRL, Keystrokes.ALT,KeyStroke.getInstance("P"));
+ projectItem.pressShortcut(Keystrokes.DOWN);
+ projectItem.pressShortcut(Keystrokes.LF);
final SWTBotShell selectDialogShell = bot.shell("Select Maven profiles");
- assertNotNull("selectDialogShell not found", selectDialogShell);
assertEquals("Select Maven profiles", selectDialogShell.getText());
+ Thread.sleep(1000);
+ }
+
+ private void testActivatedProfiles(String projectName, String profilesToCheck){
+
+ SWTBot explorer = bot.viewByTitle("Project Explorer").bot();
+ SWTBotTreeItem item = explorer.tree().getTreeItem(projectName).select();
+ item.pressShortcut(Keystrokes.ALT,Keystrokes.LF);
+ SWTBot shell = bot.shell("Properties for "+projectName).activate().bot();
+ shell.tree().select("Maven");
+ assertEquals("Selected profiles doesn't match", shell.textWithLabel("Active Maven Profiles (comma separated):").getText(),profilesToCheck);
+ shell.button("OK").click();
- selectDialogShell.activate();
- Thread.sleep(5000);
- //TODO implement real tests
- bot.button("Cancel").click();
}
+
+ private void testAutoActivatedProfiles(){
+ IMavenProjectFacade facade = MavenPlugin.getMavenProjectRegistry().getMavenProject("org.jboss.tools.maven.tests", "simple-jar", "1.0.0-SNAPSHOT");
+ assertNotNull("facade is null",facade);
+ facade.getMavenProject().getActiveProfiles().get(0);
+ assertEquals("Auto Activated profiles from pom.xml doesn't match", AUTOACTIVATED_PROFILE_IN_POM, facade.getMavenProject().getActiveProfiles().get(0).getId());
+ assertEquals("Auto Activated profiles from settings.xml doesn't match", AUTOACTIVATED_PROFILE_IN_USER_SETTINGS, facade.getMavenProject().getActiveProfiles().get(1).getId());
+ }
}
13 years, 1 month
JBoss Tools SVN: r36682 - trunk/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-11-27 22:54:34 -0500 (Sun, 27 Nov 2011)
New Revision: 36682
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
Log:
updated for JBDS-1634
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2011-11-27 23:48:59 UTC (rev 36681)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2011-11-28 03:54:34 UTC (rev 36682)
@@ -27,8 +27,71 @@
</para>
</listitem>
</itemizedlist>
+ <para>
+ JBoss Developer Studio 5 is supported on the following operating systems:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Red Hat Enterprise Linux 6
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Windows XP
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Windows 7
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Mac OS X 10.6
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Max OS X 10.7
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Fedora 15
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Fedora 16
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Ubuntu 10.4-LTS
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Ubuntu 11.04
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Ubuntu 11.10
+ </para>
+ </listitem>
+ </itemizedlist>
<important>
<para>
+ For Linux distributions, a Gnome interface is expected.
+ </para>
+ </important>
+ <para>
+ JBoss Developer Studio 5 requires Java Development Kit (JDK) 1.6.
+ </para>
+<!-- <important>
+ <para>
If you are installing on a Linux distribution you must set the following limits in <filename>/etc/security/limits.conf</filename> upon installation completion and before running JBoss Developer Studio:
</para>
<programlisting>
@@ -44,5 +107,5 @@
<para>
For further installation instructions see the Getting Started Guide for this release, available at: <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/index.html">http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/index.html</ulink>
</para>
- </important>
+ </important> -->
</section>
13 years, 1 month