JBoss Tools SVN: r39919 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2012-03-29 12:16:49 -0400 (Thu, 29 Mar 2012)
New Revision: 39919
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/openshift-logo-white-icon.png
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/openshift-logo-white-medium.png
Log:
switch to new OpenShift logo https://issues.jboss.org/browse/JBIDE-11380
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/openshift-logo-white-icon.png
===================================================================
(Binary files differ)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/openshift-logo-white-medium.png
===================================================================
(Binary files differ)
12 years, 9 months
JBoss Tools SVN: r39918 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-03-29 11:58:59 -0400 (Thu, 29 Mar 2012)
New Revision: 39918
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties
Log:
removed erroneous entry in build.properties
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties 2012-03-29 13:21:33 UTC (rev 39917)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties 2012-03-29 15:58:59 UTC (rev 39918)
@@ -3,4 +3,3 @@
bin.includes = META-INF/,\
.,\
openshift-java-client-1.2.0-SNAPSHOT.jar
-src.includes = openshift-java-client-1.1.1-SNAPSHOT.jar
12 years, 9 months
JBoss Tools SVN: r39917 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6 and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2012-03-29 09:21:33 -0400 (Thu, 29 Mar 2012)
New Revision: 39917
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HibernateExtension3_6.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java
Log:
https://issues.jboss.org/browse/JBIDE-11146
Always rebuild class loader to get newest class versions
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2012-03-29 13:21:18 UTC (rev 39916)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2012-03-29 13:21:33 UTC (rev 39917)
@@ -143,27 +143,11 @@
* Create class loader - so it uses the original urls list from preferences.
*/
protected void reinitClassLoader() {
- boolean recreateFlag = true;
+ //the class loader caches user's compiled classes
+ //need to rebuild it on every console configuration rebuild to pick up latest versions.
final URL[] customClassPathURLs = PreferencesClassPathUtils.getCustomClassPathURLs(prefs);
- if (classLoader != null) {
- // check -> do not recreate class loader in case if urls list is the same
- final URL[] oldURLS = classLoader.getURLs();
- if (customClassPathURLs.length == oldURLS.length) {
- int i = 0;
- for (; i < oldURLS.length; i++) {
- if (!customClassPathURLs[i].sameFile(oldURLS[i])) {
- break;
- }
- }
- if (i == oldURLS.length) {
- recreateFlag = false;
- }
- }
- }
- if (recreateFlag) {
- reset();
- classLoader = createClassLoader(customClassPathURLs);
- }
+ cleanUpClassLoader();
+ classLoader = createClassLoader(customClassPathURLs);
}
protected ConsoleConfigClassLoader createClassLoader(final URL[] customClassPathURLs) {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HibernateExtension3_6.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HibernateExtension3_6.java 2012-03-29 13:21:18 UTC (rev 39916)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HibernateExtension3_6.java 2012-03-29 13:21:33 UTC (rev 39917)
@@ -141,27 +141,11 @@
* Create class loader - so it uses the original urls list from preferences.
*/
protected void reinitClassLoader() {
- boolean recreateFlag = true;
+ //the class loader caches user's compiled classes
+ //need to rebuild it on every console configuration rebuild to pick up latest versions.
final URL[] customClassPathURLs = PreferencesClassPathUtils.getCustomClassPathURLs(prefs);
- if (classLoader != null) {
- // check -> do not recreate class loader in case if urls list is the same
- final URL[] oldURLS = classLoader.getURLs();
- if (customClassPathURLs.length == oldURLS.length) {
- int i = 0;
- for (; i < oldURLS.length; i++) {
- if (!customClassPathURLs[i].sameFile(oldURLS[i])) {
- break;
- }
- }
- if (i == oldURLS.length) {
- recreateFlag = false;
- }
- }
- }
- if (recreateFlag) {
- reset();
- classLoader = createClassLoader(customClassPathURLs);
- }
+ cleanUpClassLoader();
+ classLoader = createClassLoader(customClassPathURLs);
}
protected ConsoleConfigClassLoader createClassLoader(final URL[] customClassPathURLs) {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2012-03-29 13:21:18 UTC (rev 39916)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2012-03-29 13:21:33 UTC (rev 39917)
@@ -151,27 +151,11 @@
* Create class loader - so it uses the original urls list from preferences.
*/
protected void reinitClassLoader() {
- boolean recreateFlag = true;
+ //the class loader caches user's compiled classes
+ //need to rebuild it on every console configuration rebuild to pick up latest versions.
final URL[] customClassPathURLs = PreferencesClassPathUtils.getCustomClassPathURLs(prefs);
- if (classLoader != null) {
- // check -> do not recreate class loader in case if urls list is the same
- final URL[] oldURLS = classLoader.getURLs();
- if (customClassPathURLs.length == oldURLS.length) {
- int i = 0;
- for (; i < oldURLS.length; i++) {
- if (!customClassPathURLs[i].sameFile(oldURLS[i])) {
- break;
- }
- }
- if (i == oldURLS.length) {
- recreateFlag = false;
- }
- }
- }
- if (recreateFlag) {
- reset();
- classLoader = createClassLoader(customClassPathURLs);
- }
+ cleanUpClassLoader();
+ classLoader = createClassLoader(customClassPathURLs);
}
protected ConsoleConfigClassLoader createClassLoader(final URL[] customClassPathURLs) {
12 years, 9 months
JBoss Tools SVN: r39916 - in trunk: vpe/plugins/org.jboss.tools.vpe and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2012-03-29 09:21:18 -0400 (Thu, 29 Mar 2012)
New Revision: 39916
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-11302 - <visibleWhen> section in o.j.t.jst.jsp plugin.xml was updated.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2012-03-29 12:10:25 UTC (rev 39915)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2012-03-29 13:21:18 UTC (rev 39916)
@@ -381,7 +381,30 @@
id="org.jboss.tools.jst.jsp.toolbars.i18"
tooltip="%Externalize.Selected.Property">
<visibleWhen checkEnabled="false">
- <reference definitionId="org.jboss.tools.ui.vpe.editor"/>
+ <or>
+ <and>
+ <with variable="org.eclipse.core.runtime.Platform">
+ <test property="org.eclipse.core.runtime.isBundleInstalled"
+ args="org.jboss.tools.vpe" forcePluginActivation="true"/>
+ </with>
+ <reference definitionId="org.jboss.tools.ui.vpe.editor"/>
+ </and>
+ <and>
+ <not>
+ <with variable="org.eclipse.core.runtime.Platform">
+ <test property="org.eclipse.core.runtime.isBundleInstalled"
+ args="org.jboss.tools.vpe" forcePluginActivation="true"/>
+ </with>
+ </not>
+ <with variable="activeEditorId">
+ <or>
+ <equals value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/>
+ <equals value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"/>
+ <equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"/>
+ </or>
+ </with>
+ </and>
+ </or>
</visibleWhen>
</command>
<command
@@ -391,7 +414,30 @@
style="toggle"
tooltip="%Toggle.Selection.Bar">
<visibleWhen checkEnabled="false">
- <reference definitionId="org.jboss.tools.ui.vpe.editor"/>
+ <or>
+ <and>
+ <with variable="org.eclipse.core.runtime.Platform">
+ <test property="org.eclipse.core.runtime.isBundleInstalled"
+ args="org.jboss.tools.vpe" forcePluginActivation="true"/>
+ </with>
+ <reference definitionId="org.jboss.tools.ui.vpe.editor"/>
+ </and>
+ <and>
+ <not>
+ <with variable="org.eclipse.core.runtime.Platform">
+ <test property="org.eclipse.core.runtime.isBundleInstalled"
+ args="org.jboss.tools.vpe" forcePluginActivation="true"/>
+ </with>
+ </not>
+ <with variable="activeEditorId">
+ <or>
+ <equals value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/>
+ <equals value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"/>
+ <equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"/>
+ </or>
+ </with>
+ </and>
+ </or>
</visibleWhen>
</command>
</toolbar>
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2012-03-29 12:10:25 UTC (rev 39915)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2012-03-29 13:21:18 UTC (rev 39916)
@@ -135,23 +135,16 @@
<extension point="org.eclipse.core.expressions.definitions">
<definition id="org.jboss.tools.ui.vpe.editor">
<and>
- <or>
<with variable="activeEditorId">
- <equals value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/>
- </with>
- <with variable="activeEditorId">
- <equals value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"/>
- </with>
- <with variable="activeEditorId">
- <equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"/>
- </with>
- </or>
- <with
- variable="selection">
- <test
- property="org.jboss.tools.vpe.showiconsonmaintoolbar">
- </test>
- </with>
+ <or>
+ <equals value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/>
+ <equals value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"/>
+ <equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"/>
+ </or>
+ </with>
+ <with variable="selection">
+ <test property="org.jboss.tools.vpe.showiconsonmaintoolbar" />
+ </with>
</and>
</definition>
</extension>
12 years, 9 months
JBoss Tools SVN: r39915 - in trunk/maven: tests/org.jboss.tools.maven.configurators.tests/projects/jsf and 8 other directories.
by jbosstools-commits@lists.jboss.org
Author: fbricon
Date: 2012-03-29 08:10:25 -0400 (Thu, 29 Mar 2012)
New Revision: 39915
Added:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-lib/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-lib/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-lib/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-lib/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-lib/src/main/webapp/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-lib/src/main/webapp/WEB-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-lib/src/main/webapp/WEB-INF/lib/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-nolib/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-nolib/pom.xml
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java
Log:
JBIDE-11413: Installing the JSF facet creates an empty WEB-INF/lib folder
https://issues.jboss.org/browse/JBIDE-11413
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2012-03-29 11:51:47 UTC (rev 39914)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2012-03-29 12:10:25 UTC (rev 39915)
@@ -23,6 +23,7 @@
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
@@ -182,6 +183,7 @@
IFile defaultFacesConfig = project.getFolder(warSourceDir).getFile(facesConfigPath);
IFile generatedFacesConfig = ProjectUtil.getGeneratedWebResourceFile(project, facesConfigPath);
IFile actualFacesConfig = JSFUtils.getFacesconfig(project);
+ IFolder libFolder = project.getFolder(warSourceDir).getFolder("WEB-INF/lib");
//faces-config.xml will not be created in the source folder and it doesn't exist yet
// => We'll have to fix it after setting the JSF facet
@@ -189,6 +191,7 @@
&& !generatedFacesConfig.getLocation().equals(defaultFacesConfig.getLocation())
&& !generatedFacesConfig.exists();
boolean defaultFacesConfigAlreadyExists = defaultFacesConfig.exists();
+ boolean libFolderAlreadyExists = libFolder.exists();
IProjectFacetVersion facetVersion = null;
boolean configureServlet = false;//Fix for JBIDE-9454, where existing web.xml is completely overwritten.
@@ -236,6 +239,12 @@
&& defaultFacesConfig.exists()/*file has just been created*/) {
defaultFacesConfig.delete(true, monitor);
}
+ //JBIDE-11413 : don't create an unnecessary lib folder
+ if (!libFolderAlreadyExists
+ && libFolder.exists()
+ && libFolder.members().length == 0){
+ libFolder.delete(true, monitor);
+ }
}
}
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-lib/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-lib/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-lib/pom.xml 2012-03-29 12:10:25 UTC (rev 39915)
@@ -0,0 +1,47 @@
+<?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>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>jsf-lib</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <!-- not in central, hence requires the JBoss repo -->
+ <artifactId>jsf-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <!-- You should seriously consider using a repository manager or declare repositories in your settings.xml.
+ See http://www.sonatype.com/people/2009/02/why-putting-repositories-in-your-p... -->
+ <repository>
+ <!-- The JBoss Public repository is a composite repository of several major repositories.
+ See http://community.jboss.org/wiki/MavenGettingStarted-Users -->
+ <id>jboss-public-repository</id>
+ <url>http://repository.jboss.org/nexus/content/groups/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <!-- You can disable snapshot resolution to speed up your builds -->
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
+
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-nolib/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-nolib/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/jsf/JBIDE-11413/jsf-nolib/pom.xml 2012-03-29 12:10:25 UTC (rev 39915)
@@ -0,0 +1,47 @@
+<?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>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>jsf-nolib</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <!-- not in central, hence requires the JBoss repo -->
+ <artifactId>jsf-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <!-- You should seriously consider using a repository manager or declare repositories in your settings.xml.
+ See http://www.sonatype.com/people/2009/02/why-putting-repositories-in-your-p... -->
+ <repository>
+ <!-- The JBoss Public repository is a composite repository of several major repositories.
+ See http://community.jboss.org/wiki/MavenGettingStarted-Users -->
+ <id>jboss-public-repository</id>
+ <url>http://repository.jboss.org/nexus/content/groups/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <!-- You can disable snapshot resolution to speed up your builds -->
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
+
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java 2012-03-29 11:51:47 UTC (rev 39914)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/JSFConfiguratorTest.java 2012-03-29 12:10:25 UTC (rev 39915)
@@ -3,6 +3,7 @@
import java.io.File;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
@@ -144,6 +145,23 @@
}
+
+
+ @Test
+ public void testJBIDE11413_WebInfLib() throws Exception {
+ IProject[] projects = importProjects("projects/jsf/JBIDE-11413", new String[]{ "jsf-nolib/pom.xml","jsf-lib/pom.xml"}, new ResolverConfiguration());
+ waitForJobsToComplete();
+
+ IProject jsfnolib = projects[0];
+ IProject jsflib = projects[1];
+
+ IFolder lib = jsfnolib.getFolder("src/main/webapp/WEB-INF/lib");
+ assertFalse("WEB-INF/lib was added to the project!", lib.exists());
+
+ lib = jsflib.getFolder("src/main/webapp/WEB-INF/lib");
+ assertTrue("WEB-INF/lib was removed from the project!", lib.exists());
+ }
+
private void assertHasJSFConfigurationError(IProject project, String message) throws Exception {
WorkspaceHelpers.assertErrorMarker(MavenJSFConstants.JSF_CONFIGURATION_ERROR_MARKER_ID, message, 1, "", project);
}
12 years, 9 months
JBoss Tools SVN: r39914 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.client: META-INF and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-03-29 07:51:47 -0400 (Thu, 29 Mar 2012)
New Revision: 39914
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.2.0-SNAPSHOT.jar
Removed:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.1.1-SNAPSHOT.jar
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties
Log:
[JBIDE-11418][JBIDE-11431] added new client that fixes unmarshalling issues that seem to occur with keys
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2012-03-29 10:05:17 UTC (rev 39913)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2012-03-29 11:51:47 UTC (rev 39914)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="openshift-java-client-1.1.1-SNAPSHOT.jar" sourcepath="/openshift-java-client"/>
+ <classpathentry exported="true" kind="lib" path="openshift-java-client-1.2.0-SNAPSHOT.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="src" path="src"/>
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2012-03-29 10:05:17 UTC (rev 39913)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2012-03-29 11:51:47 UTC (rev 39914)
@@ -6,7 +6,7 @@
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
- openshift-java-client-1.1.1-SNAPSHOT.jar
+ openshift-java-client-1.2.0-SNAPSHOT.jar
Export-Package: com.openshift.express.client,
com.openshift.express.client.configuration,
com.openshift.express.client.utils
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties 2012-03-29 10:05:17 UTC (rev 39913)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties 2012-03-29 11:51:47 UTC (rev 39914)
@@ -2,5 +2,5 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- openshift-java-client-1.1.1-SNAPSHOT.jar
+ openshift-java-client-1.2.0-SNAPSHOT.jar
src.includes = openshift-java-client-1.1.1-SNAPSHOT.jar
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.1.1-SNAPSHOT.jar
===================================================================
(Binary files differ)
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.2.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.2.0-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
12 years, 9 months
JBoss Tools SVN: r39913 - trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2012-03-29 06:05:17 -0400 (Thu, 29 Mar 2012)
New Revision: 39913
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-11360 - TestUtil was updated: check for null was added.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java 2012-03-29 08:59:20 UTC (rev 39912)
+++ trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java 2012-03-29 10:05:17 UTC (rev 39913)
@@ -99,13 +99,12 @@
return null;
}
- public static IResource getResource(String path,
- String projectName) throws CoreException, IOException {
+ public static IResource getResource(String path, String projectName)
+ throws CoreException, IOException {
IProject project = ProjectsLoader.getInstance().getProject(projectName);
if (project != null) {
return project.findMember(path);
}
-
return null;
}
@@ -306,11 +305,14 @@
* @return nsIDOMDocument
*/
public static nsIDOMDocument getVpeVisualDocument(JSPMultiPageEditor part) {
+ nsIDOMDocument document = null;
VpeController vpeController = TestUtil.getVpeController(part);
- // get xulRunner editor
- XulRunnerEditor xulRunnerEditor = vpeController.getXulRunnerEditor();
- // get dom document
- nsIDOMDocument document = xulRunnerEditor.getDOMDocument();
+ if (vpeController != null) {
+ XulRunnerEditor xulRunnerEditor = vpeController.getXulRunnerEditor();
+ if (xulRunnerEditor != null) {
+ document = xulRunnerEditor.getDOMDocument();
+ }
+ }
return document;
}
12 years, 9 months
JBoss Tools SVN: r39912 - trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/resources.
by jbosstools-commits@lists.jboss.org
Author: sbunciak
Date: 2012-03-29 04:59:20 -0400 (Thu, 29 Mar 2012)
New Revision: 39912
Added:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/resources/swtbot.properties
Log:
SWTBot configuration added
Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/resources/swtbot.properties
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/resources/swtbot.properties (rev 0)
+++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/resources/swtbot.properties 2012-03-29 08:59:20 UTC (rev 39912)
@@ -0,0 +1,2 @@
+SWTBotPreferences.PLAYBACK_DELAY=25
+SWTBotPreferences.TIMEOUT=1000
12 years, 9 months
JBoss Tools SVN: r39911 - in trunk/forge/plugins: org.jboss.tools.forge.runtime and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-03-29 03:24:33 -0400 (Thu, 29 Mar 2012)
New Revision: 39911
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/build.properties
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/build.properties
trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties
trunk/forge/plugins/org.jboss.tools.forge.ui/build.properties
Log:
include plugin.properties in bin.includes
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/build.properties
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/build.properties 2012-03-29 05:07:19 UTC (rev 39910)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/build.properties 2012-03-29 07:24:33 UTC (rev 39911)
@@ -2,5 +2,6 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ plugin.properties
src.includes = *
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties 2012-03-29 05:07:19 UTC (rev 39910)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties 2012-03-29 07:24:33 UTC (rev 39911)
@@ -1,9 +1,6 @@
-source.. = src/
bin.includes = META-INF/,\
modules/,\
jboss-modules.jar,\
- 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
+ plugin.properties
src.includes = *
jars.compile.order = .
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/build.properties
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/build.properties 2012-03-29 05:07:19 UTC (rev 39910)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/build.properties 2012-03-29 07:24:33 UTC (rev 39911)
@@ -1,6 +1,7 @@
bin.includes = META-INF/,\
modules/,\
- bin/
+ bin/,\
+ plugin.properties
jars.compile.order = bin/
source.bin/ = src/
output.bin/ = bin/
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/build.properties
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/build.properties 2012-03-29 05:07:19 UTC (rev 39910)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/build.properties 2012-03-29 07:24:33 UTC (rev 39911)
@@ -1,6 +1,7 @@
output.. = bin/
bin.includes = META-INF/,\
plugin.xml,\
+ plugin.properties,\
icons/,\
.
source.. = src/
12 years, 9 months
JBoss Tools SVN: r39910 - trunk/build/aggregate.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-03-29 01:07:19 -0400 (Thu, 29 Mar 2012)
New Revision: 39910
Modified:
trunk/build/aggregate/pom.xml
Log:
add instructions for building soatests-site
Modified: trunk/build/aggregate/pom.xml
===================================================================
--- trunk/build/aggregate/pom.xml 2012-03-29 05:06:36 UTC (rev 39909)
+++ trunk/build/aggregate/pom.xml 2012-03-29 05:07:19 UTC (rev 39910)
@@ -23,6 +23,7 @@
mvn clean install -f webtools-site/pom.xml
mvn clean install -f bottests-site/pom.xml
mvn clean install -f coretests-site/pom.xml
+ mvn clean install -f soatests-site/pom.xml
...
-->
</project>
12 years, 9 months