JBoss Tools SVN: r38389 - in trunk/jst/tests/org.jboss.tools.jst.web.test: .settings and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-01 20:40:01 -0500 (Wed, 01 Feb 2012)
New Revision: 38389
Added:
trunk/jst/tests/org.jboss.tools.jst.web.test/.settings/
trunk/jst/tests/org.jboss.tools.jst.web.test/.settings/org.eclipse.jdt.core.prefs
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.classpath
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.project
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/.jsdtscope
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.jdt.core.prefs
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.component
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/META-INF/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/WEB-INF/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/WEB-INF/lib/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/build/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/build/classes/
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/inputUserName.jsp
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/src/
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2Test.java
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2TestSetup.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java
Log:
JBIDE-10739
https://issues.jboss.org/browse/JBIDE-10739
Tests are added.
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/.settings/org.eclipse.jdt.core.prefs 2012-02-02 01:40:01 UTC (rev 38389)
@@ -0,0 +1,8 @@
+#Fri Sep 30 12:13:50 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: trunk/jst/tests/org.jboss.tools.jst.web.test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2012-02-02 01:06:45 UTC (rev 38388)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2012-02-02 01:40:01 UTC (rev 38389)
@@ -16,7 +16,8 @@
org.eclipse.jst.standard.schemas,
org.eclipse.wst.common.frameworks;bundle-version="1.2.0",
org.eclipse.ui,
- org.eclipse.wst.validation;bundle-version="1.2.0"
+ org.eclipse.wst.validation;bundle-version="1.2.0",
+ org.eclipse.jface.text
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.jst.web.test
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.classpath (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.classpath 2012-02-02 01:40:01 UTC (rev 38389)
@@ -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">
+ <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: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.project (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.project 2012-02-02 01:40:01 UTC (rev 38389)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>testProjectRootAsWebContent</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.jboss.tools.jst.web.kb.kbbuilder</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>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/.jsdtscope
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/.jsdtscope (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/.jsdtscope 2012-02-02 01:40:01 UTC (rev 38389)
@@ -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: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.jdt.core.prefs 2012-02-02 01:40:01 UTC (rev 38389)
@@ -0,0 +1,8 @@
+#Wed Feb 01 15:04:35 PST 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.component 2012-02-02 01:40:01 UTC (rev 38389)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="testProjectRootAsWebContent">
+ <wb-resource deploy-path="/" source-path="/"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <property name="context-root" value="testProjectRootAsWebContent"/>
+ <property name="java-output-path" value="/testProjectRootAsWebContent/build/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-02-02 01:40:01 UTC (rev 38389)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="java"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="wst.jsdt.web"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="3.0"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-02-02 01:40:01 UTC (rev 38389)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-02-02 01:40:01 UTC (rev 38389)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/META-INF/MANIFEST.MF 2012-02-02 01:40:01 UTC (rev 38389)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/inputUserName.jsp
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/inputUserName.jsp (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testProjectRootAsWebContent/inputUserName.jsp 2012-02-02 01:40:01 UTC (rev 38389)
@@ -0,0 +1,29 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<f:loadBundle var="Message" basename="demo.Messages"/>
+
+<html>
+ <head>
+ <title>Input User Name Page</title>
+ </head>
+ <body>
+
+ <f:view>
+ <h1><h:outputText value="#{Message.header}" id="q"/></h1>
+
+ <h:messages style="color: red"/>
+
+ <h:form id="greetingForm">
+ <h:outputText value="#{Message.header}"/>
+ <h:inputText value="#{user.name}" required="true">
+ <f:validateLength maximum="30" minimum="3"/>
+ </h:inputText>
+
+ <h:commandButton action="hello" value="Say Hello!" />
+
+ </h:form>
+ </f:view>
+ </body>
+</html>
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2012-02-02 01:06:45 UTC (rev 38388)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2012-02-02 01:40:01 UTC (rev 38389)
@@ -29,6 +29,8 @@
WebUtilTest.class,
WebAppHelperTest.class,
WebXMLValidationTest.class)));
+ suite.addTest(new WebUtil2TestSetup(new TestSuite(
+ WebUtil2Test.class)));
return suite;
}
}
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2Test.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2Test.java 2012-02-02 01:40:01 UTC (rev 38389)
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.jst.web.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.jboss.tools.common.base.test.validation.TestUtil;
+import org.jboss.tools.jst.web.WebUtils;
+import org.jboss.tools.jst.web.kb.PageContextFactory;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ * Tests for a project that declares its root as the web root.
+ *
+ * @author Viacheslav Kabanovich
+ */
+public class WebUtil2Test extends TestCase {
+
+ private IProject project;
+
+ @Override
+ protected void setUp() throws Exception {
+ project = getTestProject();
+ }
+
+ public IProject getTestProject() {
+ if(project==null) {
+ try {
+ project = WebUtil2TestSetup.findTestProject();
+ if(project==null || !project.exists()) {
+ project = ResourcesUtils.importProject(JstWebAllTests.PLUGIN_ID, WebUtil2TestSetup.PROJECT_PATH);
+ TestUtil._waitForValidation(project);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail("Can't import CDI test project: " + e.getMessage()); //$NON-NLS-1$
+ }
+ }
+ return project;
+ }
+
+ /**
+ * This test should correctly find web root in the case when it is the same as the project root.
+ * See https://issues.jboss.org/browse/JBIDE-10739
+ *
+ * @throws Exception
+ */
+ public void testGetWebRootFolder() throws Exception {
+ IContainer[] roots = WebUtils.getWebRootFolders(getTestProject());
+ assertEquals(1, roots.length);
+ assertEquals(getTestProject(), roots[0]);
+
+ IPath path = org.jboss.tools.common.web.WebUtils.getFirstWebContentPath(getTestProject());
+ assertEquals(getTestProject().getFullPath(), path);
+ }
+
+ /**
+ * This test should not throw exception 'Path must include project and resource name'
+ * See https://issues.jboss.org/browse/JBIDE-10739
+ *
+ * @throws Exception
+ */
+ public void testFileFromProject() throws Exception {
+ IFile f = getTestProject().getFile("inputUserName.jsp"); //$NON-NLS-1$
+ IFile f1 = PageContextFactory.getFileFromProject(f.getName(), f);
+ assertNotNull(f1);
+
+ f1 = PageContextFactory.getFileFromProject("abc.jsp", f);
+ assertNull(f1);
+ }
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2Test.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2TestSetup.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2TestSetup.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2TestSetup.java 2012-02-02 01:40:01 UTC (rev 38389)
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.jst.web.test;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.common.base.test.validation.TestUtil;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class WebUtil2TestSetup extends TestSetup {
+ static String PROJECT_NAME = "testProjectRootAsWebContent"; //$NON-NLS-1$
+ static String PROJECT_PATH = "/projects/" + PROJECT_NAME; //$NON-NLS-1$
+
+ protected IProject project;
+
+ public WebUtil2TestSetup(Test test) {
+ super(test);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ project = getTestProject();
+ boolean state = ResourcesUtils.setBuildAutomatically(false);
+ project.build(IncrementalProjectBuilder.FULL_BUILD, null);
+ TestUtil._waitForValidation(project);
+ ResourcesUtils.setBuildAutomatically(state);
+ }
+
+ public IProject getTestProject() {
+ if(project==null) {
+ try {
+ project = findTestProject();
+ if(project==null || !project.exists()) {
+ project = ResourcesUtils.importProject(JstWebAllTests.PLUGIN_ID, PROJECT_PATH);
+ TestUtil._waitForValidation(project);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail("Can't import test project: " + e.getMessage()); //$NON-NLS-1$
+ }
+ }
+ return project;
+ }
+
+ public static IProject findTestProject() {
+ return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ project.delete(true, true, null);
+ JobUtils.waitForIdle();
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebUtil2TestSetup.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r38388 - trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-01 20:06:45 -0500 (Wed, 01 Feb 2012)
New Revision: 38388
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
Log:
JBIDE-10739
https://issues.jboss.org/browse/JBIDE-10739
Web content of project may be its root location, avoid request project.getFolder("/"), it results in illegal argument exception.
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2012-02-02 00:59:50 UTC (rev 38387)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2012-02-02 01:06:45 UTC (rev 38388)
@@ -253,7 +253,7 @@
IPath relativePath = Utils.getRelativePath(webRootPath,
basePath);
IPath filePath = relativePath.append(path);
- member = project.getFolder(sourcePath).getFile(filePath);
+ member = project.getFile(sourcePath.append(filePath));
if (member.exists()) {
return member;
}
@@ -263,7 +263,7 @@
webRootPath = projectPath.append(runtimePath);
relativePath = Utils.getRelativePath(webRootPath, basePath);
filePath = relativePath.append(path);
- member = project.getFolder(runtimePath).getFile(filePath);
+ member = project.getFile(runtimePath.append(filePath));
if (member.exists()) {
return member;
}
@@ -286,14 +286,14 @@
IPath sourcePath = resources[i].getSourcePath();
// Look in source environment
- member = project.getFolder(sourcePath).getFile(path);
+ member = project.getFile(sourcePath.append(path));
if(member.exists()) {
return member;
}
// Look in runtime environment
if (runtimePath.segmentCount() >= ICoreConstants.MINIMUM_FOLDER_SEGMENT_LENGTH - 1) {
- member = project.getFolder(runtimePath).getFile(path);
+ member = project.getFile(runtimePath.append(path));
if (member.exists()) {
return member;
}
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r38387 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-01 19:59:50 -0500 (Wed, 01 Feb 2012)
New Revision: 38387
Removed:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/ProjectValidationContextFactory.java
Log:
Rolled back wrong commit.
Deleted: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/ProjectValidationContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/ProjectValidationContextFactory.java 2012-02-02 00:55:41 UTC (rev 38386)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/ProjectValidationContextFactory.java 2012-02-02 00:59:50 UTC (rev 38387)
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * 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.jst.web.kb.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.jboss.tools.common.validation.IProjectValidationContext;
-import org.jboss.tools.common.validation.IProjectValidationContextFactory;
-import org.jboss.tools.jst.web.kb.IKbProject;
-import org.jboss.tools.jst.web.kb.KbProjectFactory;
-
-public class ProjectValidationContextFactory implements IProjectValidationContextFactory {
-
- public IProjectValidationContext getContext(IProject project) {
- IKbProject kb = KbProjectFactory.getKbProject(project, true);
- return kb == null ? null : kb.getValidationContext();
- }
-
-}
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r38386 - trunk/jst/plugins/org.jboss.tools.jst.web.kb.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-01 19:55:41 -0500 (Wed, 01 Feb 2012)
New Revision: 38386
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
Log:
Rolled back wrong commit.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2012-02-02 00:53:05 UTC (rev 38385)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2012-02-02 00:55:41 UTC (rev 38386)
@@ -334,9 +334,4 @@
</queryParticipant>
</extension>
- <extension point="org.jboss.tools.common.model.classes">
- <xclass id="org.jboss.tools.jst.web.kb.internal.ProjectValidationContextFactory"
- class="org.jboss.tools.jst.web.kb.internal.ProjectValidationContextFactory"/>
- </extension>
-
</plugin>
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r38385 - in trunk: jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-02-01 19:53:05 -0500 (Wed, 01 Feb 2012)
New Revision: 38385
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java
Log:
Seam quick fixes insert incorrectly formated code https://issues.jboss.org/browse/JBIDE-10766
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java 2012-02-02 00:52:32 UTC (rev 38384)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java 2012-02-02 00:53:05 UTC (rev 38385)
@@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -36,6 +37,7 @@
import org.eclipse.jdt.core.dom.BodyDeclaration;
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jdt.internal.core.JavaElement;
+import org.eclipse.jdt.internal.corext.util.CodeFormatterUtil;
import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools;
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange;
@@ -254,6 +256,43 @@
}
return list;
}
+
+ public static void addMethod(List<String> lines, ICompilationUnit compilationUnit, IType type, MultiTextEdit rootEdit) throws JavaModelException{
+ IType workingCopyType = findWorkingCopy(compilationUnit, type);
+ if(workingCopyType == null){
+ return;
+ }
+ IBuffer buffer = compilationUnit.getBuffer();
+ String lineSeparator = compilationUnit.findRecommendedLineSeparator();
+
+ int position = workingCopyType.getSourceRange().getOffset()+workingCopyType.getSource().lastIndexOf("}");
+ if(position > 0){
+ String spaces = getLeadingSpacesToInsert(position, buffer);
+
+ int indentWidth = CodeFormatterUtil.getIndentWidth(compilationUnit.getJavaProject());
+ for(int i = 0; i < indentWidth; i++){
+ spaces += SPACE;
+ }
+
+ String text = "";
+ for(String line : lines){
+ text += spaces;
+ text += line;
+ text += lineSeparator;
+ }
+
+ if(rootEdit != null){
+ TextEdit edit = new InsertEdit(position, text);
+ rootEdit.addChild(edit);
+ }else{
+ buffer.replace(position, 0, text);
+
+ synchronized(compilationUnit) {
+ compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null);
+ }
+ }
+ }
+ }
public static void addAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{
addAnnotation(qualifiedName, compilationUnit, element, "");
@@ -364,18 +403,7 @@
str += compilationUnit.findRecommendedLineSeparator();
- int index = position;
- while(index >= 0){
- char c = buffer.getChar(index);
- if(c == C_CARRIAGE_RETURN || c == C_NEW_LINE)
- break;
- index--;
- }
- index++;
- if(index != position){
- String spaces = buffer.getText(index, position-index);
- str += spaces;
- }
+ str += getLeadingSpacesToInsert(position, buffer);
}else{
str += SPACE;
@@ -520,7 +548,7 @@
if(annotation != null){
IBuffer buffer = compilationUnit.getBuffer();
- int numberOfSpaces = getNumberOfSpaces(annotation.getSourceRange().getOffset() + annotation.getSourceRange().getLength(), buffer);
+ int numberOfSpaces = getNumberOfSpacesToDelete(annotation.getSourceRange().getOffset() + annotation.getSourceRange().getLength(), buffer);
// delete annotation
if(rootEdit != null){
@@ -535,7 +563,7 @@
}
}
- private static int getNumberOfSpaces(int startPosition, IBuffer buffer){
+ private static int getNumberOfSpacesToDelete(int startPosition, IBuffer buffer){
int position = startPosition;
int numberOfSpaces = 0;
if(position < buffer.getLength()-1){
@@ -549,6 +577,21 @@
return numberOfSpaces;
}
+ private static String getLeadingSpacesToInsert(int startPosition, IBuffer buffer){
+ int position = startPosition;
+ while(position >= 0){
+ char c = buffer.getChar(position);
+ if(c == C_CARRIAGE_RETURN || c == C_NEW_LINE)
+ break;
+ position--;
+ }
+ position++;
+ if(position != startPosition){
+ return buffer.getText(position, startPosition-position);
+ }
+ return "";
+ }
+
public static void deleteImportForAnnotation(String qualifiedName, IAnnotation annotation, ICompilationUnit compilationUnit, IBuffer buffer, MultiTextEdit rootEdit) throws JavaModelException{
IImportDeclaration importDeclaration = compilationUnit.getImport(qualifiedName);
IImportContainer importContainer = compilationUnit.getImportContainer();
@@ -563,7 +606,7 @@
if(checkImport(textBefore, qualifiedName) && checkImport(textAfter, qualifiedName)){
int numberOfSpaces = 0;
if(!isLastImport(importContainer, importDeclaration)){
- numberOfSpaces = getNumberOfSpaces(importDeclaration.getSourceRange().getOffset() + importDeclaration.getSourceRange().getLength(), buffer);
+ numberOfSpaces = getNumberOfSpacesToDelete(importDeclaration.getSourceRange().getOffset() + importDeclaration.getSourceRange().getLength(), buffer);
}
TextEdit edit = new DeleteEdit(importDeclaration.getSourceRange().getOffset(), importDeclaration.getSourceRange().getLength()+numberOfSpaces);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java 2012-02-02 00:52:32 UTC (rev 38384)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/RenameMethodParticipant.java 2012-02-02 00:53:05 UTC (rev 38385)
@@ -16,7 +16,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.jdt.core.IJavaElement;
@@ -33,7 +32,6 @@
import org.eclipse.text.edits.MultiTextEdit;
import org.eclipse.text.edits.ReplaceEdit;
import org.eclipse.text.edits.TextEdit;
-import org.jboss.tools.common.model.project.ProjectHome;
import org.jboss.tools.common.util.BeanUtil;
import org.jboss.tools.jsf.ui.JsfUIMessages;
import org.jboss.tools.jst.web.kb.refactoring.ELProjectSetExtension;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java 2012-02-02 00:52:32 UTC (rev 38384)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java 2012-02-02 00:53:05 UTC (rev 38385)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.seam.ui.marker;
+import java.util.ArrayList;
import java.util.Map;
import org.eclipse.core.resources.IFile;
@@ -17,9 +18,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IBuffer;
import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IImportDeclaration;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
@@ -164,33 +163,38 @@
}
ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
- final String lineDelim= compilationUnit.findRecommendedLineSeparator();
-
IType type = compilationUnit.findPrimaryType();
if(type != null){
- IImportDeclaration importDeclaration = compilationUnit.getImport(qualifiedName);
- if(importDeclaration == null || !importDeclaration.exists())
- compilationUnit.createImport(qualifiedName, null, new NullProgressMonitor());
String annotation = MarkerResolutionUtils.getShortName(qualifiedName);
String methodName = annotation.toLowerCase();
+ CompilationUnitChange change = new CompilationUnitChange("", compilationUnit);
+
+ MultiTextEdit edit = new MultiTextEdit();
+
+ change.setEdit(edit);
+
IMethod oldMethod = type.getMethod(methodName, new String[]{});
if(oldMethod == null || !oldMethod.exists()){
- StringBuffer buf= new StringBuffer();
- buf.append("@"+annotation); //$NON-NLS-1$
- buf.append(lineDelim);
- buf.append("public void "+methodName+"() {"); //$NON-NLS-1$ //$NON-NLS-2$
- buf.append(lineDelim);
- buf.append("}"); //$NON-NLS-1$
- type.createMethod(buf.toString(), null, false, new NullProgressMonitor());
+ MarkerResolutionUtils.addImport(qualifiedName, compilationUnit, edit);
+
+ ArrayList<String> lines = new ArrayList<String>();
+
+ lines.add("@"+annotation); //$NON-NLS-1$
+ lines.add("public void "+methodName+"() {"); //$NON-NLS-1$ //$NON-NLS-2$
+ lines.add("}"); //$NON-NLS-1$
+
+ MarkerResolutionUtils.addMethod(lines, compilationUnit, type, edit);
}else{
- IBuffer buffer = compilationUnit.getBuffer();
- buffer.replace(oldMethod.getSourceRange().getOffset(), 0, "@"+annotation+lineDelim);
+ MarkerResolutionUtils.addAnnotation(qualifiedName, compilationUnit, oldMethod, "", edit);
}
-
- compilationUnit.commitWorkingCopy(false, new NullProgressMonitor());
+
+ if(edit.hasChildren()){
+ change.perform(new NullProgressMonitor());
+ original.reconcile(ICompilationUnit.NO_AST, false, null, new NullProgressMonitor());
+ }
compilationUnit.discardWorkingCopy();
}
}catch(CoreException ex){
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r38384 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb: .settings and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-01 19:52:32 -0500 (Wed, 01 Feb 2012)
New Revision: 38384
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/.settings/
trunk/jst/plugins/org.jboss.tools.jst.web.kb/.settings/org.eclipse.jdt.core.prefs
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/ProjectValidationContextFactory.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/PageContextFactory.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
Log:
JBIDE-10739
https://issues.jboss.org/browse/JBIDE-10739
Web content of project may be its root location, avoid request project.getFolder("/"), it results in illegal argument exception.
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/.settings/org.eclipse.jdt.core.prefs 2012-02-02 00:52:32 UTC (rev 38384)
@@ -0,0 +1,8 @@
+#Fri Sep 30 12:13:50 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2012-02-02 00:24:18 UTC (rev 38383)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2012-02-02 00:52:32 UTC (rev 38384)
@@ -333,4 +333,10 @@
nature="org.eclipse.jdt.core.javanature">
</queryParticipant>
</extension>
+
+ <extension point="org.jboss.tools.common.model.classes">
+ <xclass id="org.jboss.tools.jst.web.kb.internal.ProjectValidationContextFactory"
+ class="org.jboss.tools.jst.web.kb.internal.ProjectValidationContextFactory"/>
+ </extension>
+
</plugin>
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2012-02-02 00:24:18 UTC (rev 38383)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2012-02-02 00:52:32 UTC (rev 38384)
@@ -79,13 +79,7 @@
import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
import org.jboss.tools.common.el.core.ELReference;
import org.jboss.tools.common.el.core.GlobalELReferenceList;
-import org.jboss.tools.common.el.core.model.ELExpression;
-import org.jboss.tools.common.el.core.model.ELInstance;
-import org.jboss.tools.common.el.core.model.ELInvocationExpression;
-import org.jboss.tools.common.el.core.model.ELModel;
-import org.jboss.tools.common.el.core.parser.ELParser;
import org.jboss.tools.common.el.core.parser.ELParserUtil;
-import org.jboss.tools.common.el.core.parser.SyntaxError;
import org.jboss.tools.common.el.core.resolver.ELContext;
import org.jboss.tools.common.el.core.resolver.ELContextImpl;
import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager;
@@ -1005,7 +999,7 @@
IPath relativePath = Utils.getRelativePath(webRootPath,
basePath);
IPath filePath = relativePath.append(path);
- member = project.getFolder(sourcePath).getFile(filePath);
+ member = project.getFile(sourcePath.append(filePath));
if (member.exists()) {
return member;
}
@@ -1015,7 +1009,7 @@
webRootPath = projectPath.append(runtimePath);
relativePath = Utils.getRelativePath(webRootPath, basePath);
filePath = relativePath.append(path);
- member = project.getFolder(runtimePath).getFile(filePath);
+ member = project.getFile(runtimePath.append(filePath));
if (member.exists()) {
return member;
}
@@ -1038,14 +1032,14 @@
IPath sourcePath = resources[i].getSourcePath();
// Look in source environment
- member = project.getFolder(sourcePath).getFile(path);
+ member = project.getFile(sourcePath.append(path));
if(member.exists()) {
return member;
}
// Look in runtime environment
if (runtimePath.segmentCount() >= ICoreConstants.MINIMUM_FOLDER_SEGMENT_LENGTH - 1) {
- member = project.getFolder(runtimePath).getFile(path);
+ member = project.getFile(runtimePath.append(path));
if (member.exists()) {
return member;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2012-02-02 00:24:18 UTC (rev 38383)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2012-02-02 00:52:32 UTC (rev 38384)
@@ -261,8 +261,15 @@
Map<String, IAttribute> map = new HashMap<String, IAttribute>();
for (IAttribute a: as) {
String n = a.getName();
- if(map.containsKey(n) && !(a instanceof CustomTagLibAttribute)) {
- continue;
+ if(map.containsKey(n)) {
+ IAttribute o = map.get(n);
+ int pa = (a.isPreferable() || a.isRequired()) ? 2 : 0;
+ int po = (o.isPreferable() || o.isRequired()) ? 2 : 0;
+ pa += (a instanceof CustomTagLibAttribute) ? 1 : 0;
+ po += (o instanceof CustomTagLibAttribute) ? 1 : 0;
+ if(pa <= po) {
+ continue;
+ }
}
map.put(n, a);
}
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/ProjectValidationContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/ProjectValidationContextFactory.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/ProjectValidationContextFactory.java 2012-02-02 00:52:32 UTC (rev 38384)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * 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.jst.web.kb.internal;
+
+import org.eclipse.core.resources.IProject;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IProjectValidationContextFactory;
+import org.jboss.tools.jst.web.kb.IKbProject;
+import org.jboss.tools.jst.web.kb.KbProjectFactory;
+
+public class ProjectValidationContextFactory implements IProjectValidationContextFactory {
+
+ public IProjectValidationContext getContext(IProject project) {
+ IKbProject kb = KbProjectFactory.getKbProject(project, true);
+ return kb == null ? null : kb.getValidationContext();
+ }
+
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/ProjectValidationContextFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r38383 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-01 19:24:18 -0500 (Wed, 01 Feb 2012)
New Revision: 38383
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java
Log:
catch(Exception) block replacet to catch particular exceptions
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java 2012-02-02 00:17:13 UTC (rev 38382)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java 2012-02-02 00:24:18 UTC (rev 38383)
@@ -18,6 +18,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.templates.DocumentTemplateContext;
@@ -25,6 +26,7 @@
import org.eclipse.jface.text.templates.TemplateBuffer;
import org.eclipse.jface.text.templates.TemplateContext;
import org.eclipse.jface.text.templates.TemplateContextType;
+import org.eclipse.jface.text.templates.TemplateException;
import org.eclipse.jface.text.templates.persistence.TemplateStore;
import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
import org.eclipse.jst.jsp.ui.internal.templates.TemplateContextTypeIdsJSP;
@@ -97,9 +99,10 @@
try {
TemplateBuffer buffer = context.evaluate(template);
templateString = buffer.getString();
- }
- catch (Exception e) {
+ } catch (BadLocationException e) {
JSFModelPlugin.getDefault().logWarning("Could not create template for new html", e); //$NON-NLS-1$
+ } catch (TemplateException e) {
+ JSFModelPlugin.getDefault().logWarning("Could not create template for new html", e); //$NON-NLS-1$
}
}
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r38382 - in trunk/vpe: plugins/org.jboss.tools.vpe.docbook/META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-01 19:17:13 -0500 (Wed, 01 Feb 2012)
New Revision: 38382
Modified:
trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF
Log:
Syncronized unpack attribute in vpe feature with richfaces feature before split up
Modified: trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml
===================================================================
--- trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml 2012-02-02 00:12:20 UTC (rev 38381)
+++ trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml 2012-02-02 00:17:13 UTC (rev 38382)
@@ -1,24 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.vpe.feature" label="%featureName" version="3.3.0.qualifier">
+<feature
+ id="org.jboss.tools.vpe.feature"
+ label="%featureName"
+ version="3.3.0.qualifier">
- <description url="http://www.jboss.org/tools">
+ <description url="http://www.jboss.org/tools">
%description
</description>
- <copyright>
+ <copyright>
%copyright
</copyright>
- <license url="%licenseURL">
+ <license url="%licenseURL">
%license
</license>
- <plugin id="org.jboss.tools.vpe" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.vpe.docbook" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.vpe.html" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.vpe.jsp" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.vpe.resref" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.vpe.ui.palette" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.vpe.xulrunner" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.vpe.spring" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+ <plugin
+ id="org.jboss.tools.vpe"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.docbook"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.html"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.jsp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.resref"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.ui.palette"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.xulrunner"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.spring"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/META-INF/MANIFEST.MF 2012-02-02 00:17:13 UTC (rev 38382)
@@ -14,3 +14,4 @@
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Activator: org.jboss.tools.vpe.docbook.DocbookTemplatePlugin
+Eclipse-BundleShape: dir
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF 2012-02-02 00:17:13 UTC (rev 38382)
@@ -17,3 +17,4 @@
Bundle-Localization: plugin
Export-Package: org.jboss.tools.vpe.html.template
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Eclipse-BundleShape: dir
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF 2012-02-02 00:17:13 UTC (rev 38382)
@@ -16,3 +16,4 @@
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.jboss.tools.vpe.jsp
+Eclipse-BundleShape: dir
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r38381 - in trunk: common/features/org.jboss.tools.common.text.ext.feature and 16 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-01 19:12:20 -0500 (Wed, 01 Feb 2012)
New Revision: 38381
Modified:
trunk/common/features/org.jboss.tools.common.core.feature/feature.xml
trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml
trunk/common/features/org.jboss.tools.common.ui.feature/feature.xml
trunk/common/features/org.jboss.tools.common.verification.feature/feature.xml
trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
trunk/jsf/features/org.jboss.tools.jsf.feature/feature.xml
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF
trunk/jst/features/org.jboss.tools.jst.feature/feature.xml
trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
Log:
synchonized unpack option from old richfaces feature with new features created during richfaces feature split up
Modified: trunk/common/features/org.jboss.tools.common.core.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.core.feature/feature.xml 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/common/features/org.jboss.tools.common.core.feature/feature.xml 2012-02-02 00:12:20 UTC (rev 38381)
@@ -34,6 +34,7 @@
id="org.jboss.tools.common.projecttemplates"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
</feature>
Modified: trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml 2012-02-02 00:12:20 UTC (rev 38381)
@@ -34,6 +34,7 @@
id="org.jboss.tools.common.text.xml"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
</feature>
Modified: trunk/common/features/org.jboss.tools.common.ui.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.ui.feature/feature.xml 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/common/features/org.jboss.tools.common.ui.feature/feature.xml 2012-02-02 00:12:20 UTC (rev 38381)
@@ -33,7 +33,8 @@
id="org.jboss.tools.common.ui"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.jboss.tools.common.model.ui"
@@ -45,6 +46,7 @@
id="org.jboss.tools.common.model.ui.capabilities"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
</feature>
Modified: trunk/common/features/org.jboss.tools.common.verification.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.verification.feature/feature.xml 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/common/features/org.jboss.tools.common.verification.feature/feature.xml 2012-02-02 00:12:20 UTC (rev 38381)
@@ -1,10 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.common.verification.feature" label="%featureName" version="3.3.0.qualifier" provider-name="%providerName">
+<feature
+ id="org.jboss.tools.common.verification.feature"
+ label="%featureName"
+ version="3.3.0.qualifier"
+ provider-name="%providerName">
- <description url="http://www.jboss.org/tools">%description</description>
- <copyright>%copyright</copyright>
- <license>%license</license>
+ <description url="http://www.jboss.org/tools">
+ %description
+ </description>
- <plugin id="org.jboss.tools.common.verification" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.common.verification.ui" download-size="0" install-size="0" version="0.0.0" />
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license>
+ %license
+ </license>
+
+ <plugin
+ id="org.jboss.tools.common.verification"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.common.verification.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
@@ -7,4 +7,4 @@
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="3.7.0"
Bundle-Vendor: %providerName
-Eclipse-BundleShape: dir
+
Modified: trunk/jsf/features/org.jboss.tools.jsf.feature/feature.xml
===================================================================
--- trunk/jsf/features/org.jboss.tools.jsf.feature/feature.xml 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/jsf/features/org.jboss.tools.jsf.feature/feature.xml 2012-02-02 00:12:20 UTC (rev 38381)
@@ -1,36 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.jsf.feature" label="%featureName" version="3.3.0.qualifier" provider-name="%providerName" image="jsf.jpg">
+<feature
+ id="org.jboss.tools.jsf.feature"
+ label="%featureName"
+ version="3.3.0.qualifier"
+ provider-name="%providerName"
+ image="jsf.jpg">
- <description url="http://www.jboss.org/tools">
+ <description url="http://www.jboss.org/tools">
%description
</description>
- <copyright>
+ <copyright>
%copyright
</copyright>
- <license>
- %license
+ <license>
+ %license
</license>
- <requires>
- <import feature="org.jboss.tools.common.feature" version="3.3.0" match="greaterOrEqual" />
- <import feature="org.jboss.tools.jst.feature" version="3.3.0" match="greaterOrEqual" />
- <import feature="org.jboss.tools.vpe.feature" version="3.3.0" match="greaterOrEqual" />
- </requires>
+ <requires>
+ <import feature="org.jboss.tools.common.feature" version="3.3.0" match="greaterOrEqual"/>
+ <import feature="org.jboss.tools.jst.feature" version="3.3.0" match="greaterOrEqual"/>
+ <import feature="org.jboss.tools.vpe.feature" version="3.3.0" match="greaterOrEqual"/>
+ </requires>
- <plugin id="org.jboss.tools.jsf" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jsf.ui" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jsf.verification" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jsf.text.ext" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jsf.text.ext.facelets" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jsf.text.ext.richfaces" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jsf.vpe.facelets" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jsf.vpe.richfaces" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jsf.vpe.seam" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jsf.vpe.ajax4jsf" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.jsf.vpe.jsf" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.jsf.vpe.myfaces" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.jsf.vpe.jbpm" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jsf.vpe.jstl" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+ <plugin
+ id="org.jboss.tools.jsf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.verification"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.text.ext"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.text.ext.facelets"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.text.ext.richfaces"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.facelets"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.richfaces"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.seam"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.ajax4jsf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.jsf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.myfaces"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.jbpm"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.jstl"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
@@ -16,3 +16,4 @@
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Eclipse-BundleShape: dir
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
@@ -19,3 +19,4 @@
org.jboss.tools.jsf.vpe.facelets.template
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Eclipse-BundleShape: dir
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
@@ -18,3 +18,4 @@
Bundle-ClassPath: jsf-vpe-myfaces.jar
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Eclipse-BundleShape: dir
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
@@ -25,3 +25,4 @@
Export-Package: org.jboss.tools.jsf.vpe.richfaces,
org.jboss.tools.jsf.vpe.richfaces.template
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Eclipse-BundleShape: dir
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
@@ -23,3 +23,4 @@
Bundle-ClassPath: lib/antlr.jar,
.
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Eclipse-BundleShape: dir
Modified: trunk/jst/features/org.jboss.tools.jst.feature/feature.xml
===================================================================
--- trunk/jst/features/org.jboss.tools.jst.feature/feature.xml 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/jst/features/org.jboss.tools.jst.feature/feature.xml 2012-02-02 00:12:20 UTC (rev 38381)
@@ -1,30 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.jst.feature" label="%featureName" version="3.3.0.qualifier">
+<feature
+ id="org.jboss.tools.jst.feature"
+ label="%featureName"
+ version="3.3.0.qualifier">
- <description url="http://www.jboss.org/tools">
+ <description url="http://www.jboss.org/tools">
%description
</description>
- <copyright>
+ <copyright>
%copyright
</copyright>
- <license>
+ <license>
%license
</license>
- <requires>
- <import feature="org.jboss.tools.common.feature" version="3.3.0" match="greaterOrEqual" />
- </requires>
+ <requires>
+ <import feature="org.jboss.tools.common.feature" version="3.3.0" match="greaterOrEqual"/>
+ </requires>
- <plugin id="org.jboss.tools.jst.web" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jst.web.kb" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jst.web.ui" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jst.web.verification" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jst.jsp" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jst.firstrun" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.jst.text.ext" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.jst.css" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.jst.web.tiles" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.jst.web.tiles.ui" download-size="0" install-size="0" version="0.0.0" />
+ <plugin
+ id="org.jboss.tools.jst.web"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jst.web.kb"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.web.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jst.web.verification"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jst.jsp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jst.firstrun"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jst.text.ext"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jst.css"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jst.web.tiles"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jst.web.tiles.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
@@ -60,4 +60,3 @@
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
-Eclipse-BundleShape: dir
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
@@ -59,5 +59,4 @@
org.jboss.tools.jst.web.webapp.model,
org.jboss.tools.jst.web.webapp.model.handlers
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Eclipse-BundleShape: dir
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
@@ -26,4 +26,3 @@
org.eclipse.core.runtime;bundle-version="3.7.0"
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Eclipse-BundleShape: dir
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
@@ -49,4 +49,3 @@
org.eclipse.core.expressions;bundle-version="3.4.200"
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Eclipse-BundleShape: dir
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
@@ -51,4 +51,3 @@
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
-Eclipse-BundleShape: dir
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF 2012-02-01 22:56:09 UTC (rev 38380)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF 2012-02-02 00:12:20 UTC (rev 38381)
@@ -16,4 +16,3 @@
Bundle-Version: 3.3.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Eclipse-BundleShape: dir
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r38380 - trunk/jsf/docs/userguide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-02-01 17:56:09 -0500 (Wed, 01 Feb 2012)
New Revision: 38380
Modified:
trunk/jsf/docs/userguide/en-US/Book_Info.xml
Log:
updated for brew
Modified: trunk/jsf/docs/userguide/en-US/Book_Info.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/Book_Info.xml 2012-02-01 22:49:00 UTC (rev 38379)
+++ trunk/jsf/docs/userguide/en-US/Book_Info.xml 2012-02-01 22:56:09 UTC (rev 38380)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
-<pubsnumber>4</pubsnumber>
+<pubsnumber>5</pubsnumber>
<abstract>
<para>The Visual Web Tools Reference Guide explains extensive collection of specialized wizards, editors and views that can be used in various scenarios while developing Web applications.</para>
</abstract>
13 years, 8 months
- 1
- 0