JBoss Tools SVN: r40487 - in trunk/forge/plugins/org.jboss.tools.forge.runtime: .settings and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-04-25 08:45:00 -0400 (Wed, 25 Apr 2012)
New Revision: 40487
Added:
trunk/forge/plugins/org.jboss.tools.forge.runtime/.settings/org.eclipse.m2e.core.prefs
Removed:
trunk/forge/plugins/org.jboss.tools.forge.runtime/LICENSE.txt
trunk/forge/plugins/org.jboss.tools.forge.runtime/README.txt
trunk/forge/plugins/org.jboss.tools.forge.runtime/bin/
trunk/forge/plugins/org.jboss.tools.forge.runtime/copyright.txt
trunk/forge/plugins/org.jboss.tools.forge.runtime/jboss-modules.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/
Modified:
trunk/forge/plugins/org.jboss.tools.forge.runtime/
trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath
trunk/forge/plugins/org.jboss.tools.forge.runtime/.project
trunk/forge/plugins/org.jboss.tools.forge.runtime/.settings/org.eclipse.jdt.core.prefs
trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF
trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties
trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml
Log:
JBIDE-10871: should forge component include so many jars in SVN?
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime
___________________________________________________________________
Modified: svn:ignore
- target
+ target
forge-distribution-*
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath 2012-04-25 12:34:23 UTC (rev 40486)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath 2012-04-25 12:45:00 UTC (rev 40487)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="modules/org/jboss/forge/shell/api/main/forge-shell-api-1.0.2.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="modules/javax/enterprise/api/main/cdi-api-1.0-SP4.jar"/>
- <classpathentry exported="true" kind="lib" path="modules/javax/inject/api/main/javax.inject-1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry exported="true" kind="lib" path="forge-distribution-1.0.3.Final/modules/javax/inject/api/main/javax.inject-1.jar"/>
+ <classpathentry exported="true" kind="lib" path="forge-distribution-1.0.3.Final/modules/javax/enterprise/api/main/cdi-api-1.0-SP4.jar"/>
+ <classpathentry exported="true" kind="lib" path="forge-distribution-1.0.3.Final/modules/org/jboss/forge/shell/api/main/forge-shell-api-1.0.3.Final.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/.project
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/.project 2012-04-25 12:34:23 UTC (rev 40486)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/.project 2012-04-25 12:45:00 UTC (rev 40487)
@@ -20,8 +20,14 @@
<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>
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/.settings/org.eclipse.jdt.core.prefs 2012-04-25 12:34:23 UTC (rev 40486)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/.settings/org.eclipse.jdt.core.prefs 2012-04-25 12:45:00 UTC (rev 40487)
@@ -1,4 +1,3 @@
-#Tue May 31 12:27:07 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
Added: trunk/forge/plugins/org.jboss.tools.forge.runtime/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/.settings/org.eclipse.m2e.core.prefs (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/.settings/org.eclipse.m2e.core.prefs 2012-04-25 12:45:00 UTC (rev 40487)
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/.settings/org.eclipse.m2e.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/LICENSE.txt
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/LICENSE.txt 2012-04-25 12:34:23 UTC (rev 40486)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/LICENSE.txt 2012-04-25 12:45:00 UTC (rev 40487)
@@ -1,189 +0,0 @@
-JBoss, Home of Professional Open Source.
-Copyright (c) 2011, Red Hat, Inc., and individual contributors
-as indicated by the @author tags. See the copyright.txt file in the
-distribution for a full listing of individual contributors.
-
-This is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of
-the License, or (at your option) any later version.
-
-This software is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this software; if not, write to the Free
-Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
-Note that some thirdparty components have different terms which are
-located in the docs/licenses directory.
-
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF 2012-04-25 12:34:23 UTC (rev 40486)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF 2012-04-25 12:45:00 UTC (rev 40487)
@@ -16,7 +16,7 @@
org.jboss.forge.shell.command,
org.jboss.forge.shell.events,
org.jboss.forge.shell.spi
-Bundle-ClassPath: modules/javax/inject/api/main/javax.inject-1.jar,
- modules/javax/enterprise/api/main/cdi-api-1.0-SP4.jar,
- modules/org/jboss/forge/shell/api/main/forge-shell-api-1.0.2.Final.jar
+Bundle-ClassPath: forge-distribution-1.0.3.Final/modules/javax/inject/api/main/javax.inject-1.jar,
+ forge-distribution-1.0.3.Final/modules/javax/enterprise/api/main/cdi-api-1.0-SP4.jar,
+ forge-distribution-1.0.3.Final/modules/org/jboss/forge/shell/api/main/forge-shell-api-1.0.3.Final.jar
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/README.txt
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/README.txt 2012-04-25 12:34:23 UTC (rev 40486)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/README.txt 2012-04-25 12:45:00 UTC (rev 40487)
@@ -1,11 +0,0 @@
- _____
- | ___|__ _ __ __ _ ___
- | |_ / _ \| `__/ _` |/ _ \ \\
- | _| (_) | | | (_| | __/ //
- |_| \___/|_| \__, |\___|
- |___/
-
-Welcome to JBoss Forge
-http://jboss.org/forge
-
-Go to above link for Documentations, Plugins, and Additional Information
\ No newline at end of file
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties 2012-04-25 12:34:23 UTC (rev 40486)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties 2012-04-25 12:45:00 UTC (rev 40487)
@@ -1,7 +1,5 @@
bin.includes = META-INF/,\
- modules/,\
- jboss-modules.jar,\
- plugin.properties
+ forge-distribution-1.0.3.Final/
src.includes = *
-jars.compile.order = .
-source.. =
+jars.compile.order = .
+
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/copyright.txt
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/copyright.txt 2012-04-25 12:34:23 UTC (rev 40486)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/copyright.txt 2012-04-25 12:45:00 UTC (rev 40487)
@@ -1 +0,0 @@
-Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
\ No newline at end of file
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/jboss-modules.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml 2012-04-25 12:34:23 UTC (rev 40486)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml 2012-04-25 12:45:00 UTC (rev 40487)
@@ -10,4 +10,42 @@
<artifactId>org.jboss.tools.forge.runtime</artifactId>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>get-runtime</id>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.forge</groupId>
+ <artifactId>forge-distribution</artifactId>
+ <version>1.0.3.Final</version>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${basedir}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <repositories>
+ <repository>
+ <id>jboss-nexus</id>
+ <name>JBoss Maven repository</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+ </repository>
+ </repositories>
</project>
13 years, 8 months
JBoss Tools SVN: r40486 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-04-25 08:34:23 -0400 (Wed, 25 Apr 2012)
New Revision: 40486
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java
Log:
JBIDE-11649 - The text filter on the main project example page doesn't work
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java 2012-04-25 11:57:03 UTC (rev 40485)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java 2012-04-25 12:34:23 UTC (rev 40486)
@@ -31,7 +31,6 @@
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
@@ -140,10 +139,13 @@
viewer.setLabelProvider(new ProjectLabelProvider());
viewer.setContentProvider(new ProjectContentProvider());
+
final SiteFilter siteFilter = new SiteFilter();
final RuntimeTypeFilter serverFilter = new RuntimeTypeFilter();
- viewer.setFilters(new ViewerFilter[]{siteFilter, serverFilter});
+ viewer.addFilter(siteFilter);
+ viewer.addFilter(serverFilter);
+
Label descriptionLabel = new Label(composite,SWT.NONE);
descriptionLabel.setText(Messages.NewProjectExamplesWizardPage_Description);
descriptionText = new Text(composite,SWT.H_SCROLL | SWT.V_SCROLL
13 years, 8 months
JBoss Tools SVN: r40485 - trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-04-25 07:57:03 -0400 (Wed, 25 Apr 2012)
New Revision: 40485
Modified:
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml
Log:
fix pom.xml for freemarker
Modified: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml 2012-04-25 11:53:03 UTC (rev 40484)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml 2012-04-25 11:57:03 UTC (rev 40485)
@@ -1,58 +1,59 @@
<?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>
+<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.freemarker</groupId>
<artifactId>tests</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.freemarker.tests</groupId>
- <artifactId>org.jboss.tools.freemarker.ui.bot.test</artifactId>
+ <artifactId>org.jboss.tools.freemarker.ui.bot.test</artifactId>
<version>1.0.0-SNAPSHOT</version>
-
+
<packaging>eclipse-test-plugin</packaging>
-
+
<build>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>0.14.1</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
-
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>0.14.1</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <ignoreTychoRepositories>true</ignoreTychoRepositories>
+ <environments>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIThread>false</useUIThread>
@@ -79,18 +80,18 @@
<type>p2-installable-unit</type>
<artifactId>org.eclipse.platform.feature.group</artifactId>
<version>0.0.0</version>
- </dependency>
+ </dependency>
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.rcp.feature.group</artifactId>
<version>0.0.0</version>
</dependency>
- <dependency>
+ <dependency>
<type>p2-installable-unit</type>
<artifactId>org.jboss.ide.eclipse.freemarker.feature.feature.group</artifactId>
<version>0.0.0</version>
</dependency>
- <dependency>
+ <dependency>
<type>p2-installable-unit</type>
<artifactId>org.jboss.ide.eclipse.freemarker.feature.feature.jar</artifactId>
<version>0.0.0</version>
13 years, 8 months
JBoss Tools SVN: r40484 - trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-04-25 07:53:03 -0400 (Wed, 25 Apr 2012)
New Revision: 40484
Modified:
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml
Log:
Extended env for w32_64 for freemarker pom added
Modified: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml 2012-04-25 11:49:31 UTC (rev 40483)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml 2012-04-25 11:53:03 UTC (rev 40484)
@@ -13,6 +13,43 @@
<packaging>eclipse-test-plugin</packaging>
<build>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>0.14.1</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <ignoreTychoRepositories>true</ignoreTychoRepositories>
+ <environments>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
13 years, 8 months
JBoss Tools SVN: r40483 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-04-25 07:49:31 -0400 (Wed, 25 Apr 2012)
New Revision: 40483
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java
Log:
fixed databinding error, renamed instance variables, properties and labels domain namespace -> domain id
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2012-04-25 11:43:57 UTC (rev 40482)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2012-04-25 11:49:31 UTC (rev 40483)
@@ -47,10 +47,10 @@
result[0] = true;
} catch (OpenShiftEndpointException e) {
return OpenShiftUIActivator.createErrorStatus(NLS.bind(
- "Could not create domain \"{0}\": {1}", model.getNamespace(), e.getRestResponseMessages()), e);
+ "Could not create domain \"{0}\": {1}", model.getDomainId(), e.getRestResponseMessages()), e);
} catch (Exception e) {
return OpenShiftUIActivator.createErrorStatus(NLS.bind(
- "Could not create domain \"{0}\"", model.getNamespace()), e);
+ "Could not create domain \"{0}\"", model.getDomainId()), e);
}
return Status.OK_STATUS;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2012-04-25 11:43:57 UTC (rev 40482)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2012-04-25 11:49:31 UTC (rev 40483)
@@ -90,7 +90,7 @@
ControlDecorationSupport.create(namespaceValidator, SWT.LEFT | SWT.TOP, null,
new CustomControlDecorationUpdater());
final IObservableValue namespaceModelObservable = BeanProperties.value(
- EditDomainWizardPageModel.PROPERTY_DOMAIN_ID).observe(pageModel);
+ NewDomainWizardPageModel.PROPERTY_DOMAIN_ID).observe(pageModel);
ValueBindingBuilder.bind(namespaceTextObservable).to(namespaceModelObservable).in(dbc);
/*DataBindingUtils.bindMandatoryTextField(
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2012-04-25 11:43:57 UTC (rev 40482)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2012-04-25 11:49:31 UTC (rev 40483)
@@ -35,10 +35,10 @@
public static final String LIBRA_KEY = "libra_id_rsa";
private static final String PUBLIC_KEY_SUFFIX = ".pub";
- public static final String PROPERTY_NAMESPACE = "namespace";
+ public static final String PROPERTY_DOMAIN_ID = "domainId";
public static final String PROPERTY_SSHKEY = "sshKey";
- private String namespace;
+ private String domainId;
private IDomain domain;
private String sshKey;
private UserDelegate user;
@@ -94,12 +94,12 @@
return ssh2Home;
}
- public String getNamespace() {
- return this.namespace;
+ public String getDomainId() {
+ return this.domainId;
}
public void createDomain() throws OpenShiftException, IOException {
- IDomain domain = user.createDomain(namespace);
+ IDomain domain = user.createDomain(domainId);
}
public String getSshKey() {
@@ -176,8 +176,8 @@
return new SSHPublicKey(new File(sshKey));
}
- public void setNamespace(String namespace) {
- firePropertyChange(PROPERTY_NAMESPACE, this.namespace, this.namespace = namespace);
+ public void setDomainId(String domainId) {
+ firePropertyChange(PROPERTY_DOMAIN_ID, this.domainId, this.domainId = domainId);
}
public boolean hasDomain() {
13 years, 8 months
JBoss Tools SVN: r40482 - trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-04-25 07:43:57 -0400 (Wed, 25 Apr 2012)
New Revision: 40482
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
Log:
Fix mistyping error in method name of method testCodeCompletionOfSrcAttribute()
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2012-04-25 11:05:30 UTC (rev 40481)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2012-04-25 11:43:57 UTC (rev 40482)
@@ -338,7 +338,7 @@
/**
* Test Code Completion functionality of src attribute for tags <link>, <h:link> and <a:loadStyle>
*/
- public void testCodeCompletionOfSrcAttriubute(){
+ public void testCodeCompletionOfSrcAttribute(){
initJSF2PageTest();
addRichFacesToJSF2ProjectClassPath();
SWTJBTExt.selectTextInSourcePane(SWTTestExt.bot,
13 years, 8 months
JBoss Tools SVN: r40481 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-04-25 07:05:30 -0400 (Wed, 25 Apr 2012)
New Revision: 40481
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorSite.java
Log:
https://issues.jboss.org/browse/JBIDE-11578 -- IDisposable was removed to fix compilation error in Juno.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorSite.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorSite.java 2012-04-25 10:59:18 UTC (rev 40480)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorSite.java 2012-04-25 11:05:30 UTC (rev 40481)
@@ -33,18 +33,13 @@
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.commands.ICommandService;
-import org.eclipse.ui.handlers.HandlerUtil;
import org.eclipse.ui.internal.KeyBindingService;
-import org.eclipse.ui.internal.PartSite;
import org.eclipse.ui.internal.PopupMenuExtender;
import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.handlers.HandlerProxy;
import org.eclipse.ui.internal.services.IServiceLocatorCreator;
import org.eclipse.ui.internal.services.IWorkbenchLocationService;
import org.eclipse.ui.internal.services.ServiceLocator;
import org.eclipse.ui.internal.services.WorkbenchLocationService;
-import org.eclipse.ui.services.IDisposable;
import org.eclipse.ui.services.IServiceScopes;
/**
@@ -75,19 +70,14 @@
this.fEditor = multiPageEditor;
this.fEditorPart = editor;
+ /*
+ * https://issues.jboss.org/browse/JBIDE-11578
+ * IDisposable was removed to fix compilation error in Juno.
+ */
this.serviceLocator = (ServiceLocator) ((IServiceLocatorCreator) multiPageEditor
.getSite().getService(IServiceLocatorCreator.class))
- .createServiceLocator(multiPageEditor.getSite(), null,
- new IDisposable() {
- public void dispose() {
- final Control control = ((PartSite) getMultiPageEditor()
- .getSite()).getPane().getControl();
- if (control != null && !control.isDisposed()) {
- ((PartSite) getMultiPageEditor().getSite())
- .getPane().doHide();
- }
- }
- });
+ .createServiceLocator(multiPageEditor.getSite(), null, null);
+
serviceLocator.registerService(IWorkbenchLocationService.class,
new WorkbenchLocationService(IServiceScopes.MPESITE_SCOPE,
getWorkbenchWindow().getWorkbench(),
@@ -119,7 +109,6 @@
getSelectionProvider().removeSelectionChangedListener(fSelChangeListener);
fSelChangeListener = null;
}
-
if (serviceLocator != null) {
serviceLocator.dispose();
}
13 years, 8 months
JBoss Tools SVN: r40480 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-04-25 06:59:18 -0400 (Wed, 25 Apr 2012)
New Revision: 40480
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/AbstractRefreshJob.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshBlogsJob.java
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshNewsJob.java
Log:
JBIDE-11192 - Offline Support
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/AbstractRefreshJob.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/AbstractRefreshJob.java 2012-04-25 10:59:03 UTC (rev 40479)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/AbstractRefreshJob.java 2012-04-25 10:59:18 UTC (rev 40480)
@@ -63,6 +63,8 @@
}
public abstract File getCacheFile();
+
+ public abstract File getValidCacheFile();
protected void getEntries(File file) throws IOException,
IllegalArgumentException, FeedException {
@@ -185,36 +187,14 @@
cacheFile.getName(), urlString, destination, monitor);
URL url = getURL();
if (monitor.isCanceled()) {
- return Status.CANCEL_STATUS;
+ return getValidEntries(monitor);
}
if (status.isOK() && url != null) {
- cacheModified = ECFExamplesTransport.getInstance()
- .getLastModified(url);
- InputStream in = null;
- OutputStream out = null;
- try {
- in = new FileInputStream(tempFile);
- out = new FileOutputStream(cacheFile);
- ProjectExamplesActivator.copy(in, out);
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (Exception e) {
- // ignore
- }
- }
- if (out != null) {
- try {
- out.close();
- } catch (Exception e) {
- // ignore
- }
- }
- }
+ cacheModified = ECFExamplesTransport.getInstance().getLastModified(url);
+ ProjectExamplesActivator.copyFile(tempFile, cacheFile);
tempFile.delete();
if (monitor.isCanceled()) {
- return Status.CANCEL_STATUS;
+ return getValidEntries(monitor);
}
cacheFile.setLastModified(cacheModified);
getEntries(cacheFile);
@@ -222,13 +202,47 @@
setException(status.getException());
}
} catch (Exception e) {
+ return getValidEntries(monitor);
+ }
+ }
+ if (monitor.isCanceled()) {
+ return getValidEntries(monitor);
+ }
+ if (getEntries().size() > 0) {
+ try {
+ File validCacheFile = getValidCacheFile();
+ if (!validCacheFile.isFile() || cacheFile.lastModified() != validCacheFile.lastModified()) {
+ ProjectExamplesActivator.copyFile(cacheFile, getValidCacheFile());
+ validCacheFile.setLastModified(cacheFile.lastModified());
+ }
+ } catch (Exception e) {
exception = e;
+ return getValidEntries(monitor);
+ }
+ } else {
+ return getValidEntries(monitor);
+ }
+ return Status.OK_STATUS;
+ }
+
+ protected IStatus getValidEntries(IProgressMonitor monitor) {
+ File file = getValidCacheFile();
+ if (file.isFile()) {
+ try {
+ getEntries(file);
+ } catch (Exception e) {
+ exception = e;
return Status.CANCEL_STATUS;
}
}
+ if (monitor.isCanceled()) {
+ return Status.CANCEL_STATUS;
+ }
return Status.OK_STATUS;
}
+
+
private long getUrlModified() {
URL url = getURL();
if (exception != null) {
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshBlogsJob.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshBlogsJob.java 2012-04-25 10:59:03 UTC (rev 40479)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshBlogsJob.java 2012-04-25 10:59:18 UTC (rev 40480)
@@ -24,6 +24,7 @@
public class RefreshBlogsJob extends AbstractRefreshJob {
private static final String CACHE_FILE = "blogs.xml";
+ private static final String VALID_CACHE_FILE = "valid_blogs.xml";
public static RefreshBlogsJob INSTANCE = new RefreshBlogsJob();
private RefreshBlogsJob() {
@@ -32,8 +33,17 @@
@Override
public File getCacheFile() {
+ return getFile(CACHE_FILE);
+ }
+
+ protected File getFile(String name) {
IPath location = JBossCentralActivator.getDefault().getStateLocation();
- File file = new File(location.toFile(), CACHE_FILE);
+ File file = new File(location.toFile(), name);
return file;
}
+
+ @Override
+ public File getValidCacheFile() {
+ return getFile(VALID_CACHE_FILE);
+ }
}
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshNewsJob.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshNewsJob.java 2012-04-25 10:59:03 UTC (rev 40479)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/jobs/RefreshNewsJob.java 2012-04-25 10:59:18 UTC (rev 40480)
@@ -24,6 +24,8 @@
public class RefreshNewsJob extends AbstractRefreshJob {
private static final String CACHE_FILE = "news.xml";
+ private static final String VALID_CACHE_FILE = "valid_news.xml";
+
public static RefreshNewsJob INSTANCE = new RefreshNewsJob();
@@ -33,8 +35,17 @@
@Override
public File getCacheFile() {
+ return getFile(CACHE_FILE);
+ }
+
+ protected File getFile(String name) {
IPath location = JBossCentralActivator.getDefault().getStateLocation();
- File file = new File(location.toFile(), CACHE_FILE);
+ File file = new File(location.toFile(), name);
return file;
}
+
+ @Override
+ public File getValidCacheFile() {
+ return getFile(VALID_CACHE_FILE);
+ }
}
13 years, 8 months
JBoss Tools SVN: r40479 - 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: 2012-04-25 06:59:03 -0400 (Wed, 25 Apr 2012)
New Revision: 40479
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/ImportProjectExample.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/model/ProjectExampleUtil.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java
trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectTest.java
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExampleDelegate.java
Log:
JBIDE-11192 - Offline Support
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 2012-04-25 09:35:42 UTC (rev 40478)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-04-25 10:59:03 UTC (rev 40479)
@@ -11,6 +11,8 @@
package org.jboss.tools.project.examples;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -108,6 +110,7 @@
import org.jboss.tools.project.examples.configurators.DefaultJBossCentralConfigurator;
import org.jboss.tools.project.examples.configurators.IJBossCentralConfigurator;
import org.jboss.tools.project.examples.dialog.MarkerDialog;
+import org.jboss.tools.project.examples.filetransfer.ECFExamplesTransport;
import org.jboss.tools.project.examples.fixes.PluginFix;
import org.jboss.tools.project.examples.fixes.ProjectExamplesFix;
import org.jboss.tools.project.examples.fixes.SeamRuntimeFix;
@@ -130,6 +133,8 @@
*/
public class ProjectExamplesActivator extends AbstractUIPlugin {
+ private static final String SEPARATOR = "/";
+
private static final int DESCRIPTION_LENGTH = 100;
public static final String PROPERTY_PROJECT_NAME = "projectName"; //$NON-NLS-1$
@@ -441,7 +446,7 @@
return false;
}
File file = ProjectExampleUtil.getProjectExamplesFile(url, name,
- ".zip", monitor); //$NON-NLS-1$
+ ".zip", monitor); //$NON-NLS-1$
if (file == null) {
return false;
}
@@ -450,6 +455,31 @@
return true;
}
+ public static void copyFile(File inputFile, File outputFile)
+ throws FileNotFoundException, IOException {
+ InputStream in = null;
+ OutputStream out = null;
+ try {
+ in = new FileInputStream(inputFile);
+ out = new FileOutputStream(outputFile);
+ copy(in, out);
+ } finally {
+ if (in != null) {
+ try {
+ in.close();
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+ if (out != null) {
+ try {
+ out.close();
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+ }
+ }
public static void openWelcome(List<ProjectExample> projects) {
if (projects == null) {
return;
@@ -460,7 +490,7 @@
String urlString = project.getWelcomeURL();
urlString = replace(urlString, project);
URL url = null;
- if (urlString.startsWith("/")) { //$NON-NLS-1$
+ if (urlString.startsWith(SEPARATOR)) { //$NON-NLS-1$
IPath path = new Path(urlString);
IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
if (resource instanceof IFile && resource.isAccessible()) {
@@ -977,7 +1007,7 @@
List<IMarker> markers = getMarkers(projects);
if (markers != null && markers.size() > 0) {
- Display.getCurrent().asyncExec(new Runnable() {
+ Display.getDefault().asyncExec(new Runnable() {
@Override
public void run() {
@@ -1066,7 +1096,7 @@
}
private String getImageId(ImageDescriptor imageDescriptor) {
- return PLUGIN_ID + "/" + imageDescriptor.hashCode(); //$NON-NLS-1$
+ return PLUGIN_ID + SEPARATOR + imageDescriptor.hashCode(); //$NON-NLS-1$
}
public Image getImage(String imagePath) {
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java 2012-04-25 09:35:42 UTC (rev 40478)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java 2012-04-25 10:59:03 UTC (rev 40479)
@@ -726,11 +726,11 @@
return file;
}
- private static File getFile(java.net.URL url2) {
+ private static File getFile(URL url) {
IPath location = ProjectExamplesActivator.getDefault()
.getStateLocation();
File root = location.toFile();
- String urlFile = url2.getFile();
+ String urlFile = url.getFile();
File file = new File(root, urlFile);
return file;
}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java 2012-04-25 09:35:42 UTC (rev 40478)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard2.java 2012-04-25 10:59:03 UTC (rev 40479)
@@ -26,6 +26,7 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.INewWizard;
@@ -199,6 +200,10 @@
private IStructuredSelection getSelection() {
if (fSelection == null) {
+ if (getActivePart() == null || getActivePart().getSite() == null
+ || getActivePart().getSite().getSelectionProvider() == null) {
+ return new StructuredSelection();
+ }
ISelection sel = getActivePart().getSite().getSelectionProvider()
.getSelection();
if (sel instanceof IStructuredSelection) {
Modified: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/ImportProjectExample.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/ImportProjectExample.java 2012-04-25 09:35:42 UTC (rev 40478)
+++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/src/org/jboss/tools/project/examples/cheatsheet/actions/ImportProjectExample.java 2012-04-25 10:59:03 UTC (rev 40479)
@@ -79,25 +79,12 @@
@Override
public IStatus runInWorkspace(IProgressMonitor monitor)
throws CoreException {
- String urlString = project.getUrl();
- String name = project.getName();
- URL url = null;
- try {
- url = new URL(urlString);
- } catch (MalformedURLException e) {
- ProjectExamplesActivator.log(e);
- return Status.CANCEL_STATUS;
- }
- final File file = ProjectExampleUtil.getProjectExamplesFile(
- url, name, ".zip", monitor); //$NON-NLS-1$
- if (file == null) {
- return Status.CANCEL_STATUS;
- }
+ ProjectExamplesActivator.downloadProject(project, monitor);
setName(Messages.NewProjectExamplesWizard_Importing);
try {
IImportProjectExample importProjectExample = ProjectExamplesActivator.getDefault().getImportProjectExample(project.getImportType());
- if (importProjectExample.importProject(project, file, new HashMap<String, Object>(), monitor)) {
+ if (importProjectExample.importProject(project, project.getFile(), new HashMap<String, Object>(), monitor)) {
importProjectExample.fix(project, monitor);
}
} catch (Exception e) {
Modified: trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectTest.java
===================================================================
--- trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectTest.java 2012-04-25 09:35:42 UTC (rev 40478)
+++ trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectTest.java 2012-04-25 10:59:03 UTC (rev 40479)
@@ -160,15 +160,10 @@
}
}
assertNotNull(projectExample);
- String urlString = projectExample.getUrl();
- String name = projectExample.getName();
- URL url = null;
- url = new URL(urlString);
- File file = ProjectExampleUtil.getProjectExamplesFile(
- url, name, ".zip", monitor); //$NON-NLS-1$
- assertNotNull(file);
+ ProjectExamplesActivator.downloadProject(projectExample, new NullProgressMonitor());
+ assertNotNull(projectExample.getFile());
IImportProjectExample importProjectExample = ProjectExamplesActivator.getDefault().getImportProjectExample(projectExample.getImportType());
- if (importProjectExample.importProject(projectExample, file, null, monitor)) {
+ if (importProjectExample.importProject(projectExample, projectExample.getFile(), null, monitor)) {
importProjectExample.fix(projectExample, monitor);
}
}
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExampleDelegate.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExampleDelegate.java 2012-04-25 09:35:42 UTC (rev 40478)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/ImportMavenProjectExampleDelegate.java 2012-04-25 10:59:03 UTC (rev 40479)
@@ -298,7 +298,8 @@
for (IProject project:projects) {
if (project != null && project.exists()) {
File projectFile = project.getLocation().toFile();
- if (projectFile.getAbsolutePath().startsWith(destination.getAbsolutePath())) {
+ File projectParent = projectFile.getParentFile();
+ if (projectParent.equals(destination)) {
existingProjects.add(project);
}
}
13 years, 8 months
JBoss Tools SVN: r40478 - trunk/requirements/riftsaw-2.3.0.Final.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-04-25 05:35:42 -0400 (Wed, 25 Apr 2012)
New Revision: 40478
Modified:
trunk/requirements/riftsaw-2.3.0.Final/build.properties
Log:
Revert changes made accidentally by previous commit.
Modified: trunk/requirements/riftsaw-2.3.0.Final/build.properties
===================================================================
--- trunk/requirements/riftsaw-2.3.0.Final/build.properties 2012-04-25 09:15:27 UTC (rev 40477)
+++ trunk/requirements/riftsaw-2.3.0.Final/build.properties 2012-04-25 09:35:42 UTC (rev 40478)
@@ -1,7 +1,5 @@
-richfaces.build.uri=http://downloads.jboss.org/richfaces/releases/4.2.X/4.2.1.Final
-build.uri=${richfaces.build.uri}
-build.archive.root=richfaces-4.2.1.Final
+riftsaw.build.uri=http://downloads.jboss.org/riftsaw/releases/2.3.0.Final
+build.uri=${riftsaw.build.uri}
+build.archive.root=riftsaw-2.3.0.Final
build.archive=${build.archive.root}.zip
-md5=2936b4b9e8b631b90ee0518a30875cac
-
-
+md5=d57290b01d25ec0d15e143c6053d0878
13 years, 8 months