JBoss Tools SVN: r32302 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-06-22 20:04:11 -0400 (Wed, 22 Jun 2011)
New Revision: 32302
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/messages.properties
Log:
https://issues.jboss.org/browse/JBIDE-9187
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/messages.properties 2011-06-22 23:47:42 UTC (rev 32301)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/messages.properties 2011-06-23 00:04:11 UTC (rev 32302)
@@ -1,6 +1,6 @@
CDI_SEAM_EXT_PLUGIN_NO_MESSAGE=No message
CDI_SEAM_RESOURCE_LOADING_HYPERLINK=Open Resource ''{0}''
-CDI_SEAM_CONFIG_OPEN_TAG=Open Seam Config tag {0}
+CDI_SEAM_CONFIG_OPEN_TAG=Open Corresponding Java Source for ''{0}'' tag
CDI_INJECTED_POINT_HYPERLINK_SHOW_GENERIC_BEANS=Show All Generic Configuration Points...
CDI_INJECTED_POINT_HYPERLINK_SHOW_SEAM_CONFIG_BEANS=Show All Seam Config Bean Definitions...
OPEN_GENERIC_BEAN=Open Generic Configuration Point {0}
14 years, 9 months
JBoss Tools SVN: r32301 - branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-22 19:47:42 -0400 (Wed, 22 Jun 2011)
New Revision: 32301
Modified:
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
Log:
JBIDE-9207
https://issues.jboss.org/browse/JBIDE-9207
Modified: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-06-22 23:41:22 UTC (rev 32300)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-06-22 23:47:42 UTC (rev 32301)
@@ -25,6 +25,7 @@
import org.eclipse.wst.validation.internal.operations.ValidatorManager;
import org.jboss.tools.jsf.model.pv.test.JSFPromptingProviderTest;
import org.jboss.tools.jsf.model.pv.test.JsfJbide7975Test;
+import org.jboss.tools.jsf.test.project.facet.JSFFacetOnExistingProjectTest;
import org.jboss.tools.jsf.test.refactoring.ELVariableRefactoringTest;
import org.jboss.tools.jsf.test.refactoring.JSF2RefactoringTest;
import org.jboss.tools.jsf.test.refactoring.MessagePropertyRefactoringTest;
@@ -42,6 +43,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("Test model loading for JSF projects"); //$NON-NLS-1$
suite.addTestSuite(JSFTemplateTest.class);
+ suite.addTestSuite(JSFFacetOnExistingProjectTest.class);
TestSuite old = new TestSuite("Tests are using JSFKickStartOldFormat"); //$NON-NLS-1$
old.addTestSuite(JSFModelTest.class);
old.addTestSuite(ModelFormat_2_0_0_Test.class);
14 years, 9 months
JBoss Tools SVN: r32300 - in branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test: projects and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-22 19:41:22 -0400 (Wed, 22 Jun 2011)
New Revision: 32300
Added:
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/.jsdtscope
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.component
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.container
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.name
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/lib/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/build/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/build/classes/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/src/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java
Modified:
branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
Log:
JBIDE-9207
https://issues.jboss.org/browse/JBIDE-9207
Modified: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-06-22 23:11:18 UTC (rev 32299)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-06-22 23:41:22 UTC (rev 32300)
@@ -11,6 +11,7 @@
org.jboss.tools.jsf.model.pv.test,
org.jboss.tools.jsf.plugin,
org.jboss.tools.jsf.test,
+ org.jboss.tools.jsf.test.project.facet,
org.jboss.tools.jsf.test.refactoring,
org.jboss.tools.jsf.test.validation
Require-Bundle:
@@ -35,7 +36,14 @@
org.eclipse.wst.validation,
org.jboss.tools.common.el.core,
org.jboss.tools.jst.jsp,
- org.jboss.tools.common.model.test
+ org.jboss.tools.common.model.test,
+ org.eclipse.wst.common.project.facet.core,
+ org.eclipse.jst.jsf.core,
+ org.eclipse.jst.j2ee,
+ org.eclipse.wst.web,
+ org.eclipse.jst.jee.ejb,
+ org.eclipse.jst.jee.web,
+ org.eclipse.jst.jsf.common
Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath 2011-06-22 23:41:22 UTC (rev 32300)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project 2011-06-22 23:41:22 UTC (rev 32300)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>web</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/.jsdtscope
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/.jsdtscope (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/.jsdtscope 2011-06-22 23:41:22 UTC (rev 32300)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs 2011-06-22 23:41:22 UTC (rev 32300)
@@ -0,0 +1,8 @@
+#Mon Jun 20 16:47:05 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.component
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.component (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.component 2011-06-22 23:41:22 UTC (rev 32300)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="web">
+ <wb-resource deploy-path="/" source-path="/WebContent"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <property name="context-root" value="web"/>
+ <property name="java-output-path" value="/web/build/classes"/>
+ </wb-module>
+</project-modules>
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-06-22 23:41:22 UTC (rev 32300)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="java"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="jst.web"/>
+ <installed facet="java" version="1.5"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-06-22 23:41:22 UTC (rev 32300)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-06-22 23:41:22 UTC (rev 32300)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF 2011-06-22 23:41:22 UTC (rev 32300)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml 2011-06-22 23:41:22 UTC (rev 32300)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
+ <display-name>web</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/projects/web/WebContent/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java (rev 0)
+++ branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java 2011-06-22 23:41:22 UTC (rev 32300)
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.test.project.facet;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallDataModelProvider;
+import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.jboss.tools.jst.web.kb.internal.KbBuilder;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ * @author Alexey Kazakov and Viacheslav Kabanovich
+ */
+public class JSFFacetOnExistingProjectTest extends TestCase {
+
+ IProject project;
+
+ @Override
+ protected void setUp() throws Exception {
+ project = ResourcesUtils.importProject("org.jboss.tools.jsf.test", "projects/web");
+ JobUtils.waitForIdle();
+
+ IFacetedProject fproj = ProjectFacetsManager.create(project);
+
+ IProjectFacet jsfFacet = ProjectFacetsManager.getProjectFacet("jst.jsf");
+ IProjectFacetVersion jsfFacetVersion = jsfFacet.getVersion("1.2");
+
+ fproj.installProjectFacet(jsfFacetVersion, createJSFDataModel(), null);
+ JobUtils.waitForIdle();
+ }
+
+ public void testJSFProjectBuilders() throws CoreException {
+ ICommand[] cs = project.getDescription().getBuildSpec();
+ int validation = -1;
+ int kb = -1;
+ for (int i = 0; i < cs.length; i++) {
+ ICommand c = cs[i];
+ if(ValidationPlugin.VALIDATION_BUILDER_ID.equals(c.getBuilderName())) {
+ validation = i;
+ } else if(KbBuilder.BUILDER_ID.equals(c.getBuilderName())) {
+ kb = i;
+ }
+ }
+ assertTrue(kb >= 0);
+ assertTrue(validation > kb);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ ResourcesUtils.deleteProject(project.getName());
+ JobUtils.waitForIdle();
+ }
+
+ protected IDataModel createJSFDataModel() {
+ IDataModel config = DataModelFactory.createDataModel(new JSFFacetInstallDataModelProvider());
+ return config;
+ }
+}
\ No newline at end of file
Property changes on: branches/jbosstools-3.3.0.M2/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/project/facet/JSFFacetOnExistingProjectTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 9 months
JBoss Tools SVN: r32299 - branches/jbosstools-3.3.0.M2/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-22 19:11:18 -0400 (Wed, 22 Jun 2011)
New Revision: 32299
Modified:
branches/jbosstools-3.3.0.M2/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java
Log:
JBIDE-9207
https://issues.jboss.org/browse/JBIDE-9207
Modified: branches/jbosstools-3.3.0.M2/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java
===================================================================
--- branches/jbosstools-3.3.0.M2/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java 2011-06-22 22:58:34 UTC (rev 32298)
+++ branches/jbosstools-3.3.0.M2/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java 2011-06-22 23:11:18 UTC (rev 32299)
@@ -7,7 +7,9 @@
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jsf.project.JSFNature;
+import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.kb.IKbProject;
+import org.jboss.tools.jst.web.kb.internal.KbBuilder;
/**
*
@@ -21,8 +23,8 @@
*/
public void execute(IProject project, IProjectFacetVersion fv,
Object config, IProgressMonitor monitor) throws CoreException {
- EclipseResourceUtil.addNatureToProject(project, JSFNature.NATURE_ID);
- EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID);
+ WebModelPlugin.addNatureToProjectWithValidationSupport(project, KbBuilder.BUILDER_ID, IKbProject.NATURE_ID);
+ EclipseResourceUtil.addNatureToProject(project, JSFNature.NATURE_ID);
}
}
14 years, 9 months
JBoss Tools SVN: r32298 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-06-22 18:58:34 -0400 (Wed, 22 Jun 2011)
New Revision: 32298
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd
Log:
https://issues.jboss.org/browse/JBIDE-9202 : Possibility for creating templates for custom libraries
[derived work on the Maxim Areshkau's patch]
- added matching-mode for the vpe:temlate-taglib tag
- changed JSF2 custom composite template declaration using matching-mode
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2011-06-22 22:46:50 UTC (rev 32297)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2011-06-22 22:58:34 UTC (rev 32298)
@@ -8,6 +8,15 @@
prefix="f" />
<vpe:template-taglib uri="http://java.sun.com/jsf/composite"
prefix="composite" />
+
+ <vpe:template-taglib uri="http://java\.sun\.com/jsf/composite/.+" matching-mode="yes"
+ prefix="jsf2-custom-composite" />
+
+ <vpe:tag name="jsf2-custom-composite:.+" matching-mode="yes" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.jsf.template.Jsf2CustomComponentTemplate">
+ </vpe:template>
+ </vpe:tag>
<vpe:tag name="f:loadBundle" case-sensitive="yes">
<vpe:template children="no" modify="no">
@@ -1188,11 +1197,6 @@
<!-- </vpe:if>-->
</vpe:tag>
- <vpe:tag name="vpejsf2customTemplate" case-sensitive="yes">
- <vpe:template children="yes" modify="yes"
- class="org.jboss.tools.jsf.vpe.jsf.template.Jsf2CustomComponentTemplate">
- </vpe:template>
- </vpe:tag>
<!-- Default template -->
<vpe:template children="yes" modify="no">
<vpe:any value="{name()}" title="{tagstring()}" />
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2011-06-22 22:46:50 UTC (rev 32297)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2011-06-22 22:58:34 UTC (rev 32298)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.vpe.editor.template;
+import java.io.Console;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -36,6 +37,7 @@
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.custom.CustomTLDReference;
import org.jboss.tools.vpe.editor.template.textformating.TextFormatingData;
+import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.editor.util.SourceDomUtil;
import org.jboss.tools.vpe.editor.util.XmlUtil;
@@ -247,6 +249,9 @@
//added by Denis Vinnichek, for tags which are defined with regexp
static final String ATTR_TAG_MATCHING_MODE = "matching-mode"; //$NON-NLS-1$
+
+ // for taglibs which are defined with regexp
+ static final String ATTR_TEMPLATE_TAGLIB_MATCHING_MODE = ATTR_TAG_MATCHING_MODE;
private static VpeTemplateManager instance = null;
private static Object monitor = new Object();
@@ -255,6 +260,7 @@
* Contains Mapping from URI and namespace
*/
private Map<String,String> templateTaglibs = new HashMap<String,String>();
+ private Map<String,String> matchingTemplateTaglibs = new HashMap<String,String>();
private Map<String,VpeTemplateSet> caseSensitiveTags = new HashMap<String,VpeTemplateSet>();
private Map<String,VpeTemplateSet> ignoreSensitiveTags = new HashMap<String,VpeTemplateSet>();
@@ -280,8 +286,6 @@
//mareshkau, contains a name of custom template
private static final String CUSTOM_TEMPLATE_NAME="vpeCustomTemplate"; //$NON-NLS-1$
- private static final String JSF2_CUSTOM_TEMPLATE="vpejsf2customTemplate"; //$NON-NLS-1$
-
/**
* added by Max Areshkau, JBIDE-1494
* Contains default text formating data
@@ -439,10 +443,7 @@
&& CustomTLDReference.isExistInCustomTlds(pageContext,sourceNodeUri)) {
return VpeTemplateManager.CUSTOM_TEMPLATE_NAME;
}
- if(sourceNodeUri!=null
- &&CustomTLDReference.isExistInJsf2CustomComponenets(pageContext,sourceNodeUri,sourceNode.getLocalName()) ) {
- return VpeTemplateManager.JSF2_CUSTOM_TEMPLATE;
- }
+
return sourceNode.getNodeName();
default :
return null;
@@ -451,7 +452,16 @@
}
public String getTemplateTaglibPrefix(String sourceUri) {
- return (String)templateTaglibs.get(sourceUri);
+ String result = templateTaglibs.get(sourceUri);
+ if(result == null){
+ for ( Map.Entry<String, String> entry: matchingTemplateTaglibs.entrySet()) {
+ if(sourceUri.matches( entry.getKey() )){
+ result = entry.getValue();
+ break;
+ }
+ }
+ }
+ return result;
}
private void load() {
@@ -504,7 +514,8 @@
} else if (TAG_TEMPLATE.equals(node.getNodeName())) {
setDefTemplate(createTemplate((Element)node,confElement, true));
} else if (TAG_TEMPLATE_TAGLIB.equals(node.getNodeName())) {
- setTemplateTaglib((Element)node);
+ boolean templateTaglibMatchingMode = Constants.YES_STRING.equals(( (Element) node).getAttribute(VpeTemplateManager.ATTR_TEMPLATE_TAGLIB_MATCHING_MODE));
+ setTemplateTaglib((Element) node, templateTaglibMatchingMode);
}
}
}
@@ -579,12 +590,16 @@
* Register templates taglibs from templates files
* @param templateTaglibElement
*/
- private void setTemplateTaglib(Element templateTaglibElement) {
+ private void setTemplateTaglib(Element templateTaglibElement, boolean templateTaglibMatchingMode) {
String uri = templateTaglibElement.getAttribute(ATTR_DIRECTIVE_TAGLIB_URI);
String pefix = templateTaglibElement.getAttribute(ATTR_DIRECTIVE_TAGLIB_PREFIX);
if (uri.length() > 0 && pefix.length() > 0) {
if (!templateTaglibs.containsKey(uri)) {
- templateTaglibs.put(uri, pefix);
+ if (templateTaglibMatchingMode) {
+ matchingTemplateTaglibs.put(uri, pefix);
+ } else {
+ templateTaglibs.put(uri, pefix);
+ }
}
}
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd 2011-06-22 22:46:50 UTC (rev 32297)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd 2011-06-22 22:58:34 UTC (rev 32298)
@@ -119,6 +119,7 @@
<xsd:complexType name="TEMPLATE-TAGLIB">
<xsd:attribute name="prefix" use="required" type="xsd:NCName"/>
<xsd:attribute name="uri" use="required" type="xsd:anyURI"/>
+ <xsd:attribute name="matching-mode" use="optional" type="vpe:VPE-BOOLEAN"/>
</xsd:complexType>
<!-- -->
<xsd:complexType name="RESIZE">
@@ -353,6 +354,9 @@
<xsd:attribute name="disabled" type="xsd:string" use="optional"/>
<xsd:attribute name="id" type="xsd:string" use="optional"/>
<xsd:attribute name="name" type="xsd:string" use="optional"/>
+ <xsd:attribute name="height" type="xsd:string" use="optional"/>
+ <xsd:attribute name="width" type="xsd:string" use="optional"/>
+ <xsd:attribute name="placeholder" type="xsd:string" use="optional"/>
</xsd:complexType>
<!-- -->
<xsd:complexType name="HTML_DIV" mixed="true">
@@ -418,7 +422,7 @@
<xsd:attribute name="value" type="xsd:string" use="optional"/>
</xsd:complexType>
<!-- -->
- <xsd:complexType name="HTML_OPTION">
+ <xsd:complexType name="HTML_OPTION" mixed="true">
<xsd:sequence>
<xsd:element name="value" minOccurs="0" type="vpe:VALUE" />
</xsd:sequence>
14 years, 9 months
JBoss Tools SVN: r32297 - branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-22 18:46:50 -0400 (Wed, 22 Jun 2011)
New Revision: 32297
Modified:
branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
Log:
added comment about necesssary cleanup
Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
===================================================================
--- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-06-22 22:42:32 UTC (rev 32296)
+++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-06-22 22:46:50 UTC (rev 32297)
@@ -53,6 +53,8 @@
JBoss7Server server = (JBoss7Server)getServer().loadAdapter(JBoss7Server.class, new NullProgressMonitor());
if( server != null )
return server.getManagementPort();
+ // TODO: provide this default in a single place (currently it is spread across the
+ // behavior and this poller)
return 9999;
}
14 years, 9 months
JBoss Tools SVN: r32296 - branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-22 18:42:32 -0400 (Wed, 22 Jun 2011)
New Revision: 32296
Modified:
branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-controller-client-7.0.0.Beta4-SNAPSHOT.jar
branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-protocol-7.0.0.Beta4-SNAPSHOT.jar
Log:
[JBIDE-9173] built latest jars and replaced current ones
Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-controller-client-7.0.0.Beta4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-protocol-7.0.0.Beta4-SNAPSHOT.jar
===================================================================
(Binary files differ)
14 years, 9 months
JBoss Tools SVN: r32295 - in trunk/ws: plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/utils and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-06-22 17:49:46 -0400 (Wed, 22 Jun 2011)
New Revision: 32295
Modified:
trunk/ws/
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/utils/JdtUtils.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java
Log:
applied patches from M2 branch for JBIDE-9230 and JBIDE-9220 avoiding freezeson enablement of JAX-RS and NPE for codeassist
Property changes on: trunk/ws
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/jbosstools-3.3.0.M2/ws:32168-32293
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/utils/JdtUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/utils/JdtUtils.java 2011-06-22 21:48:21 UTC (rev 32294)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/utils/JdtUtils.java 2011-06-22 21:49:46 UTC (rev 32295)
@@ -252,12 +252,15 @@
* the progress monitor
* @return compilationUnit the DOM CompilationUnit returned by the parse()
* method. This operation is expensive and should be performed only
- * once for each type.
+ * once for each type. Returns null if the given member was null.
* @throws JavaModelException
* in case of exception underneath...
*/
public static CompilationUnit parse(final IMember member, final IProgressMonitor progressMonitor)
throws JavaModelException {
+ if (member == null) {
+ return null;
+ }
IType type = null;
if (member.getElementType() == IMember.TYPE) {
type = (IType) member;
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java 2011-06-22 21:48:21 UTC (rev 32294)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsContentProvider.java 2011-06-22 21:49:46 UTC (rev 32295)
@@ -53,33 +53,11 @@
if (!uriPathTemplateCategories.containsKey(project)) {
Metamodel metamodel = Metamodel.get(project);
if (metamodel == null) {
- // trigger background build and immediately return a
- // temporary element to the UI
- Job[] jobs = Job.getJobManager().find(null);
- if (jobs != null) {
- for (Job job : jobs) {
- if (job.belongsTo(ResourcesPlugin.FAMILY_AUTO_BUILD)
- || job.belongsTo(ResourcesPlugin.FAMILY_AUTO_REFRESH)
- || job.belongsTo(ResourcesPlugin.FAMILY_MANUAL_BUILD)
- || job.belongsTo(ResourcesPlugin.FAMILY_MANUAL_REFRESH)
- && job.getState() == Job.RUNNING) {
- // joining running job
- Logger.debug("Joining Running job: " + job.getName() + "(blocking="
- + job.isBlocking() + "/state=" + job.getState() + ")");
- job.join();
- Logger.debug("Job finished: " + job.getName());
- }
- }
- }
- // after running job is done, check if the metamodel
- // was
- // built, otherwise, force it.
- metamodel = Metamodel.get(project);
- if (metamodel == null) {
- Logger.debug("Metamodel is (still) null for project '" + project.getName() + "'");
- CoreUtility.startBuildInBackground(project);
- return new Object[] { new WaitWhileBuildingElement() };
- }
+ Logger.debug("Metamodel needs to be built for project '" + project.getName() + "'");
+ Job buildJob = CoreUtility.getBuildJob(project);
+ buildJob.setRule(ResourcesPlugin.getWorkspace().getRoot());
+ buildJob.schedule();
+ return new Object[] { new WaitWhileBuildingElement() };
}
UriPathTemplateCategory uriPathTemplateCategory = new UriPathTemplateCategory(this, metamodel,
project);
@@ -88,10 +66,6 @@
return new Object[] { uriPathTemplateCategories.get(project) };
} catch (CoreException e) {
Logger.error("Failed to retrieve JAX-RS Metamodel in project '" + project.getName() + "'", e);
- } catch (InterruptedException e) {
- Logger.error(
- "Failed to join currently running job while building or retrieving metamodel for project '"
- + project.getName() + "'", e);
} finally {
long endTime = new Date().getTime();
Logger.debug("JAX-RS Metamodel UI for project '" + project.getName() + "' refreshed in "
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java 2011-06-22 21:48:21 UTC (rev 32294)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java 2011-06-22 21:49:46 UTC (rev 32295)
@@ -21,6 +21,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
@@ -40,6 +41,7 @@
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.viewers.StyledString;
import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.ws.jaxrs.core.configuration.ProjectNatureUtils;
import org.jboss.tools.ws.jaxrs.core.utils.JdtUtils;
import org.jboss.tools.ws.jaxrs.ui.JBossJaxrsUIPlugin;
import org.jboss.tools.ws.jaxrs.ui.internal.utils.Logger;
@@ -78,7 +80,16 @@
final IProgressMonitor monitor) {
JavaContentAssistInvocationContext javaContext = (JavaContentAssistInvocationContext) context;
try {
+
+ IJavaProject project = javaContext.getProject();
+ // skip if the JAX-RS Nature is not configured for this project
+ if (!ProjectNatureUtils.isProjectNatureInstalled(project.getProject(), ProjectNatureUtils.JAXRS_NATURE_ID)) {
+ return Collections.emptyList();
+ }
CompilationUnit compilationUnit = resolveContextualCompilationUnit(monitor, javaContext);
+ if (compilationUnit == null) {
+ return Collections.emptyList();
+ }
IJavaElement invocationElement = javaContext.getCompilationUnit().getElementAt(
context.getInvocationOffset());
if (invocationElement.getElementType() == IJavaElement.METHOD) {
@@ -222,6 +233,11 @@
* in case of underlying exception
*/
private IType getEnclosingType(final IJavaElement element) throws JavaModelException {
+ if (element == null) {
+ // no enclosing parent. For example, an annotation is set before the
+ // method itself was written.
+ return null;
+ }
switch (element.getElementType()) {
case IJavaElement.TYPE:
return (IType) element;
14 years, 9 months
JBoss Tools SVN: r32294 - in trunk: cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-06-22 17:48:21 -0400 (Wed, 22 Jun 2011)
New Revision: 32294
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/XMLInjectedPointHyperlinkDetector.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/XMLInjectedPointHyperlinkDetectorTest.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java
Log:
https://issues.jboss.org/browse/JBIDE-9187
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/plugin.xml 2011-06-22 21:42:40 UTC (rev 32293)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/plugin.xml 2011-06-22 21:48:21 UTC (rev 32294)
@@ -11,26 +11,26 @@
targetId="org.eclipse.jdt.ui.javaCode">
</hyperlinkDetector>
- </extension>
-
- <extension
- point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
<hyperlinkDetector
class="org.jboss.tools.cdi.seam.text.ext.hyperlink.GenericInjectedPointHyperlinkDetector"
id="org.jboss.tools.cdi.seam.text.ext.hyperlink.GenericInjectedPointHyperlinkDetector"
name="%GenericInjectedPointHyperlinkDetector"
targetId="org.eclipse.jdt.ui.javaCode">
</hyperlinkDetector>
- </extension>
- <extension
- point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
<hyperlinkDetector
class="org.jboss.tools.cdi.seam.text.ext.hyperlink.SeamConfigInjectedPointHyperlinkDetector"
id="org.jboss.tools.cdi.seam.text.ext.hyperlink.SeamConfigInjectedPointHyperlinkDetector"
name="%SeamConfigInjectedPointHyperlinkDetector"
targetId="org.eclipse.jdt.ui.javaCode">
</hyperlinkDetector>
+
+ <hyperlinkDetector
+ class="org.jboss.tools.cdi.seam.text.ext.hyperlink.XMLInjectedPointHyperlinkDetector"
+ id="org.jboss.tools.cdi.seam.text.ext.hyperlink.XMLInjectedPointHyperlinkDetector"
+ name="%XMLInjectedPointHyperlinkDetector"
+ targetId="org.eclipse.core.runtime.xml">
+ </hyperlinkDetector>
</extension>
<extension
@@ -80,4 +80,4 @@
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/XMLInjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/XMLInjectedPointHyperlinkDetector.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/XMLInjectedPointHyperlinkDetector.java 2011-06-22 21:48:21 UTC (rev 32294)
@@ -0,0 +1,156 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.text.ext.hyperlink;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
+import org.jboss.tools.cdi.core.CDICoreNature;
+import org.jboss.tools.cdi.core.CDIUtil;
+import org.jboss.tools.cdi.seam.config.core.CDISeamConfigExtension;
+import org.jboss.tools.cdi.seam.config.core.definition.SeamBeansDefinition;
+import org.jboss.tools.cdi.seam.config.core.definition.SeamFieldDefinition;
+import org.jboss.tools.cdi.seam.config.core.definition.SeamMemberDefinition;
+import org.jboss.tools.cdi.seam.config.core.definition.SeamMethodDefinition;
+import org.jboss.tools.cdi.seam.config.core.util.Util;
+import org.jboss.tools.cdi.seam.text.ext.CDISeamExtPlugin;
+import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetector;
+import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
+import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+public class XMLInjectedPointHyperlinkDetector extends InjectedPointHyperlinkDetector{
+ private static final String INJECT_NAME = "Inject";
+ private static final String INJECT_URI = "urn:java:ee";
+
+ public IHyperlink[] detectHyperlinks(ITextViewer textViewer,
+ IRegion region, boolean canShowMultipleHyperlinks) {
+
+ this.viewer = textViewer;
+
+ if (region == null || !canShowMultipleHyperlinks)
+ return null;
+
+ IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+
+ if(!(editor instanceof EditorPartWrapper))
+ return null;
+
+ IEditorInput input = ((EditorPartWrapper)editor).getEditorInput();
+
+ if(!(input instanceof FileEditorInput))
+ return null;
+
+ IFile file = ((FileEditorInput)input).getFile();
+
+ if(file == null)
+ return null;
+
+ CDICoreNature cdiNature = CDIUtil.getCDINatureWithProgress(file.getProject());
+ if(cdiNature == null)
+ return null;
+
+ document = textViewer.getDocument();
+
+ ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
+
+ Node node = getTagNode(region.getOffset() );
+ if(node == null) return null;
+
+ int offset= ((IndexedRegion)node).getStartOffset();
+
+ String uri = getURI(node);
+ IJavaElement element = null;
+ IType type = Util.resolveType(node.getLocalName(), uri, cdiNature);
+ if(type != null) {
+ element = type;
+ } else {
+ SeamMemberDefinition def = find(cdiNature, offset, file);
+ if(def instanceof SeamFieldDefinition) {
+ element = ((SeamFieldDefinition)def).getField();
+ } else if(def instanceof SeamMethodDefinition) {
+ element = ((SeamMethodDefinition)def).getMethod();
+ }
+ }
+ if(element != null) {
+ IFile elementFile = null;
+ try{
+ elementFile = (IFile)element.getUnderlyingResource();
+ }catch(JavaModelException ex){
+ CDISeamExtPlugin.log(ex);
+ }
+
+ if(elementFile != null)
+ findInjectedBeans(cdiNature, element, offset, elementFile, hyperlinks);
+
+ if (hyperlinks != null && !hyperlinks.isEmpty()) {
+ return (IHyperlink[])hyperlinks.toArray(new IHyperlink[hyperlinks.size()]);
+ }
+ }
+ return null;
+ }
+
+ private Node getTagNode(int offset) {
+ StructuredModelWrapper smw = new StructuredModelWrapper();
+ smw.init(document);
+ try {
+ Document xmlDocument = smw.getDocument();
+ if (xmlDocument == null) return null;
+
+ Node node = Utils.findNodeForOffset(xmlDocument, offset);
+ if(node == null) return null;
+
+ if(node instanceof IDOMElement){
+ if(INJECT_NAME.equals(node.getLocalName()) &&
+ INJECT_URI.equals(node.getNamespaceURI())){
+ return node.getParentNode();
+ }else if(offset >= ((IDOMElement)node).getStartOffset() && offset <= ((IDOMElement)node).getStartEndOffset())
+ return node;
+ }
+ return null;
+ } finally {
+ smw.dispose();
+ }
+ }
+
+ SeamMemberDefinition find(CDICoreNature cdi, int offset, IFile documentFile) {
+ CDISeamConfigExtension ext = CDISeamConfigExtension.getExtension(cdi);
+ if(ext == null) return null;
+ SeamBeansDefinition def = ext.getContext().getDefinition(documentFile.getFullPath());
+ if(def == null) return null;
+ return def.findExactly(offset);
+ }
+
+ private String getURI(Node node) {
+ String nodeName = node.getNodeName();
+ if (nodeName.indexOf(':') == -1) return null;
+ String nodePrefix = nodeName.substring(0, nodeName.indexOf(":")); //$NON-NLS-1$
+ if (nodePrefix == null || nodePrefix.length() == 0) return null;
+ Map trackers = JSPRootHyperlinkPartitioner.getTrackersMap(document, ((IndexedRegion)node).getStartOffset());
+ return (String)(trackers == null ? null : trackers.get(nodePrefix));
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/XMLInjectedPointHyperlinkDetector.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2011-06-22 21:42:40 UTC (rev 32293)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2011-06-22 21:48:21 UTC (rev 32294)
@@ -40,8 +40,8 @@
public class InjectedPointHyperlinkDetector extends AbstractHyperlinkDetector{
private IRegion region;
- private IDocument document;
- private ITextViewer viewer;
+ protected IDocument document;
+ protected ITextViewer viewer;
public IHyperlink[] detectHyperlinks(ITextViewer textViewer,
IRegion region, boolean canShowMultipleHyperlinks) {
@@ -115,7 +115,7 @@
return null;
}
- private void findInjectedBeans(CDICoreNature nature, IJavaElement element, int offset, IFile file, ArrayList<IHyperlink> hyperlinks){
+ protected void findInjectedBeans(CDICoreNature nature, IJavaElement element, int offset, IFile file, ArrayList<IHyperlink> hyperlinks){
ICDIProject cdiProject = nature.getDelegate();
if(cdiProject == null){
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java 2011-06-22 21:42:40 UTC (rev 32293)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java 2011-06-22 21:48:21 UTC (rev 32294)
@@ -33,6 +33,7 @@
TestSuite suiteConfig = new TestSuite("CDI Seam Config OpenOns Tests");
suiteConfig.addTestSuite(SeamConfigTagNameHyperlinkTest.class);
suiteConfig.addTestSuite(SeamConfigInjectedPointHyperlinkTest.class);
+ suiteConfig.addTestSuite(XMLInjectedPointHyperlinkDetectorTest.class);
suiteAll.addTest(new SeamConfigTestSetup(suiteConfig));
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/XMLInjectedPointHyperlinkDetectorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/XMLInjectedPointHyperlinkDetectorTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/XMLInjectedPointHyperlinkDetectorTest.java 2011-06-22 21:48:21 UTC (rev 32294)
@@ -0,0 +1,27 @@
+package org.jboss.tools.cdi.seam.text.ext.test;
+
+import java.util.ArrayList;
+
+import org.jboss.tools.cdi.seam.config.core.test.SeamConfigTest;
+import org.jboss.tools.cdi.seam.text.ext.hyperlink.XMLInjectedPointHyperlinkDetector;
+import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
+import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlink;
+import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil;
+import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil.TestHyperlink;
+import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil.TestRegion;
+
+public class XMLInjectedPointHyperlinkDetectorTest extends SeamConfigTest{
+ private static final String FILENAME = "src/META-INF/seam-beans.xml";
+
+ public void testXMLInjectedPointHyperlinkDetector() throws Exception {
+ ArrayList<TestRegion> regionList = new ArrayList<TestRegion>();
+
+ regionList.add(new TestRegion(2166, 15, new TestHyperlink[]{
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " MyBean6.myType6")
+ //new TestHyperlink(AlternativeInjectedPointListHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES)
+ }));
+
+ CDIHyperlinkTestUtil.checkRegions(project, FILENAME, regionList, new XMLInjectedPointHyperlinkDetector());
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/XMLInjectedPointHyperlinkDetectorTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2011-06-22 21:42:40 UTC (rev 32293)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2011-06-22 21:48:21 UTC (rev 32294)
@@ -18,7 +18,8 @@
org.eclipse.wst.xml.ui,
org.eclipse.jface;bundle-version="3.6.0",
org.jboss.tools.cdi.core;bundle-version="1.2.0",
- org.jboss.tools.common.el.core;bundle-version="3.3.0"
+ org.jboss.tools.common.el.core;bundle-version="3.3.0",
+ org.jboss.tools.jst.web.ui;bundle-version="3.3.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.cdi.text.ext.test
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-06-22 21:42:40 UTC (rev 32293)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-06-22 21:48:21 UTC (rev 32294)
@@ -35,9 +35,11 @@
import org.jboss.tools.cdi.text.ext.hyperlink.ITestableCDIHyperlink;
import org.jboss.tools.common.editor.ObjectMultiPageEditor;
import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
+import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorStandAlone;
import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector;
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
import org.jboss.tools.common.text.ext.util.AxisUtil;
+import org.jboss.tools.jst.web.ui.editors.WebCompoundEditor;
public class CDIHyperlinkTestUtil extends TestCase{
public static void checkRegions(IProject project, String fileName, List<TestRegion> regionList, AbstractHyperlinkDetector elPartitioner) throws Exception {
@@ -77,9 +79,20 @@
ISourceViewer viewer = null;
if(part instanceof JavaEditor){
viewer = ((JavaEditor)part).getViewer();
- }
+ elPartitioner.setContext(new TestContext((ITextEditor)part));
+ }else if(part instanceof EditorPartWrapper){
+ if(((EditorPartWrapper)part).getEditor() instanceof WebCompoundEditor){
+ WebCompoundEditor wce = (WebCompoundEditor)((EditorPartWrapper)part).getEditor();
+ viewer = wce.getSourceEditor().getTextViewer();
+ elPartitioner.setContext(new TestContext(wce.getSourceEditor()));
+ }else if(((EditorPartWrapper)part).getEditor() instanceof XMLTextEditorStandAlone){
+ XMLTextEditorStandAlone xtesa = (XMLTextEditorStandAlone)((EditorPartWrapper)part).getEditor();
+ viewer = xtesa.getTextViewer();
+ elPartitioner.setContext(new TestContext(xtesa));
+ }else fail("unsupported editor type - "+((EditorPartWrapper)part).getEditor().getClass());
+ }else fail("unsupported editor type - "+part.getClass());
- elPartitioner.setContext(new TestContext((ITextEditor)part));
+
int counter = 0;
for (int i = 0; i < document.getLength(); i++) {
@@ -87,6 +100,8 @@
IHyperlink[] links = elPartitioner.detectHyperlinks(viewer, testData.getHyperlinkRegion(), true);
boolean recognized = links != null;
+// if(recognized)
+// System.out.println("Recognized - "+i);
if (recognized) {
counter++;
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java 2011-06-22 21:42:40 UTC (rev 32293)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java 2011-06-22 21:48:21 UTC (rev 32294)
@@ -104,34 +104,20 @@
* @since 3.1
*/
public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) {
- if (fPreferenceStore == null)
- return null;
- if (sourceViewer == null || !fPreferenceStore.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED))
- return null;
-
List<IHyperlinkDetector> allDetectors = new ArrayList<IHyperlinkDetector>(0);
IHyperlinkDetector extHyperlinkDetector = getTextEditorsExtensionsHyperlinkDetector();
if (extHyperlinkDetector != null) allDetectors.add(extHyperlinkDetector);
-/*
IHyperlinkDetector[] superDetectors = super.getHyperlinkDetectors(sourceViewer);
- for (int m = 0; m < superDetectors.length; m++) {
- IHyperlinkDetector detector = superDetectors[m];
+ for (IHyperlinkDetector detector : superDetectors) {
if (!allDetectors.contains(detector)) {
allDetectors.add(detector);
}
}
-*/
- IHyperlinkDetector[] ts = (IHyperlinkDetector[]) allDetectors.toArray(new IHyperlinkDetector[0]);
- IHyperlinkDetector[] in = (initial != null) ? initial.getHyperlinkDetectors(sourceViewer) : null;
- if(in == null || in.length == 0) return ts;
- if(ts == null || ts.length == 0) return in;
- ArrayList<IHyperlinkDetector> total = new ArrayList<IHyperlinkDetector>();
- for (int i = 0; i < ts.length; i++) total.add(ts[i]);
- for (int i = 0; i < in.length; i++) if(!total.contains(in[i])) total.add(in[i]);
- return total.toArray(new IHyperlinkDetector[0]);
+
+ return allDetectors.toArray(new IHyperlinkDetector[0]);
}
@SuppressWarnings("deprecation")
14 years, 9 months
JBoss Tools SVN: r32293 - in branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core: jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-22 17:42:40 -0400 (Wed, 22 Jun 2011)
New Revision: 32293
Modified:
branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
[JBIDE-9173] terminating process when stopping the server (was: using mgmt api) and commented mgmt api poller
Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-22 21:41:13 UTC (rev 32292)
+++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-22 21:42:40 UTC (rev 32293)
@@ -24,6 +24,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.debug.core.DebugEvent;
+import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.IDebugEventSetListener;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
@@ -38,11 +39,9 @@
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
-import org.jboss.ide.eclipse.as.core.util.ServerConverter;
public class JBoss7ServerBehavior extends JBossServerBehavior {
@@ -165,20 +164,22 @@
}
try {
if (force) {
- if( serverProcess != null )
- serverProcess.terminate();
+ terminateProcess();
} else {
serverStopping();
// TODO: for now only local, implement for remote afterwards
- if (isServerRunning(getServer().getHost(), getJBoss7Server().getManagementPort())) {
- // The service and Poller will make sure the server is down
- getService().stop(getServer().getHost(), getJBoss7Server().getManagementPort());
- return;
- } else {
- if( serverProcess != null && !serverProcess.isTerminated()) {
- serverProcess.terminate();
- }
- }
+// disabled because of JBIDE-9173
+// try {
+// if (isServerRunning(getServer().getHost(), getJBoss7Server().getManagementPort())) {
+// // The service and Poller will make sure the server is down
+// getService().stop(getServer().getHost(), getJBoss7Server().getManagementPort());
+// return;
+// } else {
+ terminateProcess();
+// }
+// } catch(Exception e) {
+// terminateProcess();
+// }
}
} catch (Exception e) {
IStatus status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, MessageFormat.format(Messages.JBoss7ServerBehavior_could_not_stop, getServer().getName()), e);
@@ -187,6 +188,12 @@
setServerStopped();
}
+ private void terminateProcess() throws DebugException {
+ if( serverProcess != null && !serverProcess.isTerminated()) {
+ serverProcess.terminate();
+ }
+ }
+
@Override
public void dispose() {
super.dispose();
Modified: branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-06-22 21:41:13 UTC (rev 32292)
+++ branches/jbosstools-3.3.0.M2/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-06-22 21:42:40 UTC (rev 32293)
@@ -729,13 +729,14 @@
supportsShutdown="true"
supportsStartup="true">
</serverPoller>
+<!-- disabled because of JBIDE-9173
<serverPoller
class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagerServicePoller"
id="org.jboss.ide.eclipse.as.core.server.JBoss7ManagerServicePoller"
name="JBoss 7 Manager Service Poller"
supportsShutdown="true"
supportsStartup="true">
- </serverPoller>
+ </serverPoller> -->
</extension>
14 years, 9 months