JBoss Tools SVN: r33485 - trunk/jst/features/org.jboss.tools.jst.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-02 20:34:14 -0400 (Tue, 02 Aug 2011)
New Revision: 33485
Modified:
trunk/jst/features/org.jboss.tools.jst.test.feature/feature.xml
Log:
JBIDE-8734 publish test feature and/or bot test plugin(s)
Modified: trunk/jst/features/org.jboss.tools.jst.test.feature/feature.xml
===================================================================
--- trunk/jst/features/org.jboss.tools.jst.test.feature/feature.xml 2011-08-03 00:25:59 UTC (rev 33484)
+++ trunk/jst/features/org.jboss.tools.jst.test.feature/feature.xml 2011-08-03 00:34:14 UTC (rev 33485)
@@ -1,78 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.jst.test.feature"
- label="JST Test Feature"
- version="3.3.0.qualifier"
- provider-name="JBoss by RedHat">
+<feature id="org.jboss.tools.jst.test.feature" label="JST Test Feature" version="3.3.0.qualifier" provider-name="JBoss by RedHat">
- <description url="http://www.example.com/description">
+ <description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>
- <copyright url="http://www.example.com/copyright">
+ <copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
- <license url="http://www.example.com/license">
+ <license url="http://www.example.com/license">
[Enter License Description here.]
</license>
- <plugin
- id="org.jboss.tools.jst.css.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
+ <plugin id="org.jboss.tools.jst.css.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.jst.jsp.base.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+ <plugin id="org.jboss.tools.jst.jsp.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.jst.text.ext.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+ <plugin id="org.jboss.tools.jst.ui.bot.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+ <plugin id="org.jboss.tools.jst.ui.firstrun.bot.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+ <plugin id="org.jboss.tools.jst.web.kb.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.jst.web.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.jst.web.ui.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin
- id="org.jboss.tools.jst.jsp.base.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.jst.jsp.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.text.ext.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.jst.ui.bot.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.jst.ui.firstrun.bot.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.jst.web.kb.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.web.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.web.ui.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
</feature>
13 years, 5 months
JBoss Tools SVN: r33484 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-02 20:25:59 -0400 (Tue, 02 Aug 2011)
New Revision: 33484
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/WebRedirectHandler.java
Log:
FileSystemsHelper.getFile(object) method used.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/WebRedirectHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/WebRedirectHandler.java 2011-08-03 00:16:02 UTC (rev 33483)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/WebRedirectHandler.java 2011-08-03 00:25:59 UTC (rev 33484)
@@ -9,6 +9,7 @@
import org.jboss.tools.common.meta.action.impl.XActionImpl;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultRedirectHandler;
import org.jboss.tools.common.model.*;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.filesystems.XFileObject;
import org.jboss.tools.jst.web.model.ReferenceObject;
@@ -72,8 +73,7 @@
private boolean checkConfigVersion(XModelObject object) {
String entity = action.getProperty("configEntity"); //$NON-NLS-1$
if(entity == null) return true;
- XModelObject f = object;
- while(f != null && f.getFileType() != XFileObject.FILE) f = f.getParent();
+ XModelObject f = FileSystemsHelper.getFile(object);
if(f == null) return true;
boolean b = f.getModelEntity().getName().equals(entity);
if(b) return true;
13 years, 5 months
JBoss Tools SVN: r33483 - in trunk/jbpm: features/org.jboss.tools.jbpm3.tests.feature and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-02 20:16:02 -0400 (Tue, 02 Aug 2011)
New Revision: 33483
Modified:
trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.xml
trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.xml
trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.xml
trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml
trunk/jbpm/site/site.xml
trunk/jbpm/tests/pom.xml
Log:
JBIDE-8734 publish test feature and/or bot test plugin(s)
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.xml 2011-08-03 00:15:47 UTC (rev 33482)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.xml 2011-08-03 00:16:02 UTC (rev 33483)
@@ -1,28 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.jbpm3.feature"
- label="%featureName"
- version="3.2.0.qualifier"
- provider-name="%featureProvider">
+<feature id="org.jboss.tools.jbpm3.feature" label="%featureName" version="3.2.0.qualifier" provider-name="%featureProvider">
- <description>
+ <description>
%description
</description>
- <copyright>
+ <copyright>
%copyright
</copyright>
- <license url="%licenseURL">
+ <license url="%licenseURL">
%license
</license>
- <includes
- id="org.jboss.tools.jbpm.common.feature"
- version="0.0.0"/>
-
- <includes
- id="org.jbpm.gd.jpdl.feature"
- version="0.0.0"/>
-
+ <includes id="org.jboss.tools.jbpm.common.feature" version="0.0.0" />
+ <includes id="org.jbpm.gd.jpdl.feature" version="0.0.0" />
</feature>
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.xml 2011-08-03 00:15:47 UTC (rev 33482)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.xml 2011-08-03 00:16:02 UTC (rev 33483)
@@ -1,34 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.jbpm3.tests.feature"
- label="%featureName"
- version="3.3.0.qualifier"
- provider-name="%featureProvider">
+<feature id="org.jboss.tools.jbpm3.tests.feature" label="%featureName" version="3.3.0.qualifier" provider-name="%featureProvider">
- <description>
+ <description>
%description
</description>
- <copyright>
+ <copyright>
%copyright
</copyright>
- <license url="%licenseURL">
+ <license url="%licenseURL">
%license
</license>
- <plugin
- id="org.jboss.tools.jbpm.common.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jbpm.gd.jpdl.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
+ <plugin id="org.jboss.tools.jbpm.common.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+ <plugin id="org.jbpm.gd.jpdl.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+ <plugin id="org.jboss.tools.jbpm.ui.bot.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
</feature>
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.xml 2011-08-03 00:15:47 UTC (rev 33482)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.xml 2011-08-03 00:16:02 UTC (rev 33483)
@@ -1,32 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.jbpm4.feature"
- label="%featureName"
- version="4.0.0.qualifier"
- provider-name="%featureProvider">
+<feature id="org.jboss.tools.jbpm4.feature" label="%featureName" version="4.0.0.qualifier" provider-name="%featureProvider">
- <description>
+ <description>
%description
</description>
- <copyright>
+ <copyright>
%copyright
</copyright>
- <license url="%licenseURL">
+ <license url="%licenseURL">
%license
</license>
- <includes
- id="org.jboss.tools.jbpm.common.feature"
- version="0.0.0"/>
-
- <includes
- id="org.jboss.tools.flow.common.feature"
- version="0.0.0"/>
-
- <includes
- id="org.jboss.tools.flow.jpdl4.feature"
- version="0.0.0"/>
-
+ <includes id="org.jboss.tools.jbpm.common.feature" version="0.0.0" />
+ <includes id="org.jboss.tools.flow.common.feature" version="0.0.0" />
+ <includes id="org.jboss.tools.flow.jpdl4.feature" version="0.0.0" />
</feature>
Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml 2011-08-03 00:15:47 UTC (rev 33482)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml 2011-08-03 00:16:02 UTC (rev 33483)
@@ -1,38 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.jbpm4.tests.feature"
- label="%featureName"
- version="4.4.0.qualifier"
- provider-name="%featureProvider">
+<feature id="org.jboss.tools.jbpm4.tests.feature" label="%featureName" version="4.4.0.qualifier" provider-name="%featureProvider">
- <description>
+ <description>
%description
</description>
- <copyright>
+ <copyright>
%copyright
</copyright>
- <license url="%licenseURL">
+ <license url="%licenseURL">
%license
</license>
- <plugin
- id="org.jboss.tools.jbpm.common.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.flow.jpdl4.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.flow.jpdl4.multipage.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
+ <plugin id="org.jboss.tools.jbpm.common.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.flow.jpdl4.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.flow.jpdl4.multipage.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.jbpm.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
</feature>
Modified: trunk/jbpm/site/site.xml
===================================================================
--- trunk/jbpm/site/site.xml 2011-08-03 00:15:47 UTC (rev 33482)
+++ trunk/jbpm/site/site.xml 2011-08-03 00:16:02 UTC (rev 33483)
@@ -23,5 +23,10 @@
<feature url="features/org.jbpm.gd.jpdl.feature_0.0.0.jar" id="org.jbpm.gd.jpdl.feature" version="0.0.0">
<category name="JBoss Tools jbpm Nightly Build Update Site"/>
</feature>
-
+ <feature url="features/org.jboss.tools.jbpm3.tests.feature_0.0.0.jar" id="org.jboss.tools.jbpm3.tests.feature" version="0.0.0">
+ <category name="JBoss Tools jbpm Nightly Build Update Site"/>
+ </feature>
+ <feature url="features/org.jboss.tools.jbpm4.tests.feature_0.0.0.jar" id="org.jboss.tools.jbpm4.tests.feature" version="0.0.0">
+ <category name="JBoss Tools jbpm Nightly Build Update Site"/>
+ </feature>
</site>
Modified: trunk/jbpm/tests/pom.xml
===================================================================
--- trunk/jbpm/tests/pom.xml 2011-08-03 00:15:47 UTC (rev 33482)
+++ trunk/jbpm/tests/pom.xml 2011-08-03 00:16:02 UTC (rev 33483)
@@ -18,6 +18,7 @@
<module>org.jboss.tools.jbpm.common.test</module>
<module>org.jboss.tools.jbpm.convert.test</module>
<module>org.jbpm.gd.jpdl.test</module>
+ <module>org.jboss.tools.jbpm.ui.bot.test</module>
</modules>
</project>
13 years, 5 months
JBoss Tools SVN: r33482 - in trunk/flow: features and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-02 20:15:47 -0400 (Tue, 02 Aug 2011)
New Revision: 33482
Added:
trunk/flow/features/org.jboss.tools.flow.common.test.feature/
trunk/flow/features/org.jboss.tools.flow.common.test.feature/.cvsignore
trunk/flow/features/org.jboss.tools.flow.common.test.feature/build.properties
trunk/flow/features/org.jboss.tools.flow.common.test.feature/feature.properties
trunk/flow/features/org.jboss.tools.flow.common.test.feature/feature.xml
trunk/flow/features/org.jboss.tools.flow.common.test.feature/license.html
trunk/flow/features/org.jboss.tools.flow.common.test.feature/pom.xml
Modified:
trunk/flow/features/pom.xml
trunk/flow/pom.xml
trunk/flow/site/site.xml
Log:
JBIDE-8734 publish test feature and/or bot test plugin(s)
Added: trunk/flow/features/org.jboss.tools.flow.common.test.feature/.cvsignore
===================================================================
--- trunk/flow/features/org.jboss.tools.flow.common.test.feature/.cvsignore (rev 0)
+++ trunk/flow/features/org.jboss.tools.flow.common.test.feature/.cvsignore 2011-08-03 00:15:47 UTC (rev 33482)
@@ -0,0 +1 @@
+build.xml
Added: trunk/flow/features/org.jboss.tools.flow.common.test.feature/build.properties
===================================================================
--- trunk/flow/features/org.jboss.tools.flow.common.test.feature/build.properties (rev 0)
+++ trunk/flow/features/org.jboss.tools.flow.common.test.feature/build.properties 2011-08-03 00:15:47 UTC (rev 33482)
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ license.html
Added: trunk/flow/features/org.jboss.tools.flow.common.test.feature/feature.properties
===================================================================
--- trunk/flow/features/org.jboss.tools.flow.common.test.feature/feature.properties (rev 0)
+++ trunk/flow/features/org.jboss.tools.flow.common.test.feature/feature.properties 2011-08-03 00:15:47 UTC (rev 33482)
@@ -0,0 +1,27 @@
+# properties file for org.jboss.tools.flow.common.*.test*
+featureName=flow.common Tests
+featureProvider=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+# "description" property - description of the feature
+description=flow.common Tests
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# START NON-TRANSLATABLE
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+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.
+# END NON-TRANSLATABLE
+########### end of license property ##########################################
+
\ No newline at end of file
Added: trunk/flow/features/org.jboss.tools.flow.common.test.feature/feature.xml
===================================================================
--- trunk/flow/features/org.jboss.tools.flow.common.test.feature/feature.xml (rev 0)
+++ trunk/flow/features/org.jboss.tools.flow.common.test.feature/feature.xml 2011-08-03 00:15:47 UTC (rev 33482)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature id="org.jboss.tools.flow.common.test.feature" label="%featureName" version="0.0.1.qualifier" provider-name="%featureProvider">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin id="org.jboss.tools.flow.common.test" download-size="0" install-size="0" version="0.0.0" />
+</feature>
Added: trunk/flow/features/org.jboss.tools.flow.common.test.feature/license.html
===================================================================
--- trunk/flow/features/org.jboss.tools.flow.common.test.feature/license.html (rev 0)
+++ trunk/flow/features/org.jboss.tools.flow.common.test.feature/license.html 2011-08-03 00:15:47 UTC (rev 33482)
@@ -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: trunk/flow/features/org.jboss.tools.flow.common.test.feature/pom.xml
===================================================================
--- trunk/flow/features/org.jboss.tools.flow.common.test.feature/pom.xml (rev 0)
+++ trunk/flow/features/org.jboss.tools.flow.common.test.feature/pom.xml 2011-08-03 00:15:47 UTC (rev 33482)
@@ -0,0 +1,12 @@
+<?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.flow</groupId>
+ <artifactId>features</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.flow.common.features</groupId>
+ <artifactId>org.jboss.tools.flow.common.tests.feature</artifactId>
+ <packaging>eclipse-feature</packaging>
+</project>
Modified: trunk/flow/features/pom.xml
===================================================================
--- trunk/flow/features/pom.xml 2011-08-03 00:15:34 UTC (rev 33481)
+++ trunk/flow/features/pom.xml 2011-08-03 00:15:47 UTC (rev 33482)
@@ -14,6 +14,7 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.flow.common.feature</module>
+ <module>org.jboss.tools.flow.common.test.feature</module>
</modules>
</project>
Modified: trunk/flow/pom.xml
===================================================================
--- trunk/flow/pom.xml 2011-08-03 00:15:34 UTC (rev 33481)
+++ trunk/flow/pom.xml 2011-08-03 00:15:47 UTC (rev 33482)
@@ -14,9 +14,9 @@
<name>flow.all</name>
<packaging>pom</packaging>
<modules>
- <module>features</module>
<module>plugins</module>
<module>tests</module>
+ <module>features</module>
<module>site</module>
</modules>
</project>
Modified: trunk/flow/site/site.xml
===================================================================
--- trunk/flow/site/site.xml 2011-08-03 00:15:34 UTC (rev 33481)
+++ trunk/flow/site/site.xml 2011-08-03 00:15:47 UTC (rev 33482)
@@ -8,5 +8,8 @@
<feature url="features/org.jboss.tools.flow.common.feature_0.0.0.jar" id="org.jboss.tools.flow.common.feature" version="0.0.0">
<category name="JBoss Tools flow Nightly Build Update Site"/>
</feature>
+ <feature url="features/org.jboss.tools.flow.common.test.feature_0.0.0.jar" id="org.jboss.tools.flow.common.test.feature" version="0.0.0">
+ <category name="JBoss Tools flow Nightly Build Update Site"/>
+ </feature>
</site>
13 years, 5 months
JBoss Tools SVN: r33481 - in trunk/hibernatetools: site and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-02 20:15:34 -0400 (Tue, 02 Aug 2011)
New Revision: 33481
Modified:
trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml
trunk/hibernatetools/site/site.xml
trunk/hibernatetools/tests/pom.xml
Log:
JBIDE-8734 publish test feature and/or bot test plugin(s)
Modified: trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml
===================================================================
--- trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 2011-08-03 00:15:22 UTC (rev 33480)
+++ trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 2011-08-03 00:15:34 UTC (rev 33481)
@@ -26,8 +26,8 @@
<plugin id="org.hibernate.eclipse.jdt.ui.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.tools.hibernate.ui.test" download-size="0" install-size="0" version="0.0.0" />
- <!-- not yet enabled / built -->
- <!-- <plugin id="org.jboss.tools.hibernate.jpt.core.test" download-size="0" install-size="0" version="0.0.0" /> -->
- <!-- <plugin id="org.jboss.tools.hibernate.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
+ <!-- TODO: should these be enabled / built? -->
+ <plugin id="org.jboss.tools.hibernate.jpt.core.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.hibernate.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
</feature>
Modified: trunk/hibernatetools/site/site.xml
===================================================================
--- trunk/hibernatetools/site/site.xml 2011-08-03 00:15:22 UTC (rev 33480)
+++ trunk/hibernatetools/site/site.xml 2011-08-03 00:15:34 UTC (rev 33481)
@@ -8,5 +8,8 @@
<feature url="features/org.hibernate.eclipse.feature_0.0.0.jar" id="org.hibernate.eclipse.feature" version="0.0.0">
<category name="JBoss Tools hibernatetools Nightly Build Update Site"/>
</feature>
+ <feature url="features/org.hibernate.eclipse.test.feature_0.0.0.jar" id="org.hibernate.eclipse.test.feature" version="0.0.0">
+ <category name="JBoss Tools hibernatetools Nightly Build Update Site"/>
+ </feature>
</site>
Modified: trunk/hibernatetools/tests/pom.xml
===================================================================
--- trunk/hibernatetools/tests/pom.xml 2011-08-03 00:15:22 UTC (rev 33480)
+++ trunk/hibernatetools/tests/pom.xml 2011-08-03 00:15:34 UTC (rev 33481)
@@ -14,9 +14,10 @@
<modules>
<module>org.hibernate.eclipse.console.test</module>
<module>org.hibernate.eclipse.jdt.ui.test</module>
- <!-- <module>org.jboss.tools.hibernate.jpt.core.test</module>
- <module>org.jboss.tools.hibernate.ui.bot.test</module> -->
<module>org.jboss.tools.hibernate.ui.test</module>
+ <!-- TODO: should these be enabled / built? -->
+ <module>org.jboss.tools.hibernate.jpt.core.test</module>
+ <module>org.jboss.tools.hibernate.ui.bot.test</module>
</modules>
</project>
13 years, 5 months
JBoss Tools SVN: r33480 - in trunk/freemarker: site and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-02 20:15:22 -0400 (Tue, 02 Aug 2011)
New Revision: 33480
Modified:
trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml
trunk/freemarker/site/site.xml
Log:
JBIDE-8734 publish test feature and/or bot test plugin(s)
Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml
===================================================================
--- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml 2011-08-03 00:15:11 UTC (rev 33479)
+++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/feature.xml 2011-08-03 00:15:22 UTC (rev 33480)
@@ -1,26 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.ide.eclipse.freemarker.test.feature"
- label="Freemarker Tests"
- version="1.2.0.qualifier"
- provider-name="JBoss by RedHat">
+<feature id="org.jboss.ide.eclipse.freemarker.test.feature" label="Freemarker Tests" version="1.2.0.qualifier" provider-name="JBoss by RedHat">
- <description url="http://www.example.com/description">
+ <description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>
- <copyright url="http://www.example.com/copyright">
+ <copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
- <license url="http://www.example.com/license">
+ <license url="http://www.example.com/license">
[Enter License Description here.]
</license>
- <plugin
- id="org.jboss.ide.eclipse.freemarker.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
+ <plugin id="org.jboss.ide.eclipse.freemarker.test" download-size="0" install-size="0" version="0.0.0" />
</feature>
Modified: trunk/freemarker/site/site.xml
===================================================================
--- trunk/freemarker/site/site.xml 2011-08-03 00:15:11 UTC (rev 33479)
+++ trunk/freemarker/site/site.xml 2011-08-03 00:15:22 UTC (rev 33480)
@@ -8,5 +8,8 @@
<feature url="features/org.jboss.ide.eclipse.freemarker.feature_0.0.0.jar" id="org.jboss.ide.eclipse.freemarker.feature" version="0.0.0">
<category name="JBoss Tools freemarker Nightly Build Update Site"/>
</feature>
+ <feature url="features/org.jboss.ide.eclipse.freemarker.test.feature_0.0.0.jar" id="org.jboss.ide.eclipse.freemarker.test.feature" version="0.0.0">
+ <category name="JBoss Tools freemarker Nightly Build Update Site"/>
+ </feature>
</site>
13 years, 5 months
JBoss Tools SVN: r33479 - trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-02 20:15:11 -0400 (Tue, 02 Aug 2011)
New Revision: 33479
Added:
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/.gitignore
Log:
.gitignore file
Added: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/.gitignore
===================================================================
--- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/.gitignore (rev 0)
+++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/.gitignore 2011-08-03 00:15:11 UTC (rev 33479)
@@ -0,0 +1 @@
+freemarker-ide.jar
13 years, 5 months
JBoss Tools SVN: r33478 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-02 20:13:26 -0400 (Tue, 02 Aug 2011)
New Revision: 33478
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java
Log:
JBIDE-9120
https://issues.jboss.org/browse/JBIDE-9120
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2011-08-03 00:12:31 UTC (rev 33477)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2011-08-03 00:13:26 UTC (rev 33478)
@@ -132,6 +132,7 @@
* @throws CoreException
*/
public static void addNatureToProjectWithValidationSupport(IProject project, String builderId, String natureId) throws CoreException {
+ EclipseResourceUtil.addNatureToProject(project, natureId);
IProjectDescription desc = project.getDescription();
ICommand[] existing = desc.getBuildSpec();
boolean updated = false;
@@ -174,7 +175,6 @@
project.setDescription(desc, null);
updated = false;
}
- EclipseResourceUtil.addNatureToProject(project, natureId);
desc = project.getDescription();
existing = desc.getBuildSpec();
builderIndex = existing.length-1;
13 years, 5 months
JBoss Tools SVN: r33477 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-02 20:12:31 -0400 (Tue, 02 Aug 2011)
New Revision: 33477
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java
Log:
JBIDE-9120
https://issues.jboss.org/browse/JBIDE-9120
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java 2011-08-03 00:11:53 UTC (rev 33476)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java 2011-08-03 00:12:31 UTC (rev 33477)
@@ -33,6 +33,7 @@
import org.jboss.tools.jsf.ui.JsfUIMessages;
import org.jboss.tools.jsf.ui.JsfUiPlugin;
import org.jboss.tools.jsf.ui.editor.check.wizards.QuickFixWizard;
+import org.jboss.tools.jst.web.kb.internal.KbBuilderMarker;
import org.jboss.tools.jst.web.kb.internal.KbProject;
/**
@@ -57,7 +58,7 @@
IMarker marker = markers[i];
String _type = marker.getType();
if (_type != null
- && _type.equals(KbProject.KB_BUILDER_PROBLEM_MARKER_TYPE)) {
+ && _type.equals(KbBuilderMarker.KB_BUILDER_PROBLEM_MARKER_TYPE)) {
kbProblemMarker = marker;
break;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2011-08-03 00:11:53 UTC (rev 33476)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2011-08-03 00:12:31 UTC (rev 33477)
@@ -31,6 +31,7 @@
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.util.FileUtil;
import org.jboss.tools.jst.web.kb.IKbProject;
+import org.jboss.tools.jst.web.kb.internal.KbBuilderMarker;
import org.jboss.tools.jst.web.kb.internal.KbProject;
import org.jboss.tools.jst.web.project.WebProject;
@@ -214,7 +215,7 @@
IMarker marker = markers[i];
String _type = marker.getType();
if (_type != null
- && _type.equals(KbProject.KB_BUILDER_PROBLEM_MARKER_TYPE)) {
+ && _type.equals(KbBuilderMarker.KB_BUILDER_PROBLEM_MARKER_TYPE)) {
kbProblemMarker = marker;
break;
}
13 years, 5 months
JBoss Tools SVN: r33476 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb: src/org/jboss/tools/jst/web/kb and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-02 20:11:53 -0400 (Tue, 02 Aug 2011)
New Revision: 33476
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilderMarker.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/UsedJavaProjectCheck.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.properties
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/action/EnableKBOnProject.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/action/KBProblemMarkerResolutionGenerator.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBSettingsPreferencePage.java
Log:
JBIDE-9120
https://issues.jboss.org/browse/JBIDE-9120
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2011-08-02 23:41:16 UTC (rev 33475)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2011-08-03 00:11:53 UTC (rev 33476)
@@ -241,6 +241,9 @@
</super>
<persistent value="true">
</persistent>
+ <attribute
+ name="kind">
+ </attribute>
</extension>
<extension
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java 2011-08-02 23:41:16 UTC (rev 33475)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java 2011-08-03 00:11:53 UTC (rev 33476)
@@ -34,6 +34,11 @@
public static String KBPROBLEM;
public static String KBPROBLEM_LOCATION;
public static String ENABLE_KB;
+ public static String KBPROBLEM_DEPENDS_ON_JAVA_SINGLE;
+ public static String KBPROBLEM_DEPENDS_ON_JAVA_MANY;
+ public static String ENABLE_KB_ON_SINGLE;
+ public static String ENABLE_KB_ON_MANY;
+
public static String ILLEGAL_CONTENTTYPE;
public static String EXCEPTION_DURING_CREATING_MARKER;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.properties 2011-08-02 23:41:16 UTC (rev 33475)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.properties 2011-08-03 00:11:53 UTC (rev 33476)
@@ -12,6 +12,11 @@
KBPROBLEM_LOCATION=Project: {0}
ENABLE_KB=Enable JSF CA and validation on this project
+KBPROBLEM_DEPENDS_ON_JAVA_SINGLE= JBoss Tools Knowledge Base problem: Nature is not installed on required Java project {0}. Use Quick Fix to include artifacts declared in that project into Content Assistant and Validation.
+KBPROBLEM_DEPENDS_ON_JAVA_MANY= JBoss Tools Knowledge Base problem: Nature is not installed on required Java projects {0}. Use Quick Fix to include artifacts declared in these projects into Content Assistant and Validation.
+ENABLE_KB_ON_SINGLE=Enable Knowledge Base capabilities on project {0}
+ENABLE_KB_ON_MANY=Enable Knowledge Base capabilities on projects {0}
+
ILLEGAL_CONTENTTYPE=Unknown contentType argument value: {0}
EXCEPTION_DURING_CREATING_MARKER=Exception occurred during creating marker for validation error on ''{0}''
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/action/EnableKBOnProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/action/EnableKBOnProject.java 2011-08-02 23:41:16 UTC (rev 33475)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/action/EnableKBOnProject.java 2011-08-03 00:11:53 UTC (rev 33476)
@@ -10,16 +10,17 @@
******************************************************************************/
package org.jboss.tools.jst.web.kb.action;
+import java.util.List;
+
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.ui.IMarkerResolution;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.jst.web.kb.IKbProject;
-import org.jboss.tools.jst.web.kb.KbMessages;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
-import org.jboss.tools.jst.web.kb.internal.KbProject;
+import org.jboss.tools.jst.web.kb.internal.KbBuilderMarker;
+import org.jboss.tools.jst.web.kb.internal.scanner.UsedJavaProjectCheck;
/**
* The Marker Resolution that enables the KB Nature on the project
@@ -27,12 +28,17 @@
* @author Victor Rubezhny
*
*/
-public class EnableKBOnProject implements IMarkerResolution{
+public class EnableKBOnProject implements IMarkerResolution {
+ String label;
public String getLabel() {
- return KbMessages.ENABLE_KB;
+ return label;
}
+ public void setLabel(String label) {
+ this.label = label;
+ }
+
public void run(IMarker marker) {
IResource resource = marker.getResource();
IProject project = resource instanceof IProject ? (IProject)resource :
@@ -42,9 +48,15 @@
return;
try {
- EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID);
+ WebKbPlugin.enableKB(project, new NullProgressMonitor());
+
+ List<IProject> ps = new UsedJavaProjectCheck().getNonKbJavaProjects(project);
+ for (IProject p: ps) {
+ WebKbPlugin.enableKB(p, new NullProgressMonitor());
+ p.deleteMarkers(KbBuilderMarker.KB_BUILDER_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ONE);
+ }
// Find existing KBNATURE problem marker and kill it if exists
- project.deleteMarkers(KbProject.KB_BUILDER_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ONE);
+ project.deleteMarkers(KbBuilderMarker.KB_BUILDER_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ONE);
} catch (CoreException e) {
WebKbPlugin.getDefault().logError(e);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/action/KBProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/action/KBProblemMarkerResolutionGenerator.java 2011-08-02 23:41:16 UTC (rev 33475)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/action/KBProblemMarkerResolutionGenerator.java 2011-08-03 00:11:53 UTC (rev 33476)
@@ -10,9 +10,18 @@
******************************************************************************/
package org.jboss.tools.jst.web.kb.action;
+import java.util.List;
+
import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IMarkerResolution;
import org.eclipse.ui.IMarkerResolutionGenerator;
+import org.jboss.tools.jst.web.kb.KbMessages;
+import org.jboss.tools.jst.web.kb.WebKbPlugin;
+import org.jboss.tools.jst.web.kb.internal.KbBuilderMarker;
+import org.jboss.tools.jst.web.kb.internal.scanner.UsedJavaProjectCheck;
/**
* Shows the Marker Resolutions for KB Problem Marker
@@ -22,8 +31,30 @@
*/
public class KBProblemMarkerResolutionGenerator implements IMarkerResolutionGenerator {
public IMarkerResolution[] getResolutions(IMarker marker) {
+ try {
+ if(!KbBuilderMarker.KB_BUILDER_PROBLEM_MARKER_TYPE.equals(marker.getType())) {
+ return new IMarkerResolution[0];
+ }
+ } catch (CoreException e) {
+ WebKbPlugin.getDefault().logError(e);
+ }
+ EnableKBOnProject resolution = new EnableKBOnProject();
+ if(marker.getAttribute(KbBuilderMarker.ATTR_KIND, 1) == KbBuilderMarker.KIND_DEPENDS_ON_NON_KB_POJECTS) {
+ try {
+ UsedJavaProjectCheck check = new UsedJavaProjectCheck();
+ List<IProject> list = check.getNonKbJavaProjects(marker.getResource().getProject());
+ String messageId = list.size() == 1 ? KbMessages.ENABLE_KB_ON_SINGLE : KbMessages.ENABLE_KB_ON_MANY;
+ String projectList = check.asText(list);
+ String label = NLS.bind(messageId, projectList);
+ resolution.setLabel(label);
+ } catch (CoreException e) {
+ WebKbPlugin.getDefault().logError(e);
+ }
+ } else {
+ resolution.setLabel(KbMessages.ENABLE_KB);
+ }
return new IMarkerResolution[] {
- new EnableKBOnProject()
+ resolution
};
}
}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java 2011-08-02 23:41:16 UTC (rev 33475)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java 2011-08-03 00:11:53 UTC (rev 33476)
@@ -29,6 +29,7 @@
import org.jboss.tools.jst.web.kb.WebKbPlugin;
import org.jboss.tools.jst.web.kb.internal.scanner.IFileScanner;
import org.jboss.tools.jst.web.kb.internal.scanner.LibraryScanner;
+import org.jboss.tools.jst.web.kb.internal.scanner.UsedJavaProjectCheck;
import org.jboss.tools.jst.web.kb.internal.scanner.XMLScanner;
import org.osgi.framework.Bundle;
@@ -101,6 +102,7 @@
} else if(sp.getClassPath().hasToUpdateProjectDependencies()) {
sp.getClassPath().validateProjectDependencies();
}
+ new UsedJavaProjectCheck().check(sp);
TypeInfoCollector.cleanCache();
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilderMarker.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilderMarker.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilderMarker.java 2011-08-03 00:11:53 UTC (rev 33476)
@@ -0,0 +1,66 @@
+package org.jboss.tools.jst.web.kb.internal;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.jboss.tools.jst.web.kb.KbMessages;
+import org.jboss.tools.jst.web.kb.KbProjectFactory;
+import org.jboss.tools.jst.web.kb.WebKbPlugin;
+
+public class KbBuilderMarker {
+
+ public static final String KB_BUILDER_PROBLEM_MARKER_TYPE = "org.jboss.tools.jst.web.kb.kbBuilderProblemMarker"; //$NON-NLS-1$
+
+ //Default for backward compatibility.
+ public static final int KIND_KB_NATURE_OR_BUILDER_MISSING = 1;
+
+ public static final int KIND_DEPENDS_ON_NON_KB_POJECTS = 2;
+
+ public static final String ATTR_KIND = "kind"; //$NON-NLS-1$
+
+ public static IMarker[] getOwnedMarkers(IResource r, int kind) {
+ ArrayList<IMarker> l = null;
+ try {
+ if(r != null && r.isAccessible()) {
+ IMarker[] ms = r.findMarkers(null, false, 1);
+ for (IMarker m: ms) {
+ if(KB_BUILDER_PROBLEM_MARKER_TYPE.equals(m.getType())
+ && m.isSubtypeOf(IMarker.PROBLEM)
+ && (kind == m.getAttribute(ATTR_KIND, 1))) {
+ if(l == null) {
+ l = new ArrayList<IMarker>();
+ }
+ l.add(m);
+ }
+ }
+ }
+ } catch (CoreException e) {
+ WebKbPlugin.getDefault().logError(e);
+ }
+ return (l == null) ? null : l.toArray(new IMarker[0]);
+ }
+
+ public static IMarker createOrUpdateKbProblemMarker(IMarker m, IResource r, String message, int kind) throws CoreException {
+ String location = MessageFormat.format(KbMessages.KBPROBLEM_LOCATION, new Object[] {r.getProject().getName()});
+
+ if (m == null) {
+ m = r.createMarker(KB_BUILDER_PROBLEM_MARKER_TYPE);
+ m.setAttribute(KbBuilderMarker.ATTR_KIND, KbBuilderMarker.KIND_KB_NATURE_OR_BUILDER_MISSING);
+ if(kind == KIND_KB_NATURE_OR_BUILDER_MISSING) {
+ r.setPersistentProperty(KbProjectFactory.NATURE_MOCK, "true"); //$NON-NLS-1$
+ KbProjectFactory.getKbProject(r.getProject(), true);
+ }
+ }
+
+ m.setAttribute(ATTR_KIND, kind);
+ m.setAttribute(IMarker.LOCATION, location);
+ m.setAttribute(IMarker.MESSAGE, message);
+ m.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING);
+ m.setAttribute(IMarker.PRIORITY, IMarker.PRIORITY_NORMAL);
+ return m;
+ }
+
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilderMarker.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2011-08-02 23:41:16 UTC (rev 33475)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2011-08-03 00:11:53 UTC (rev 33476)
@@ -128,6 +128,9 @@
*/
public void configure() throws CoreException {
addToBuildSpec(KbBuilder.BUILDER_ID);
+ if(project.getPersistentProperty(KbProjectFactory.NATURE_MOCK) != null) {
+ project.setPersistentProperty(KbProjectFactory.NATURE_MOCK, null);
+ }
}
/*
@@ -973,11 +976,12 @@
if (kbNatureFound && kbBuilderFound) {
// Find existing KBNATURE problem marker and kill it if exists
- IMarker[] markers = getOwnedMarkers(project);
+ IMarker[] markers = KbBuilderMarker.getOwnedMarkers(project, KbBuilderMarker.KIND_KB_NATURE_OR_BUILDER_MISSING);
if (markers != null && markers.length > 0) {
try {
- project.deleteMarkers(KB_BUILDER_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ONE);
- project.setPersistentProperty(KbProjectFactory.NATURE_MOCK, null);
+ for (IMarker m: markers) {
+ m.delete();
+ }
} catch (CoreException ex) {
WebKbPlugin.getDefault().logError(ex);
}
@@ -986,7 +990,7 @@
}
// Find existing KBNATURE problem marker and install it if doesn't exist
- IMarker[] markers = getOwnedMarkers(project);
+ IMarker[] markers = KbBuilderMarker.getOwnedMarkers(project, KbBuilderMarker.KIND_KB_NATURE_OR_BUILDER_MISSING);
if (markers == null || markers.length == 0) {
try {
@@ -1006,35 +1010,6 @@
return false;
}
- public static final String KB_BUILDER_PROBLEM_MARKER_TYPE = "org.jboss.tools.jst.web.kb.kbBuilderProblemMarker"; //$NON-NLS-1$
-
- private static IMarker[] getOwnedMarkers(IResource r) {
- ArrayList<IMarker> l = null;
- try {
- if(r!=null && r.isAccessible()) {
- IMarker[] ms = r.findMarkers(null, false, 1);
- if(ms != null) {
- for (int i = 0; i < ms.length; i++) {
- if(ms[i] == null) continue;
-
- String _type = ms[i].getType();
- if(_type == null) continue;
- if(!_type.equals(KB_BUILDER_PROBLEM_MARKER_TYPE)) continue;
- if(!ms[i].isSubtypeOf(IMarker.PROBLEM)) continue;
-
- if(l == null)
- l = new ArrayList<IMarker>();
-
- l.add(ms[i]);
- }
- }
- }
- } catch (CoreException e) {
- WebKbPlugin.getDefault().logError(e);
- }
- return (l == null) ? null : l.toArray(new IMarker[0]);
- }
-
private static IMarker createOrUpdateKbProblemMarker(IMarker m, IResource r, boolean kbNatureIsAbsent, boolean kbBuilderIsAbsent, String natures) throws CoreException {
ArrayList<String> args = new ArrayList<String>();
@@ -1051,19 +1026,7 @@
args.add(natures);
String message = MessageFormat.format(KbMessages.KBPROBLEM, args.toArray());
- String location = MessageFormat.format(KbMessages.KBPROBLEM_LOCATION, new Object[] {r.getProject().getName()});
-
- if (m == null) {
- m = r.createMarker(KB_BUILDER_PROBLEM_MARKER_TYPE);
- r.setPersistentProperty(KbProjectFactory.NATURE_MOCK, "true"); //$NON-NLS-1$
- KbProjectFactory.getKbProject(r.getProject(), true);
- }
-
- m.setAttribute(IMarker.LOCATION, location);
- m.setAttribute(IMarker.MESSAGE, message);
- m.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING);
- m.setAttribute(IMarker.PRIORITY, IMarker.PRIORITY_NORMAL);
- return m;
+ return KbBuilderMarker.createOrUpdateKbProblemMarker(m, r, message, KbBuilderMarker.KIND_KB_NATURE_OR_BUILDER_MISSING);
}
PathCheck pathCheck = new PathCheck();
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/UsedJavaProjectCheck.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/UsedJavaProjectCheck.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/UsedJavaProjectCheck.java 2011-08-03 00:11:53 UTC (rev 33476)
@@ -0,0 +1,80 @@
+package org.jboss.tools.jst.web.kb.internal.scanner;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.jboss.tools.jst.web.kb.IKbProject;
+import org.jboss.tools.jst.web.kb.KbMessages;
+import org.jboss.tools.jst.web.kb.KbProjectFactory;
+import org.jboss.tools.jst.web.kb.internal.KbBuilderMarker;
+import org.jboss.tools.jst.web.kb.internal.KbProject;
+
+public class UsedJavaProjectCheck {
+
+ public void check(KbProject project) throws CoreException {
+ if(!project.getProject().isAccessible()) {
+ return;
+ }
+ List<IProject> list = getNonKbJavaProjects(project.getProject());
+
+ IMarker[] ms = KbBuilderMarker.getOwnedMarkers(project.getProject(), KbBuilderMarker.KIND_DEPENDS_ON_NON_KB_POJECTS);
+ if(list.isEmpty()) {
+ if(ms != null) {
+ for (IMarker m: ms) {
+ m.delete();
+ }
+ }
+ } else {
+ IMarker m = (ms == null) ? null : ms[0];
+ String projectList = asText(list);
+ String messageId = list.size() == 1 ? KbMessages.KBPROBLEM_DEPENDS_ON_JAVA_SINGLE : KbMessages.KBPROBLEM_DEPENDS_ON_JAVA_MANY;
+ String message = MessageFormat.format(messageId, projectList);
+ m = KbBuilderMarker.createOrUpdateKbProblemMarker(m, project.getProject(), message, KbBuilderMarker.KIND_DEPENDS_ON_NON_KB_POJECTS);
+ }
+ }
+
+ public String asText(List<IProject> list) {
+ StringBuffer projectList = new StringBuffer();
+ for (IProject p: list) {
+ if(projectList.length() > 0) {
+ projectList.append(", "); //$NON-NLS-1$
+ }
+ projectList.append(p.getName());
+ }
+ return projectList.toString();
+ }
+
+ public List<IProject> getNonKbJavaProjects(IProject project) throws CoreException {
+ List<IProject> list = new ArrayList<IProject>();
+ if(!project.hasNature(IKbProject.NATURE_ID)) {
+ //do not check dependencies in projects without kb nature.
+ return list;
+ }
+ if(project.isAccessible() && project.hasNature(JavaCore.NATURE_ID)) {
+ IJavaProject javaProject = JavaCore.create(project);
+ IClasspathEntry[] es = javaProject.getResolvedClasspath(true);
+ for (int i = 0; i < es.length; i++) {
+ if(es[i].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(es[i].getPath().lastSegment());
+ if(p != null && p.isAccessible()
+ && p.hasNature(JavaCore.NATURE_ID)
+ && !p.hasNature(IKbProject.NATURE_ID)) {
+ list.add(p);
+ }
+ }
+ }
+
+ }
+ return list;
+ }
+
+
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/UsedJavaProjectCheck.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2011-08-02 23:41:16 UTC (rev 33475)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2011-08-03 00:11:53 UTC (rev 33476)
@@ -460,18 +460,19 @@
* @see org.jboss.tools.jst.web.kb.validation.IValidator#shouldValidate(org.eclipse.core.resources.IProject)
*/
public boolean shouldValidate(IProject project) {
+ boolean result = false;
try {
if(validateBuilderOrder(project) && isEnabled(project)) {
for (IELValidationDelegate delegate : DELEGATES) {
if(delegate.shouldValidate(project)) {
- return true;
+ result = true;
}
}
}
} catch (CoreException e) {
WebKbPlugin.getDefault().logError(e);
}
- return false;
+ return result;
}
private boolean validateBuilderOrder(IProject project) throws CoreException {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBSettingsPreferencePage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBSettingsPreferencePage.java 2011-08-02 23:41:16 UTC (rev 33475)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBSettingsPreferencePage.java 2011-08-03 00:11:53 UTC (rev 33476)
@@ -14,6 +14,7 @@
import java.beans.PropertyChangeListener;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.swt.SWT;
@@ -24,6 +25,7 @@
import org.jboss.tools.common.ui.preferences.SettingsPage;
import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory;
+import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.KbMessages;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
@@ -129,7 +131,12 @@
}
private boolean isKBEnabled(IProject project) {
- return KbProjectFactory.getKbProject(project, false) != null;
+ try {
+ return(project.isAccessible() && project.hasNature(IKbProject.NATURE_ID));
+ } catch (CoreException e) {
+ //ignore - all checks are done above
+ return false;
+ }
}
private boolean isKBEnabled() {
13 years, 5 months