JBoss Tools SVN: r32231 - branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-06-20 14:15:41 -0400 (Mon, 20 Jun 2011)
New Revision: 32231
Modified:
branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/JbpmLocationsPage.java
Log:
JBIDE-5327
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/JbpmLocationsPage.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/JbpmLocationsPage.java 2011-06-20 17:56:49 UTC (rev 32230)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/JbpmLocationsPage.java 2011-06-20 18:15:41 UTC (rev 32231)
@@ -51,6 +51,7 @@
public JbpmLocationsPage() {
super();
+ noDefaultAndApplyButton();
setPreferenceStore(Activator.getDefault().getPreferenceStore());
}
14 years, 9 months
JBoss Tools SVN: r32230 - in trunk/seam: plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-06-20 13:56:49 -0400 (Mon, 20 Jun 2011)
New Revision: 32230
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.classpath
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.project
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/.jsdtscope
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.jdt.core.prefs
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.common.component
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/JavaSource/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/META-INF/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/WEB-INF/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/WEB-INF/classes/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/WEB-INF/faces-config.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/WEB-INF/lib/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/WEB-INF/web.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetOnExistingProjectTest.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-9183
Modified: trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2011-06-20 17:20:25 UTC (rev 32229)
+++ trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2011-06-20 17:56:49 UTC (rev 32230)
@@ -34,6 +34,7 @@
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.eclipse.wst.validation.ValidationFramework;
import org.eclipse.wst.validation.internal.EventManager;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.seam.core.SeamProjectsSet;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
import org.jboss.tools.seam.core.project.facet.SeamVersion;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2011-06-20 17:20:25 UTC (rev 32229)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2011-06-20 17:56:49 UTC (rev 32230)
@@ -1013,7 +1013,9 @@
String webRootFolderPath = webRootFolder.getFullPath().toString();
IPath srcRootFolder = null;
if(projectType == ProjectType.WAR) {
- srcRootFolder = rootFolder.getFolder(new Path("/WEB-INF/classes")).getUnderlyingFolder().getParent().getFullPath(); //$NON-NLS-1$
+ // Fix for https://issues.jboss.org/browse/JBIDE-9183
+ srcRootFolder = rootFolder.getFolder(new Path("/WEB-INF/classes")).getUnderlyingFolder().getFullPath(); //$NON-NLS-1$
+// srcRootFolder = rootFolder.getFolder(new Path("/WEB-INF/classes")).getUnderlyingFolder().getParent().getFullPath(); //$NON-NLS-1$
} else if(projectType == ProjectType.EJB) {
try {
srcRootFolder = getSrcFolder(project).getFullPath();
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.classpath
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.classpath (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.classpath 2011-06-20 17:56:49 UTC (rev 32230)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="JavaSource"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 5.1 Runtime">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.jsf;jst.web"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_25">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.project
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.project (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.project 2011-06-20 17:56:49 UTC (rev 32230)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jsf</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</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.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.jboss.tools.jsf.jsfnature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/.jsdtscope
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/.jsdtscope (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/.jsdtscope 2011-06-20 17:56:49 UTC (rev 32230)
@@ -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/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.jdt.core.prefs 2011-06-20 17:56:49 UTC (rev 32230)
@@ -0,0 +1,8 @@
+#Fri Jun 17 15:23:15 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/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.common.component 2011-06-20 17:56:49 UTC (rev 32230)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="jsf">
+ <wb-resource deploy-path="/" source-path="/WebContent"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/>
+ <property name="context-root" value="jsf"/>
+ <property name="java-output-path" value="/jsf/WebContent/WEB-INF/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 2011-06-20 17:56:49 UTC (rev 32230)
@@ -0,0 +1,7 @@
+<root>
+ <facet id="jst.jsf">
+ <node name="libprov">
+ <attribute name="provider-id" value="jsf-user-library-provider"/>
+ </node>
+ </facet>
+</root>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-06-20 17:56:49 UTC (rev 32230)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 5.1 Runtime"/>
+ <fixed facet="jst.jsf"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="java"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="jst.jsf" version="1.2"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-06-20 17:56:49 UTC (rev 32230)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-06-20 17:56:49 UTC (rev 32230)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/META-INF/MANIFEST.MF 2011-06-20 17:56:49 UTC (rev 32230)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/WEB-INF/faces-config.xml 2011-06-20 17:56:49 UTC (rev 32230)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+ <application>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ <locale-config/>
+ </application>
+ <factory/>
+ <lifecycle/>
+</faces-config>
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/WEB-INF/faces-config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/WEB-INF/web.xml 2011-06-20 17:56:49 UTC (rev 32230)
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <description>Facelets StarterKit</description>
+ <display-name>jsf</display-name>
+ <context-param>
+ <param-name>com.sun.faces.validateXml</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>com.sun.faces.verifyObjects</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>facelets.REFRESH_PERIOD</param-name>
+ <param-value>2</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>client</param-value>
+ </context-param>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+</web-app>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/jsf/WebContent/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2011-06-20 17:20:25 UTC (rev 32229)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2011-06-20 17:56:49 UTC (rev 32230)
@@ -16,6 +16,7 @@
import org.eclipse.jdt.internal.core.JavaModelManager;
import org.eclipse.jst.jsp.core.internal.java.search.JSPSearchSupport;
import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.test.project.facet.SeamFacetOnExistingProjectTest;
import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeListConverterTest;
import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeManagerTest;
import org.jboss.tools.test.util.ProjectImportTestSetup;
@@ -44,6 +45,7 @@
suite.addTestSuite(CyclicDependingProjectsTest.class);
suite.addTestSuite(ComponentsFromLibTest.class);
suite.addTestSuite(Seam2ValidatorTest.class);
+ suite.addTestSuite(SeamFacetOnExistingProjectTest.class);
return suite;
}
}
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetOnExistingProjectTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetOnExistingProjectTest.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetOnExistingProjectTest.java 2011-06-20 17:56:49 UTC (rev 32230)
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * 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.seam.core.test.project.facet;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+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.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.seam.core.ISeamProject;
+import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamProjectsSet;
+import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
+import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class SeamFacetOnExistingProjectTest extends TestCase {
+
+ IProject project;
+ ISeamProject seamProject;
+
+ @Override
+ protected void setUp() throws Exception {
+ project = ResourcesUtils.importProject("org.jboss.tools.seam.core.test", "projects/jsf");
+ JobUtils.waitForIdle();
+
+ IFacetedProject fproj = ProjectFacetsManager.create(project);
+
+ IProjectFacet seamFacet = ProjectFacetsManager.getProjectFacet("jst.seam");
+ IProjectFacetVersion seamFacetVersion = seamFacet.getVersion("2.0");
+
+ fproj.installProjectFacet(seamFacetVersion, createSeamDataModel(), null);
+ JobUtils.waitForIdle();
+
+ seamProject = SeamCorePlugin.getSeamProject(project, false);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ ResourcesUtils.deleteProject(project.getName());
+ JobUtils.waitForIdle();
+ }
+
+ // https://issues.jboss.org/browse/JBIDE-9183
+ public void testSeamSettings() throws CoreException {
+ SeamProjectsSet projectSet = new SeamProjectsSet(project);
+
+ assertEquals(EclipseResourceUtil.getJavaSourceRoot(project), projectSet.getActionFolder());
+ assertEquals(EclipseResourceUtil.getJavaSourceRoot(project), projectSet.getModelFolder());
+ }
+
+ protected IDataModel createSeamDataModel() {
+ IDataModel config = (IDataModel) new SeamFacetInstallDataModelProvider().create();
+// config.setStringProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, "Seam 2.0.0");
+ config.setBooleanProperty(ISeamFacetDataModelProperties.DB_ALREADY_EXISTS, true);
+ config.setBooleanProperty(ISeamFacetDataModelProperties.RECREATE_TABLES_AND_DATA_ON_DEPLOY, false);
+ config.setStringProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, "war");
+ config.setStringProperty(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, "org.session.beans");
+ config.setStringProperty(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, "org.entity.beans");
+ config.setStringProperty(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, "org.test.beans");
+ config.setStringProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, "noop-connection");
+ config.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH, new String[] { "noop-driver.jar" });
+ config.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING, true);
+ return config;
+ }
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetOnExistingProjectTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 9 months
JBoss Tools SVN: r32229 - trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 13:20:25 -0400 (Mon, 20 Jun 2011)
New Revision: 32229
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java
Log:
JBIDE-9185
https://issues.jboss.org/browse/JBIDE-9185
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java 2011-06-20 17:06:01 UTC (rev 32228)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java 2011-06-20 17:20:25 UTC (rev 32229)
@@ -14,13 +14,21 @@
import junit.framework.TestCase;
+import org.eclipse.core.internal.preferences.EclipsePreferences;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.seam.config.core.CDISeamConfigPreferences;
import org.jboss.tools.cdi.seam.config.core.validation.SeamConfigValidationMessages;
+import org.jboss.tools.common.preferences.SeverityPreferences;
+import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
@@ -91,4 +99,37 @@
AbstractResourceMarkerTest.assertMarkerIsCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_MEMBER, "v:field3"), 15);
AbstractResourceMarkerTest.assertMarkerIsNotCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_MEMBER, "v:field1"));
}
+
+ /**
+ * Check that marker disappears when preference is set to IGNORE and appears again
+ * when preference is set back to WARNING. Check that marker for another preference
+ * is always present.
+ *
+ * @throws CoreException
+ */
+ public void testPreference() throws CoreException {
+ String pattern1 = MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_METHOD, "v:method1");
+ String pattern2 = MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_MEMBER, "v:method2");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(f, pattern1, 47);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(f, pattern2, 38);
+
+ EclipsePreferences ps = (EclipsePreferences)CDISeamConfigPreferences.getInstance().getDefaultPreferences();
+ ps.put(CDISeamConfigPreferences.UNRESOLVED_MEMBER, SeverityPreferences.IGNORE);
+ rebuild();
+ AbstractResourceMarkerTest.assertMarkerIsCreated(f, pattern1, 47);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(f, pattern2, 38);
+
+ ps.put(CDISeamConfigPreferences.UNRESOLVED_MEMBER, SeverityPreferences.WARNING);
+ rebuild();
+ AbstractResourceMarkerTest.assertMarkerIsCreated(f, pattern1, 47);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(f, pattern2, 38);
+ }
+
+ void rebuild() throws CoreException {
+ project.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ }
+
}
\ No newline at end of file
14 years, 9 months
JBoss Tools SVN: r32228 - trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-06-20 13:06:01 -0400 (Mon, 20 Jun 2011)
New Revision: 32228
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/JbpmLocationsPage.java
Log:
JBIDE-5327
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/JbpmLocationsPage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/JbpmLocationsPage.java 2011-06-20 16:54:51 UTC (rev 32227)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/JbpmLocationsPage.java 2011-06-20 17:06:01 UTC (rev 32228)
@@ -51,6 +51,7 @@
public JbpmLocationsPage() {
super();
+ noDefaultAndApplyButton();
setPreferenceStore(Activator.getDefault().getPreferenceStore());
}
14 years, 9 months
JBoss Tools SVN: r32227 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: graphical/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2011-06-20 12:54:51 -0400 (Mon, 20 Jun 2011)
New Revision: 32227
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/ProjectClassLoader.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties
Log:
JBIDE-9197: No user error message for UnsupportedClassVersionError
https://issues.jboss.org/browse/JBIDE-9197
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/ProjectClassLoader.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/ProjectClassLoader.java 2011-06-20 16:46:47 UTC (rev 32226)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/ProjectClassLoader.java 2011-06-20 16:54:51 UTC (rev 32227)
@@ -77,17 +77,18 @@
.getLocation();
for (int i = 0; i < roots.length; i++) {
try {
- if (roots[i].isArchive()) {
+ IPackageFragmentRoot iPackageFragmentRoot = roots[i];
+ if (iPackageFragmentRoot.isArchive()) {
File f = new File(FileLocator.resolve(
- installPath.append(roots[i].getPath()).toFile()
+ installPath.append(iPackageFragmentRoot.getPath()).toFile()
.toURL()).getFile());
if (!f.exists()) {
f = new File(FileLocator.resolve(
- roots[i].getPath().makeAbsolute().toFile()
+ iPackageFragmentRoot.getPath().makeAbsolute().toFile()
.toURL()).getFile());
}
if (!f.exists()) {
- IJavaElement javaElement = roots[i].getPrimaryElement();
+ IJavaElement javaElement = iPackageFragmentRoot.getPrimaryElement();
String jarName = javaElement.getElementName();
IResource jarResource = project.getProject().findMember(jarName);
@@ -98,14 +99,14 @@
list.add(f.toURL());
} else {
- IPath path = roots[i].getJavaProject().getOutputLocation();
+ IPath path = iPackageFragmentRoot.getJavaProject().getOutputLocation();
if (path.segmentCount() > 1) {
IWorkspaceRoot root = ResourcesPlugin.getWorkspace()
.getRoot();
path = root.getFolder(path).getLocation();
list.add(path.toFile().toURL());
} else {
- path = roots[i].getJavaProject().getProject()
+ path = iPackageFragmentRoot.getJavaProject().getProject()
.getLocation();
list.add(path.toFile().toURL());
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java 2011-06-20 16:46:47 UTC (rev 32226)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java 2011-06-20 16:54:51 UTC (rev 32227)
@@ -439,6 +439,8 @@
}
protected void refreshJavaBeanModel() {
+ String error = null;
+
if (beanClass == null || "".equals(beanClass.trim())) { //$NON-NLS-1$
viewer.setInput(""); //$NON-NLS-1$
} else {
@@ -471,8 +473,13 @@
viewer.setInput(""); //$NON-NLS-1$
} catch (ClassNotFoundException e1) {
viewer.setInput(""); //$NON-NLS-1$
+ error = Messages.JavaBeanCreationWizardPage_ClassNotFoundException;
+ } catch (UnsupportedClassVersionError classVersion) {
+ error = Messages.JavaBeanCreationWizardPage_UnsupportedClassVersionError;
}
}
+ this.setErrorMessage(error);
+ this.setPageComplete(error == null);
}
private void createBeanClassControls(Composite mainComposite) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java 2011-06-20 16:46:47 UTC (rev 32226)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java 2011-06-20 16:54:51 UTC (rev 32227)
@@ -8,6 +8,8 @@
public static String JavaBeanCreationWizardPage_27;
public static String JavaBeanCreationWizardPage_ArrayButtonText;
public static String JavaBeanCreationWizardPage_BeanClassEmptyErrorMessage;
+ public static String JavaBeanCreationWizardPage_UnsupportedClassVersionError;
+ public static String JavaBeanCreationWizardPage_ClassNotFoundException;
public static String JavaBeanCreationWizardPage_BeanClassLabel;
public static String JavaBeanCreationWizardPage_BeanIDDuplicateErrorMessage1;
public static String JavaBeanCreationWizardPage_BeanIDDuplicateErrorMessage2;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties 2011-06-20 16:46:47 UTC (rev 32226)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties 2011-06-20 16:54:51 UTC (rev 32227)
@@ -2,6 +2,8 @@
JavaBeanCreationWizardPage_27="
JavaBeanCreationWizardPage_ArrayButtonText=Array
JavaBeanCreationWizardPage_BeanClassEmptyErrorMessage=Java Class must be configured
+JavaBeanCreationWizardPage_UnsupportedClassVersionError=Class compile version not supported by Java Environment
+JavaBeanCreationWizardPage_ClassNotFoundException=Class not found on project Classpath
JavaBeanCreationWizardPage_BeanClassLabel=Java Class :
JavaBeanCreationWizardPage_BeanIDDuplicateErrorMessage1=Bean ID '
JavaBeanCreationWizardPage_BeanIDDuplicateErrorMessage2=' is duplicate
14 years, 9 months
JBoss Tools SVN: r32226 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core: src/org/jboss/tools/cdi/seam/solder/core and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 12:46:47 -0400 (Mon, 20 Jun 2011)
New Revision: 32226
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderPreferenceInitializer.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java
Log:
JBIDE-9185
https://issues.jboss.org/browse/JBIDE-9185
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml 2011-06-20 16:45:11 UTC (rev 32225)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml 2011-06-20 16:46:47 UTC (rev 32226)
@@ -34,4 +34,9 @@
</cdiextension>
</extension>
+
+ <extension point="org.eclipse.core.runtime.preferences">
+ <initializer class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderPreferenceInitializer"/>
+ </extension>
+
</plugin>
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderPreferenceInitializer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderPreferenceInitializer.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderPreferenceInitializer.java 2011-06-20 16:46:47 UTC (rev 32226)
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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.solder.core;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.common.preferences.SeverityPreferences;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class CDISeamSolderPreferenceInitializer extends AbstractPreferenceInitializer {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
+ */
+ @Override
+ public void initializeDefaultPreferences() {
+ IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(CDISeamSolderCorePlugin.PLUGIN_ID);
+ for (String name : CDISeamSolderPreferences.SEVERITY_OPTION_NAMES) {
+ defaultPreferences.put(name, SeverityPreferences.WARNING);
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderPreferenceInitializer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-06-20 16:45:11 UTC (rev 32225)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-06-20 16:46:47 UTC (rev 32226)
@@ -47,7 +47,9 @@
import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCorePlugin;
+import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderPreferences;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.preferences.SeverityPreferences;
/**
*
@@ -271,5 +273,9 @@
public void validateResource(IFile file, CDICoreValidator validator) {
new GenericBeanValidator().validateResource(file, validator, project, context);
}
+
+ public SeverityPreferences getSeverityPreferences() {
+ return CDISeamSolderPreferences.getInstance();
+ }
}
14 years, 9 months
JBoss Tools SVN: r32225 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core: src/org/jboss/tools/cdi/seam/config/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 12:45:11 -0400 (Mon, 20 Jun 2011)
New Revision: 32225
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigPreferenceInitializer.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java
Log:
JBIDE-9185
https://issues.jboss.org/browse/JBIDE-9185
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/plugin.xml 2011-06-20 16:25:26 UTC (rev 32224)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/plugin.xml 2011-06-20 16:45:11 UTC (rev 32225)
@@ -8,4 +8,9 @@
runtime="org.jboss.seam.config.xml.bootstrap.XmlConfigExtension">
</cdiextension>
</extension>
+
+ <extension point="org.eclipse.core.runtime.preferences">
+ <initializer class="org.jboss.tools.cdi.seam.config.core.CDISeamConfigPreferenceInitializer"/>
+ </extension>
+
</plugin>
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java 2011-06-20 16:25:26 UTC (rev 32224)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java 2011-06-20 16:45:11 UTC (rev 32225)
@@ -42,6 +42,7 @@
import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
import org.jboss.tools.common.model.filesystems.impl.FolderImpl;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.preferences.SeverityPreferences;
/**
*
@@ -191,4 +192,8 @@
}
}
+ public SeverityPreferences getSeverityPreferences() {
+ return CDISeamConfigPreferences.getInstance();
+ }
+
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigPreferenceInitializer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigPreferenceInitializer.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigPreferenceInitializer.java 2011-06-20 16:45:11 UTC (rev 32225)
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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.config.core;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.common.preferences.SeverityPreferences;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class CDISeamConfigPreferenceInitializer extends AbstractPreferenceInitializer {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
+ */
+ @Override
+ public void initializeDefaultPreferences() {
+ IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(CDISeamConfigCorePlugin.PLUGIN_ID);
+ for (String name : CDISeamConfigPreferences.SEVERITY_OPTION_NAMES) {
+ defaultPreferences.put(name, SeverityPreferences.WARNING);
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigPreferenceInitializer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 9 months
JBoss Tools SVN: r32224 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui: .settings and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 12:25:26 -0400 (Mon, 20 Jun 2011)
New Revision: 32224
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/.settings/
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/.settings/org.eclipse.jdt.core.prefs
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamConfigurationBlockDescriptionProvider.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/plugin.xml
Log:
JBIDE-9185
https://issues.jboss.org/browse/JBIDE-9185
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/.settings/org.eclipse.jdt.core.prefs 2011-06-20 16:25:26 UTC (rev 32224)
@@ -0,0 +1,8 @@
+#Wed May 18 16:43:06 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/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/META-INF/MANIFEST.MF 2011-06-20 16:15:00 UTC (rev 32223)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/META-INF/MANIFEST.MF 2011-06-20 16:25:26 UTC (rev 32224)
@@ -7,8 +7,10 @@
Bundle-SymbolicName: org.jboss.tools.cdi.seam.config.ui;singleton:=true
Bundle-Localization: plugin
Export-Package: org.jboss.tools.cdi.seam.config.ui,
- org.jboss.tools.cdi.seam.config.ui.contentassist
+ org.jboss.tools.cdi.seam.config.ui.contentassist,
+ org.jboss.tools.cdi.seam.config.ui.preferences
Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.jboss.tools.common.ui,
org.jboss.tools.common.text.ext,
org.eclipse.jface.text;bundle-version="3.7.0",
org.eclipse.jdt.ui;bundle-version="3.7.0",
@@ -16,6 +18,7 @@
org.jboss.tools.cdi.ui,
org.jboss.tools.cdi.core,
org.jboss.tools.cdi.seam.config.core,
+ org.jboss.tools.cdi.seam.solder.core,
org.jboss.tools.jst.web.kb,
org.jboss.tools.jst.web
Bundle-Version: 1.0.0.qualifier
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/plugin.xml 2011-06-20 16:15:00 UTC (rev 32223)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/plugin.xml 2011-06-20 16:25:26 UTC (rev 32224)
@@ -26,4 +26,10 @@
</proposalComputer>
</extension>
+<extension
+ point="org.jboss.tools.cdi.ui.configBlockDescriptionProvider">
+ <provider
+ class="org.jboss.tools.cdi.seam.config.ui.preferences.CDISeamConfigurationBlockDescriptionProvider">
+ </provider>
+</extension>
</plugin>
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamConfigurationBlockDescriptionProvider.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamConfigurationBlockDescriptionProvider.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamConfigurationBlockDescriptionProvider.java 2011-06-20 16:25:26 UTC (rev 32224)
@@ -0,0 +1,46 @@
+package org.jboss.tools.cdi.seam.config.ui.preferences;
+
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.preferences.CDIPreferences;
+import org.jboss.tools.cdi.seam.config.core.CDISeamConfigCorePlugin;
+import org.jboss.tools.cdi.seam.config.core.CDISeamConfigPreferences;
+import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCorePlugin;
+import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderPreferences;
+import org.jboss.tools.cdi.ui.preferences.CDIPreferencesMessages;
+import org.jboss.tools.cdi.ui.preferences.IConfigurationBlockDescriptionProvider;
+import org.jboss.tools.common.ui.preferences.SeverityConfigurationBlock.SectionDescription;
+
+public class CDISeamConfigurationBlockDescriptionProvider implements IConfigurationBlockDescriptionProvider {
+
+ private static SectionDescription SECTION_CONFIG = new SectionDescription(
+ CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_section_config,
+ new String[][]{
+ {CDISeamConfigPreferences.UNRESOLVED_TYPE, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_unresolvedType_label},
+ {CDISeamConfigPreferences.UNRESOLVED_MEMBER, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_unresolvedMember_label},
+ {CDISeamConfigPreferences.UNRESOLVED_CONSTRUCTOR, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_unresolvedConstructor_label},
+ {CDISeamConfigPreferences.UNRESOLVED_METHOD, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_unresolvedMethod_label},
+ {CDISeamConfigPreferences.ANNOTATION_EXPECTED, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_annotationExpected_label},
+ },
+ CDISeamConfigCorePlugin.PLUGIN_ID
+ );
+
+ private static SectionDescription SECTION_SOLDER = new SectionDescription(
+ CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_section_solder,
+ new String[][]{
+ {CDISeamSolderPreferences.AMBIGUOUS_GENERIC_CONFIGURATION_POINT, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_ambiguousGenericConfigurationPoint_label},
+ {CDISeamSolderPreferences.WRONG_TYPE_OF_GENERIC_CONFIGURATION_POINT, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_wrongTypeOfGenericConfigurationPoint_label},
+ },
+ CDISeamSolderCorePlugin.PLUGIN_ID
+ );
+
+ private static SectionDescription[] ALL_SECTIONS = {
+ SECTION_CONFIG,
+ SECTION_SOLDER
+ };
+
+ @Override
+ public SectionDescription[] getSections() {
+ return ALL_SECTIONS;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamConfigurationBlockDescriptionProvider.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.java 2011-06-20 16:25:26 UTC (rev 32224)
@@ -0,0 +1,30 @@
+package org.jboss.tools.cdi.seam.config.ui.preferences;
+
+import org.eclipse.osgi.util.NLS;
+
+public class CDISeamPreferencesMessages extends NLS {
+ private static final String BUNDLE_NAME = CDISeamPreferencesMessages.class.getName();
+
+ // Seam Validator Preference page
+ public static String CDISeamValidatorConfigurationBlock_common_description;
+
+ //Section Config
+ public static String CDIValidatorConfigurationBlock_section_config;
+ public static String CDIValidatorConfigurationBlock_pb_unresolvedType_label;
+ public static String CDIValidatorConfigurationBlock_pb_unresolvedMember_label;
+ public static String CDIValidatorConfigurationBlock_pb_unresolvedMethod_label;
+ public static String CDIValidatorConfigurationBlock_pb_unresolvedConstructor_label;
+ public static String CDIValidatorConfigurationBlock_pb_annotationExpected_label;
+
+ //Section Solder
+ public static String CDIValidatorConfigurationBlock_section_solder;
+ public static String CDIValidatorConfigurationBlock_pb_ambiguousGenericConfigurationPoint_label;
+ public static String CDIValidatorConfigurationBlock_pb_wrongTypeOfGenericConfigurationPoint_label;
+
+
+ public static String CDI_SEAM_VALIDATOR_PREFERENCE_PAGE_TITLE;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, CDISeamPreferencesMessages.class);
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties 2011-06-20 16:25:26 UTC (rev 32224)
@@ -0,0 +1,14 @@
+CDI_SEAM_VALIDATOR_PREFERENCE_PAGE_TITLE=Seam
+
+##Section Seam Config
+CDIValidatorConfigurationBlock_section_config=Seam Config
+CDIValidatorConfigurationBlock_pb_unresolvedType_label=Unresolved Type:
+CDIValidatorConfigurationBlock_pb_unresolvedMember_label=Unresolved Member:
+CDIValidatorConfigurationBlock_pb_unresolvedMethod_label=Unresolved Method:
+CDIValidatorConfigurationBlock_pb_unresolvedConstructor_label=Unresolved Constructor:
+CDIValidatorConfigurationBlock_pb_annotationExpected_label=Annotation Expected:
+
+##Section Seam Solder
+CDIValidatorConfigurationBlock_section_solder=Seam Solder
+CDIValidatorConfigurationBlock_pb_ambiguousGenericConfigurationPoint_label=Ambiguous generic Configuration Point:
+CDIValidatorConfigurationBlock_pb_wrongTypeOfGenericConfigurationPoint_label=Wrong Type of Generic Configuration Point:
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 9 months
JBoss Tools SVN: r32223 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 12:15:00 -0400 (Mon, 20 Jun 2011)
New Revision: 32223
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java
Log:
JBIDE-9185
https://issues.jboss.org/browse/JBIDE-9185
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java 2011-06-20 16:13:32 UTC (rev 32222)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java 2011-06-20 16:15:00 UTC (rev 32223)
@@ -139,10 +139,8 @@
private static Key[] getKeys() {
ArrayList<Key> keys = new ArrayList<Key>();
- for (int i = 0; i < ALL_SECTIONS.length; i++) {
- for (int j = 0; j < ALL_SECTIONS[i].options.length; j++) {
- keys.add(ALL_SECTIONS[i].options[j].key);
- }
+ for (SectionDescription s: ALL_SECTIONS) {
+ s.collectKeys(keys);
}
keys.add(MAX_NUMBER_OF_PROBLEMS_KEY);
keys.add(WRONG_BUILDER_ORDER_KEY);
14 years, 9 months
JBoss Tools SVN: r32222 - trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 12:13:32 -0400 (Mon, 20 Jun 2011)
New Revision: 32222
Modified:
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBConfigurationBlock.java
Log:
JBIDE-9185
https://issues.jboss.org/browse/JBIDE-9185
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBConfigurationBlock.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBConfigurationBlock.java 2011-06-20 16:12:47 UTC (rev 32221)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBConfigurationBlock.java 2011-06-20 16:13:32 UTC (rev 32222)
@@ -52,10 +52,8 @@
private static Key[] getKeys() {
ArrayList<Key> keys = new ArrayList<Key>();
- for (int i = 0; i < ALL_SECTIONS.length; i++) {
- for (int j = 0; j < ALL_SECTIONS[i].options.length; j++) {
- keys.add(ALL_SECTIONS[i].options[j].key);
- }
+ for (SectionDescription s: ALL_SECTIONS) {
+ s.collectKeys(keys);
}
keys.add(MAX_NUMBER_OF_PROBLEMS_KEY);
return keys.toArray(new Key[0]);
14 years, 9 months