JBoss Tools SVN: r19707 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-12 06:37:24 -0500 (Tue, 12 Jan 2010)
New Revision: 19707
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5657
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java 2010-01-12 09:59:02 UTC (rev 19706)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/facet/PostInstallJsfFacetDelegate.java 2010-01-12 11:37:24 UTC (rev 19707)
@@ -1,21 +1,10 @@
package org.jboss.tools.jsf.project.facet;
-import java.io.File;
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.jboss.tools.common.model.XModelConstants;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jsf.project.JSFNature;
import org.jboss.tools.jst.web.kb.IKbProject;
@@ -32,65 +21,8 @@
*/
public void execute(IProject project, IProjectFacetVersion fv,
Object config, IProgressMonitor monitor) throws CoreException {
- writeXModel(project);
- project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-
EclipseResourceUtil.addNatureToProject(project, JSFNature.NATURE_ID);
EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID);
}
- private void writeXModel(IProject project) {
- String projectName = project.getName();
- String webContent = "WebContent";
-
- IVirtualComponent com = ComponentCore.createComponent(project);
- IVirtualFolder webRootFolder = com.getRootFolder().getFolder(new Path("/"));
- IContainer folder = webRootFolder.getUnderlyingFolder();
-
- webContent = folder.getFullPath().removeFirstSegments(1).toString();
-
- if(webContent == null) {
- webContent = "WebContent";
- }
- String src = "src";
-
- String[] srcs = EclipseResourceUtil.getJavaProjectSrcLocations(project);
- if (srcs.length > 0) {
- src = srcs[0].replace('\\','/').substring(srcs[0].lastIndexOf('/') + 1);
- }
- File location = new File(project.getLocation().toFile(),".settings/org.jboss.tools.jst.web.xml");
-
- Object[] arguments = {
- projectName,
- webContent,
- src
- };
- String body = MessageFormat.format(XMODEL, arguments);
-
- org.jboss.tools.common.util.FileUtil.writeFile(location, body);
- }
-
- /**
- * {0} - project name
- * {1} - WebContent folder name
- * {2} - src folder name
- */
- private static String XMODEL =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<file-systems application-name=\"{0}\" model-entity=\"FileSystems\"" +
- " VERSION=\"2.0.0\" workspace-home=\"./{1}/WEB-INF\">" +
- "<file-system model-entity=\"FileSystemFolder\" location=\"" + XModelConstants.WORKSPACE_REF + "\" NAME=\"WEB-INF\"/>" +
- "<file-system model-entity=\"FileSystemFolder\" info=\"Content-Type=Web\"" +
- " location=\"" + XModelConstants.WORKSPACE_REF + "/..\" NAME=\"WEB-ROOT\"/>" +
- "<file-system model-entity=\"FileSystemFolder\"" +
- " location=\"" + XModelConstants.WORKSPACE_REF + "/../../{2}\" NAME=\"src\"/>" +
- "<file-system model-entity=\"FileSystemFolder\" location=\"" + XModelConstants.WORKSPACE_REF + "/lib\" NAME=\"lib\"/>" +
- "<file-system model-entity=\"FileSystemFolder\"" +
- " location=\"" + XModelConstants.WORKSPACE_REF + "/classes\" NAME=\"classes\"/>" +
- "<web model-entity=\"JstWeb\" model-path=\"/web.xml\" SERVLET_VERSION=\"2.4\">" +
- " <module model-entity=\"WebJSFModule\" model-path=\"/faces-config.xml\"" +
- " root=\"WEB-ROOT\" src=\"src\" URI=\"/WEB-INF/faces-config.xml\"/>" +
- "</web>" +
- "</file-systems>"
- ;
}
14 years, 11 months
JBoss Tools SVN: r19706 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse: hqleditor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-01-12 04:59:02 -0500 (Tue, 12 Jan 2010)
New Revision: 19706
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4613
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2010-01-12 03:01:44 UTC (rev 19705)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2010-01-12 09:59:02 UTC (rev 19706)
@@ -56,6 +56,7 @@
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
import org.eclipse.ui.texteditor.TextOperationAction;
+import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.console.ConsoleConfiguration;
@@ -174,15 +175,19 @@
final ConsoleConfiguration consoleConfiguration = getConsoleConfiguration();
if(consoleConfiguration.getConfiguration()==null) {
- consoleConfiguration.build();
- consoleConfiguration.execute( new ExecutionContext.Command() {
- public Object execute() {
- if(consoleConfiguration.hasConfiguration()) {
- consoleConfiguration.getConfiguration().buildMappings();
- }
- return consoleConfiguration;
- }
- });
+ try {
+ consoleConfiguration.build();
+ consoleConfiguration.execute( new ExecutionContext.Command() {
+ public Object execute() {
+ if(consoleConfiguration.hasConfiguration()) {
+ consoleConfiguration.getConfiguration().buildMappings();
+ }
+ return consoleConfiguration;
+ }
+ });
+ } catch (HibernateException e) {
+
+ }
}
Set<String> imports = new HashSet<String>();
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java 2010-01-12 03:01:44 UTC (rev 19705)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java 2010-01-12 09:59:02 UTC (rev 19706)
@@ -38,7 +38,6 @@
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.ProjectUtils;
import org.hibernate.eclipse.hqleditor.CompletionHelper;
-import org.hibernate.eclipse.hqleditor.LoadConsoleCFGCompletionProposal;
import org.hibernate.util.StringHelper;
public class JavaCompletionProcessor implements IContentAssistProcessor {
@@ -114,12 +113,12 @@
CompletionHelper.transpose( null, -prefix.length(), results );
- if (editor.getConsoleConfiguration().getConfiguration() == null){
+ /*if (editor.getConsoleConfiguration().getConfiguration() == null){
ICompletionProposal[] results2 = new ICompletionProposal[results.length + 1];
System.arraycopy(results, 0, results2, 1, results.length);
results2[0] = new LoadConsoleCFGCompletionProposal(editor.getConsoleConfiguration());
return results2;
- }
+ }*/
return results;
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor.java 2010-01-12 03:01:44 UTC (rev 19705)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor.java 2010-01-12 09:59:02 UTC (rev 19706)
@@ -34,8 +34,10 @@
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+import org.hibernate.HibernateException;
import org.hibernate.cfg.Configuration;
import org.hibernate.console.ConsoleConfiguration;
+import org.hibernate.console.execution.ExecutionContext;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.QueryEditor;
@@ -90,7 +92,7 @@
return result;
}
- ICompletionProposal[] computeProposals(IDocument doc, int lineStart, final int currentOffset, ConsoleConfiguration consoleConfiguration) {
+ ICompletionProposal[] computeProposals(IDocument doc, int lineStart, final int currentOffset, final ConsoleConfiguration consoleConfiguration) {
ICompletionProposal[] result = null;
errorMessage = null;
if (doc != null && currentOffset >= 0) {
@@ -112,6 +114,21 @@
return result;
}
+ if(consoleConfiguration != null && consoleConfiguration.getConfiguration()==null) {
+ try{
+ consoleConfiguration.build();
+ consoleConfiguration.execute( new ExecutionContext.Command() {
+ public Object execute() {
+ if(consoleConfiguration.hasConfiguration()) {
+ consoleConfiguration.getConfiguration().buildMappings();
+ }
+ return consoleConfiguration;
+ }
+ });
+ } catch (HibernateException e){
+ }
+ }
+
Configuration configuration = consoleConfiguration!=null?consoleConfiguration.getConfiguration():null;
IHQLCodeAssist hqlEval = new HQLCodeAssist(configuration);
EclipseHQLCompletionRequestor eclipseHQLCompletionCollector = new EclipseHQLCompletionRequestor();
@@ -119,9 +136,9 @@
proposalList.addAll(eclipseHQLCompletionCollector.getCompletionProposals());
errorMessage = eclipseHQLCompletionCollector.getLastErrorMessage();
- if(configuration == null && consoleConfiguration!=null) {
+ /*if(configuration == null && consoleConfiguration!=null) {
proposalList.add(new LoadConsoleCFGCompletionProposal(consoleConfiguration));
- }
+ }*/
//findMatchingWords( currentOffset, proposalList, startWord, HQLCodeScanner.getHQLKeywords(), "keyword" );
//findMatchingWords( currentOffset, proposalList, startWord, HQLCodeScanner.getHQLFunctionNames(), "function");
14 years, 11 months
JBoss Tools SVN: r19705 - in trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui: preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-01-11 22:01:44 -0500 (Mon, 11 Jan 2010)
New Revision: 19705
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/ExpressionEditorsPreferencePage.java
Log:
JBIDE-5621: Clean up blank prefs page for BPEL
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java 2010-01-12 02:51:06 UTC (rev 19704)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java 2010-01-12 03:01:44 UTC (rev 19705)
@@ -202,6 +202,8 @@
public static String BPELPasteAction_Paste_1;
public static String BPELPasteAction_Paste_2;
public static String BPELPasteAction_Paste_3;
+ public static String BPELPreferencePage_HomePage_Description;
+ public static String BPELPreferencePage_ExpressionEditorPage_Description;
public static String BPELPreferencePage_0;
public static String BPELPreferencePage_0TT;
public static String BPELPreferencePage_1;
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties 2010-01-12 02:51:06 UTC (rev 19704)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties 2010-01-12 03:01:44 UTC (rev 19705)
@@ -100,6 +100,8 @@
BPELPasteAction_Paste_1=Paste
BPELPasteAction_Paste_2=Paste from Transfer Buffer
BPELPasteAction_Paste_3=Paste
+BPELPreferencePage_HomePage_Description=Expand the tree to edit preferences for the BPEL feature.
+BPELPreferencePage_ExpressionEditorPage_Description=Expand the tree to edit preferences for the Expression Editor.
BPELPreferencePage_0=Use animation when laying out activities
BPELPreferencePage_0TT=When Flows automatically lay out their child activities, animation will be used to bring about a smooth transition.
BPELPreferencePage_1=Manual place activities in the Flow node
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java 2010-01-12 02:51:06 UTC (rev 19704)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java 2010-01-12 03:01:44 UTC (rev 19705)
@@ -4,6 +4,7 @@
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.IWorkbench;
import org.eclipse.bpel.ui.BPELUIPlugin;
+import org.eclipse.bpel.ui.Messages;
/**
* This class represents a preference page that
@@ -26,7 +27,7 @@
public BPELHomePreferencePage() {
super(GRID);
setPreferenceStore(BPELUIPlugin.INSTANCE.getPreferenceStore());
- //setDescription("A demonstration of a preference page implementation");
+ setDescription(Messages.BPELPreferencePage_HomePage_Description);
}
/**
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/ExpressionEditorsPreferencePage.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/ExpressionEditorsPreferencePage.java 2010-01-12 02:51:06 UTC (rev 19704)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/ExpressionEditorsPreferencePage.java 2010-01-12 03:01:44 UTC (rev 19705)
@@ -4,6 +4,7 @@
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.IWorkbench;
import org.eclipse.bpel.ui.BPELUIPlugin;
+import org.eclipse.bpel.ui.Messages;
/**
* This class represents a preference page that
@@ -26,7 +27,7 @@
public ExpressionEditorsPreferencePage() {
super(GRID);
setPreferenceStore(BPELUIPlugin.INSTANCE.getPreferenceStore());
- //setDescription("A demonstration of a preference page implementation");
+ setDescription(Messages.BPELPreferencePage_ExpressionEditorPage_Description);
}
/**
14 years, 11 months
JBoss Tools SVN: r19704 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-01-11 21:51:06 -0500 (Mon, 11 Jan 2010)
New Revision: 19704
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/ExpressionEditorsPreferencePage.java
Log:
JBIDE-5621: roll back the commit
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java 2010-01-12 02:23:37 UTC (rev 19703)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java 2010-01-12 02:51:06 UTC (rev 19704)
@@ -26,7 +26,7 @@
public BPELHomePreferencePage() {
super(GRID);
setPreferenceStore(BPELUIPlugin.INSTANCE.getPreferenceStore());
- setDescription("Expand the tree to edit preferences for the BPEL feature.");
+ //setDescription("A demonstration of a preference page implementation");
}
/**
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/ExpressionEditorsPreferencePage.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/ExpressionEditorsPreferencePage.java 2010-01-12 02:23:37 UTC (rev 19703)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/ExpressionEditorsPreferencePage.java 2010-01-12 02:51:06 UTC (rev 19704)
@@ -26,7 +26,7 @@
public ExpressionEditorsPreferencePage() {
super(GRID);
setPreferenceStore(BPELUIPlugin.INSTANCE.getPreferenceStore());
- setDescription("Expand the tree to edit preferences for the Expression Editor.");
+ //setDescription("A demonstration of a preference page implementation");
}
/**
14 years, 11 months
JBoss Tools SVN: r19703 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-11 21:23:37 -0500 (Mon, 11 Jan 2010)
New Revision: 19703
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
Log:
JBIDE-5582 JBIDE-5581
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2010-01-11 23:38:21 UTC (rev 19702)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2010-01-12 02:23:37 UTC (rev 19703)
@@ -24,7 +24,7 @@
jboss.version.51.description=JBoss Application Server 5.1
jboss.version.51.runtime.name=JBoss 5.1 Runtime
-jboss.version.60.name=JBoss AS 56.0
+jboss.version.60.name=JBoss AS 6.0
jboss.version.60.description=JBoss Application Server 6.0
jboss.version.60.runtime.name=JBoss 6.0 Runtime
14 years, 11 months
JBoss Tools SVN: r19702 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-11 18:38:21 -0500 (Mon, 11 Jan 2010)
New Revision: 19702
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
Log:
JBIDE-5582 - portions of this were committed under JBIDE-5581 also, by accident
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2010-01-11 20:35:59 UTC (rev 19701)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2010-01-11 23:38:21 UTC (rev 19702)
@@ -24,6 +24,10 @@
jboss.version.51.description=JBoss Application Server 5.1
jboss.version.51.runtime.name=JBoss 5.1 Runtime
+jboss.version.60.name=JBoss AS 56.0
+jboss.version.60.description=JBoss Application Server 6.0
+jboss.version.60.runtime.name=JBoss 6.0 Runtime
+
jboss.eap.version.43.name=JBoss Enterprise Application Platform 4.3
jboss.eap.version.43.description=JBoss Enterprise Application Platform (EAP) 4.3
jboss.eap.version.43.runtime.name=JBoss Enterprise Application Platform 4.3 Runtime
14 years, 12 months
JBoss Tools SVN: r19701 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core: dtd and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-11 15:35:59 -0500 (Mon, 11 Jan 2010)
New Revision: 19701
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/persistence_2_0.xsd
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
JBIDE-5581 - adding to catalog
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/persistence_2_0.xsd
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/persistence_2_0.xsd (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/persistence_2_0.xsd 2010-01-11 20:35:59 UTC (rev 19701)
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- persistence.xml schema -->
+<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:persistence="http://java.sun.com/xml/ns/persistence"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="2.0">
+ <xsd:annotation>
+ <xsd:documentation>
+ @(#)persistence_2_0.xsd 1.0 October 1 2009
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[
+ This is the XML Schema for the persistence configuration file.
+ The file must be named "META-INF/persistence.xml" in the
+ persistence archive.
+ Persistence configuration files must indicate
+ the persistence schema by using the persistence namespace:
+ http://java.sun.com/xml/ns/persistence
+ and indicate the version of the schema by
+ using the version element as shown below:
+ <persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+ version="2.0">
+ ...
+ </persistence>
+ ]]></xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleType name="versionType">
+ <xsd:restriction base="xsd:token">
+ <xsd:pattern value="[0-9]+(\.[0-9]+)*"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ <!-- **************************************************** -->
+ <xsd:element name="persistence">
+ <xsd:complexType>
+ <xsd:sequence>
+ <!-- **************************************************** -->
+ <xsd:element name="persistence-unit"
+ minOccurs="1" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:documentation>
+ Configuration of a persistence unit.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <!-- **************************************************** -->
+ <xsd:element name="description" type="xsd:string"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Description of this persistence unit.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <!-- **************************************************** -->
+ <xsd:element name="provider" type="xsd:string"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Provider class that supplies EntityManagers for this
+ persistence unit.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <!-- **************************************************** -->
+ <xsd:element name="jta-data-source" type="xsd:string"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The container-specific name of the JTA datasource to use.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <!-- **************************************************** -->
+ <xsd:element name="non-jta-data-source" type="xsd:string"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The container-specific name of a non-JTA datasource to use.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <!-- **************************************************** -->
+ <xsd:element name="mapping-file" type="xsd:string"
+ minOccurs="0" maxOccurs="unbounded">
+ <xsd:annotation>
+ <xsd:documentation>
+ File containing mapping information. Loaded as a resource
+ by the persistence provider.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <!-- **************************************************** -->
+ <xsd:element name="jar-file" type="xsd:string"
+ minOccurs="0" maxOccurs="unbounded">
+ <xsd:annotation>
+ <xsd:documentation>
+ Jar file that is to be scanned for managed classes.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <!-- **************************************************** -->
+ <xsd:element name="class" type="xsd:string"
+ minOccurs="0" maxOccurs="unbounded">
+ <xsd:annotation>
+ <xsd:documentation>
+ Managed class to be included in the persistence unit and
+ to scan for annotations. It should be annotated
+ with either @Entity, @Embeddable or @MappedSuperclass.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <!-- **************************************************** -->
+ <xsd:element name="exclude-unlisted-classes" type="xsd:boolean"
+ default="true" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ When set to true then only listed classes and jars will
+ be scanned for persistent classes, otherwise the
+ enclosing jar or directory will also be scanned.
+ Not applicable to Java SE persistence units.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <!-- **************************************************** -->
+ <xsd:element name="shared-cache-mode"
+ type="persistence:persistence-unit-caching-type"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Defines whether caching is enabled for the
+ persistence unit if caching is supported by the
+ persistence provider. When set to ALL, all entities
+ will be cached. When set to NONE, no entities will
+ be cached. When set to ENABLE_SELECTIVE, only entities
+ specified as cacheable will be cached. When set to
+ DISABLE_SELECTIVE, entities specified as not cacheable
+ will not be cached. When not specified or when set to
+ UNSPECIFIED, provider defaults may apply.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <!-- **************************************************** -->
+ <xsd:element name="validation-mode"
+ type="persistence:persistence-unit-validation-mode-type"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The validation mode to be used for the persistence unit.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <!-- **************************************************** -->
+ <xsd:element name="properties" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ A list of standard and vendor-specific properties
+ and hints.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="property"
+ minOccurs="0" maxOccurs="unbounded">
+ <xsd:annotation>
+ <xsd:documentation>
+ A name-value pair.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:attribute name="name" type="xsd:string"
+ use="required"/>
+ <xsd:attribute name="value" type="xsd:string"
+ use="required"/>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <!-- **************************************************** -->
+ <xsd:attribute name="name" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ Name used in code to reference this persistence unit.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <!-- **************************************************** -->
+ <xsd:attribute name="transaction-type"
+ type="persistence:persistence-unit-transaction-type">
+ <xsd:annotation>
+ <xsd:documentation>
+ Type of transactions used by EntityManagers from this
+ persistence unit.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="version" type="persistence:versionType"
+ fixed="2.0" use="required"/>
+ </xsd:complexType>
+ </xsd:element>
+ <!-- **************************************************** -->
+ <xsd:simpleType name="persistence-unit-transaction-type">
+ <xsd:annotation>
+ <xsd:documentation>
+ public enum PersistenceUnitTransactionType {JTA, RESOURCE_LOCAL};
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="JTA"/>
+ <xsd:enumeration value="RESOURCE_LOCAL"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ <!-- **************************************************** -->
+ <xsd:simpleType name="persistence-unit-caching-type">
+ <xsd:annotation>
+ <xsd:documentation>
+ public enum SharedCacheMode { ALL, NONE, ENABLE_SELECTIVE,
+ DISABLE_SELECTIVE, UNSPECIFIED};
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="ALL"/>
+ <xsd:enumeration value="NONE"/>
+ <xsd:enumeration value="ENABLE_SELECTIVE"/>
+ <xsd:enumeration value="DISABLE_SELECTIVE"/>
+ <xsd:enumeration value="UNSPECIFIED"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ <!-- **************************************************** -->
+ <xsd:simpleType name="persistence-unit-validation-mode-type">
+ <xsd:annotation>
+ <xsd:documentation>
+ public enum ValidationMode { AUTO, CALLBACK, NONE};
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="AUTO"/>
+ <xsd:enumeration value="CALLBACK"/>
+ <xsd:enumeration value="NONE"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+</xsd:schema>
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-01-11 20:19:54 UTC (rev 19700)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-01-11 20:35:59 UTC (rev 19701)
@@ -856,99 +856,86 @@
<extension
point="org.eclipse.wst.xml.core.catalogContributions">
<catalogContribution>
- <public publicId="-//JBoss//DTD JBOSS 4.0//EN"
+ <public publicId="-//JBoss//DTD JBOSS 4.0//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss_4_0.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"/>
- <public publicId="-//JBoss//DTD JBOSS 4.2//EN"
+ <public publicId="-//JBoss//DTD JBOSS 4.2//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss_4_2.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd"/>
- <public publicId="-//JBoss//DTD J2EE Application 1.4//EN"
+ <public publicId="-//JBoss//DTD J2EE Application 1.4//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-app_4_0.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd"/>
- <public publicId="-//JBoss//DTD J2EE Application 4.2//EN"
+ <public publicId="-//JBoss//DTD J2EE Application 4.2//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-app_4_2.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd"/>
-
- <public publicId="-//JBoss//DTD Web Application 2.4//EN"
+ <public publicId="-//JBoss//DTD Web Application 2.4//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-web_4_0.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"/>
- <public publicId="-//JBoss//DTD Web Application 4.2//EN"
+ <public publicId="-//JBoss//DTD Web Application 4.2//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-web_4_2.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"/>
- <uri
+ <uri
name="http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-ws-security_1_0.xsd"/>
- <uri
+ <uri
name="jaxws-config_2_0.xsd"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jaxws-config_2_0.xsd"/>
+ <uri
+ name="persistence_2_0.xsd"
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/persistence_2_0.xsd"/>
<public
publicId="-//JBoss//DTD JBOSS JCA Config 1.5//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-ds_1_5.dtd"
- webURL="http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
- </public>
+ webURL="http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"/>
<public
publicId="-//JBoss//DTD MBean Service 4.2//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-service_4_2.dtd"
- webURL="http://www.jboss.org/j2ee/dtd/jboss-service_4_2.dtd">
- </public>
+ webURL="http://www.jboss.org/j2ee/dtd/jboss-service_4_2.dtd"/>
<public
publicId="-//JBoss//DTD Web Service Reference 4.2//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/service-ref_4_2.dtd"
- webURL="http://www.jboss.org/j2ee/dtd/service-ref_4_2.dtd">
- </public>
-
+ webURL="http://www.jboss.org/j2ee/dtd/service-ref_4_2.dtd"/>
<public
publicId="-//JBoss//DTD Java EE Application 5.0//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-app_5_0.dtd"
- webURL="http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd">
- </public>
+ webURL="http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd"/>
<public
publicId="-//JBoss//DTD JBOSS 5.0//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss_5_0.dtd"
- webURL="http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
- </public>
+ webURL="http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd"/>
<public
publicId="-//JBoss//DTD Web Application 5.0//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-web_5_0.dtd"
- webURL="http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
- </public>
+ webURL="http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd"/>
<public
publicId="-//JBoss//DTD JBOSS JCA Config 5.0//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-ds_5_0.dtd"
- webURL="http://www.jboss.org/j2ee/dtd/jboss-ds_5_0.dtd">
- </public>
+ webURL="http://www.jboss.org/j2ee/dtd/jboss-ds_5_0.dtd"/>
<public
publicId="-//JBoss//DTD MBean Service 5.0//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-service_5_0.dtd"
- webURL="http://www.jboss.org/j2ee/dtd/jboss-service_5_0.dtd">
- </public>
+ webURL="http://www.jboss.org/j2ee/dtd/jboss-service_5_0.dtd"/>
<public
publicId="-//JBoss//DTD Web Service Reference 5.0//EN"
uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/service-ref_5_0.dtd"
- webURL="http://www.jboss.org/j2ee/dtd/service-ref_5_0.dtd">
- </public>
+ webURL="http://www.jboss.org/j2ee/dtd/service-ref_5_0.dtd"/>
<uri
name="http://www.jboss.org/j2ee/schema/jboss_5_1.xsd"
- uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss_5_1.xsd">
- </uri>
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss_5_1.xsd"/>
<uri
name="http://www.jboss.org/j2ee/schema/jboss-common_5_1.xsd"
- uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-common_5_1.xsd">
- </uri>
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-common_5_1.xsd"/>
<uri
name="http://www.jboss.org/j2ee/schema/jboss-ds_5_0.xsd"
- uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-ds_5_0.xsd">
- </uri>
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-ds_5_0.xsd"/>
<uri
name="http://www.jboss.org/j2ee/schema/jboss-web_5_1.xsd"
- uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-web_5_1.xsd">
- </uri>
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-web_5_1.xsd"/>
<uri
name="http://www.jboss.org/j2ee/schema/jboss-client_5_1.xsd"
- uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-client_5_1.xsd">
- </uri>
+ uri="platform:/plugin/org.jboss.ide.eclipse.as.core/dtd/jboss-client_5_1.xsd"/>
</catalogContribution>
</extension>
14 years, 12 months
JBoss Tools SVN: r19700 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2010-01-11 15:19:54 -0500 (Mon, 11 Jan 2010)
New Revision: 19700
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
Log:
Cleaning up a couple of errant libraries listed in the classpath in manifest.mf for smooks.ui
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2010-01-11 20:11:23 UTC (rev 19699)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2010-01-11 20:19:54 UTC (rev 19700)
@@ -42,9 +42,7 @@
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
-Bundle-ClassPath: libs/dom4j-1.6.1.jar,
- .,
- libs/xstream-1.2.2.jar
+Bundle-ClassPath: .
Export-Package: org.jboss.tools.smooks.configuration,
org.jboss.tools.smooks.configuration.editors,
org.jboss.tools.smooks.configuration.editors.csv,
14 years, 12 months
JBoss Tools SVN: r19699 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-11 15:11:23 -0500 (Mon, 11 Jan 2010)
New Revision: 19699
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java
Log:
JBIDE-4889 - allowing server provided runtimes for jpa and jsf facets
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java 2010-01-11 20:04:53 UTC (rev 19698)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java 2010-01-11 20:11:23 UTC (rev 19699)
@@ -66,7 +66,7 @@
IClasspathEntry[] entries =
new WebtoolsProjectJBossClasspathContainer(path).getClasspathEntries();
return Arrays.asList(entries);
- } else if( isPrimaryFacet(fv.getProjectFacet())) {
+ } else if( isPrimaryFacet(fv.getProjectFacet()) || isSecondaryFacet(fv.getProjectFacet())) {
String id = rc.getProperty("id"); //$NON-NLS-1$
IPath containerPath = new Path("org.eclipse.jst.server.core.container").append("org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget"); //$NON-NLS-1$ //$NON-NLS-2$
path = containerPath.append(id);
@@ -89,6 +89,13 @@
|| facet.equals(del.APP_CLIENT_FACET);
}
+ // Also a bad name, but facets the server automatically knows
+ // how to provide classpath entries for
+ protected boolean isSecondaryFacet(IProjectFacet facet) {
+ WebtoolsProjectJBossClasspathContainerInitializer del = new WebtoolsProjectJBossClasspathContainerInitializer();
+ return facet.equals(del.JSF_FACET) || facet.equals(del.JPA_FACET);
+ }
+
public static final class Factory implements IAdapterFactory {
private static final Class[] ADAPTER_TYPES = { IClasspathProvider.class };
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java 2010-01-11 20:04:53 UTC (rev 19698)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java 2010-01-11 20:11:23 UTC (rev 19699)
@@ -56,7 +56,10 @@
public static final IProjectFacet CONNECTOR_FACET = ProjectFacetsManager.getProjectFacet(FACET_CONNECTOR);
public static final IProjectFacet APP_CLIENT_FACET = ProjectFacetsManager.getProjectFacet(FACET_APP_CLIENT);
+ public static final IProjectFacet JSF_FACET = ProjectFacetsManager.getProjectFacet(FACET_JSF);
+ public static final IProjectFacet JPA_FACET = ProjectFacetsManager.getProjectFacet(FACET_JPA);
+
public WebtoolsProjectJBossClasspathContainerInitializer() {
// TODO Auto-generated constructor stub
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java 2010-01-11 20:04:53 UTC (rev 19698)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java 2010-01-11 20:11:23 UTC (rev 19699)
@@ -21,11 +21,13 @@
public static final String FACET_APP_CLIENT = "jst.appclient";//$NON-NLS-1$
public static final String FACET_ESB = "jst.jboss.esb";//$NON-NLS-1$
+ public static final String FACET_JSF = "jst.jsf"; //$NON-NLS-1$
+ public static final String FACET_JPA = "jpt.jpa"; //$NON-NLS-1$
+
public static final String EXT_JAR = ".jar"; //$NON-NLS-1$
public static final String EXT_ESB = ".esb"; //$NON-NLS-1$
public static final String EXT_RAR = ".rar"; //$NON-NLS-1$
public static final String EXT_WAR = ".war"; //$NON-NLS-1$
public static final String EXT_EAR = ".ear"; //$NON-NLS-1$
public static final String EXT_XML = ".xml"; //$NON-NLS-1$
-
}
14 years, 12 months
JBoss Tools SVN: r19698 - in trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui: src/org/jboss/ide/eclipse/as/wtp/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-11 15:04:53 -0500 (Mon, 11 Jan 2010)
New Revision: 19698
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/vcf/
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/vcf/OutputFoldersLabelProvider.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/messages.properties
Log:
JBIDE-5655
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2010-01-11 19:37:16 UTC (rev 19697)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/plugin.xml 2010-01-11 20:04:53 UTC (rev 19698)
@@ -88,4 +88,12 @@
</selection>
</wizard>
</extension>
+
+ <extension
+ point="org.jboss.ide.eclipse.as.wtp.ui.virtualComponentLabelProvider">
+ <provider
+ class="org.jboss.ide.eclipse.as.wtp.ui.vcf.OutputFoldersLabelProvider"
+ weight="5">
+ </provider>
+ </extension>
</plugin>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java 2010-01-11 19:37:16 UTC (rev 19697)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/Messages.java 2010-01-11 20:04:53 UTC (rev 19698)
@@ -24,7 +24,7 @@
public static String Export_LabelProject;
public static String Export_LabelBrowse;
public static String Export_OverwriteCheckbox;
-
+ public static String OutputFolders;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/messages.properties 2010-01-11 19:37:16 UTC (rev 19697)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/messages.properties 2010-01-11 20:04:53 UTC (rev 19698)
@@ -18,3 +18,4 @@
DESTINATION_ARCHIVE_SHOULD_END_WITH=Destination archive should end with {0}.
RESOURCE_EXISTS_ERROR=Resource {0} already exists. If you wish to overwrite select the "Overwrite Existing file" option.
IS_READ_ONLY=Destination location is read only.
+OutputFolders=\u0020output folders
\ No newline at end of file
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/vcf/OutputFoldersLabelProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/vcf/OutputFoldersLabelProvider.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/vcf/OutputFoldersLabelProvider.java 2010-01-11 20:04:53 UTC (rev 19698)
@@ -0,0 +1,29 @@
+package org.jboss.ide.eclipse.as.wtp.ui.vcf;
+
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.jboss.ide.eclipse.as.wtp.core.vcf.OutputFoldersVirtualComponent;
+import org.jboss.ide.eclipse.as.wtp.ui.Messages;
+import org.jboss.ide.eclipse.as.wtp.ui.propertypage.IVirtualComponentLabelProvider;
+
+public class OutputFoldersLabelProvider implements IVirtualComponentLabelProvider {
+ public OutputFoldersLabelProvider() {
+ }
+
+ public boolean canHandle(IVirtualComponent component) {
+ return component instanceof OutputFoldersVirtualComponent;
+ }
+
+ public Image getSourceImage(IVirtualComponent component) {
+ return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER);
+ }
+
+ public String getSourceText(IVirtualComponent component) {
+ //OutputFoldersVirtualComponent fileset = (OutputFoldersVirtualComponent)component;
+ return component.getProject().getName() + Messages.OutputFolders;
+ }
+
+
+}
14 years, 12 months