JBoss Tools SVN: r18128 - trunk/hibernatetools/docs/reference/en/modules.
by jbosstools-commits@lists.jboss.org
Author: ochikvina
Date: 2009-10-16 08:36:12 -0400 (Fri, 16 Oct 2009)
New Revision: 18128
Modified:
trunk/hibernatetools/docs/reference/en/modules/plugins.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-884 - adding the section 'JBoss Tools Properties Editor';
Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2009-10-16 12:00:59 UTC (rev 18127)
+++ trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2009-10-16 12:36:12 UTC (rev 18128)
@@ -1578,7 +1578,6 @@
<figure>
<title>Structured cfg.xml Editor</title>
-
<mediaobject>
<imageobject>
<imagedata fileref="images/plugins/plugins_12_b.png"/>
@@ -1587,7 +1586,83 @@
</figure>
</section>
+
+ <section id="properties_editor">
+ <title>JBoss Tools Properties Editor</title>
+
+ <para>The editor is meant for editing <literal>.properties</literal> files. It contains two tabs: the
+ <property>Properties</property> (UI) tab and the
+ <property>Source</property> tab for manual editing.</para>
+
+ <para>For <literal>hibernate.properties</literal> file <property>JBoss Tools Properties Editor</property>
+ provides content assist which is available both for hibernate properties and property values. You can make use of
+ the content assist while editing the file in the Source view and in the Properties view of the editor.</para>
+
+
+ <para>To add the property in the
+ <property>Properties</property> view, click the <emphasis>
+ <property>Add</property></emphasis> button.</para>
+ <figure>
+ <title>Adding the Property</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/plugins/add_property1.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>In the <emphasis>
+ <property>Name</property></emphasis> field press <emphasis>
+ <property>Ctrl+Space</property></emphasis> to invoke the content assist.
+ It will suggest <emphasis>
+ <property>'hibernate.'</property></emphasis> which is the prefix for all hibernate properties. After
+ selecting <emphasis>
+ <property>'hibernate.'</property></emphasis> and invoking the content assist again,
+ other prefixes and properties are displayed as the proposals with a description of each one.</para>
+
+ <figure>
+ <title>Content Assist for Properties Names</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/plugins/add_property2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>When invoking the content assist in the <emphasis>
+ <property>Value</property></emphasis> field, it also provides a list of proposals.</para>
+
+ <figure>
+ <title>Content Assist for Properties Values</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/plugins/add_property3.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>In the <property>Source</property> view of the editor, content assist also could be invoked both for properties names and values:</para>
+
+ <figure>
+ <title>Content Assist in the Source view</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/plugins/add_property4.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <figure>
+ <title>Content Assist in the Source view</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/plugins/add_property5.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+
<section id="rev_xml_editor">
<title>Reveng.xml Editor</title>
14 years, 8 months
JBoss Tools SVN: r18127 - trunk/hibernatetools/docs/reference/en/images/plugins.
by jbosstools-commits@lists.jboss.org
Author: ochikvina
Date: 2009-10-16 08:00:59 -0400 (Fri, 16 Oct 2009)
New Revision: 18127
Added:
trunk/hibernatetools/docs/reference/en/images/plugins/add_property1.png
trunk/hibernatetools/docs/reference/en/images/plugins/add_property2.png
trunk/hibernatetools/docs/reference/en/images/plugins/add_property3.png
trunk/hibernatetools/docs/reference/en/images/plugins/add_property4.png
trunk/hibernatetools/docs/reference/en/images/plugins/add_property5.png
Log:
https://jira.jboss.org/jira/browse/JBDS-884 - adding new images for the 'JBoss Tools Properties Editor' section;
Added: trunk/hibernatetools/docs/reference/en/images/plugins/add_property1.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/add_property1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/add_property2.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/add_property2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/add_property3.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/add_property3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/add_property4.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/add_property4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/add_property5.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/add_property5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 8 months
JBoss Tools SVN: r18126 - in trunk: jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2009-10-16 07:24:20 -0400 (Fri, 16 Oct 2009)
New Revision: 18126
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4978
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2009-10-16 10:17:02 UTC (rev 18125)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2009-10-16 11:24:20 UTC (rev 18126)
@@ -560,7 +560,7 @@
projects.add(project);
IKbProject kbProject = KbProjectFactory.getKbProject(project, false);
if(kbProject!=null) {
- IValidationContext rootContext = null; // kbProject.getValidationContext();
+ IValidationContext rootContext = kbProject.getValidationContext();
return new ValidatingProjectSet(project, projects, rootContext);
}
return null;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java 2009-10-16 10:17:02 UTC (rev 18125)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java 2009-10-16 11:24:20 UTC (rev 18126)
@@ -12,6 +12,7 @@
import org.eclipse.core.resources.IProjectNature;
import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
+import org.jboss.tools.jst.web.kb.validation.IValidationContext;
/**
*
@@ -26,14 +27,19 @@
* Returns all available tag libraries.
* @return
*/
- public ITagLibrary[] getTagLibraries();
+ ITagLibrary[] getTagLibraries();
/**
* Returns tag libraries by URI
* @param uri
* @return
*/
- public ITagLibrary[] getTagLibraries(String uri);
+ ITagLibrary[] getTagLibraries(String uri);
- public void resolve();
+ void resolve();
+
+ /**
+ * @return validation context which is associated with this KB project.
+ */
+ IValidationContext getValidationContext();
}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2009-10-16 10:17:02 UTC (rev 18125)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2009-10-16 11:24:20 UTC (rev 18126)
@@ -352,12 +352,17 @@
if(f != null && f.isFile()) f.delete();
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.jst.web.kb.IKbProject#getValidationContext()
+ */
public IValidationContext getValidationContext() {
if(validationContext == null) {
validationContext = new ProjectValidationContext();
}
return validationContext;
}
+
/*
*
*/
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2009-10-16 10:17:02 UTC (rev 18125)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2009-10-16 11:24:20 UTC (rev 18126)
@@ -1,3 +1,13 @@
+ /*******************************************************************************
+ * Copyright (c) 2007 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;
import org.eclipse.osgi.util.NLS;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2009-10-16 10:17:02 UTC (rev 18125)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2009-10-16 11:24:20 UTC (rev 18126)
@@ -345,54 +345,6 @@
point="org.jboss.tools.common.text.xml.contentAssistProcessor"
id="org.jboss.tools.seam.ui.contentAssistProcessor"
name="org.jboss.tools.seam.ui.contentAssistProcessor">
-
- <!-- contentAssistProcessor
- class="org.jboss.tools.seam.ui.text.java.SeamELProposalProcessor"
- id="org.jboss.tools.seam.ui.text.java.SeamELProposalProcessor">
- <contenttype id="org.eclipse.jst.jsp.core.jspsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- <partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
- <partitiontype id="org.eclipse.jst.jsp.DEFAULT_JSP" />
- <partitiontype id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
- </contenttype>
- <contenttype id="org.eclipse.wst.html.core.htmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- <partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
- <partitiontype id="org.eclipse.jst.jsp.DEFAULT_JSP" />
- <partitiontype id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
- <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
- </contenttype>
- <contenttype id="org.eclipse.core.runtime.xml">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
- <contenttype id="org.jboss.tools.common.model.ui.xml">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
-
- <contenttype id="org.jboss.tools.seam.xml.ui.pages12xmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
- <contenttype id="org.jboss.tools.seam.xml.ui.page12xmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
- <contenttype id="org.jboss.tools.seam.xml.ui.pages20xmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
- <contenttype id="org.jboss.tools.seam.xml.ui.page20xmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
- <contenttype id="org.jboss.tools.seam.xml.ui.pages21xmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
- <contenttype id="org.jboss.tools.seam.xml.ui.page21xmlsource">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contenttype>
- </contentAssistProcessor -->
</extension>
<extension
14 years, 8 months
JBoss Tools SVN: r18125 - trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2009-10-16 06:17:02 -0400 (Fri, 16 Oct 2009)
New Revision: 18125
Modified:
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/ELReferencesQueryParticipant.java
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/RenameMethodParticipant.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4856
Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/ELReferencesQueryParticipant.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/ELReferencesQueryParticipant.java 2009-10-16 10:10:39 UTC (rev 18124)
+++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/ELReferencesQueryParticipant.java 2009-10-16 10:17:02 UTC (rev 18125)
@@ -116,9 +116,12 @@
return projectSet.getViewFolder(project);
}
- IPath path = ProjectHome.getFirstWebContentPath(baseFile.getProject()).removeFirstSegments(1);
+ IPath path = ProjectHome.getFirstWebContentPath(baseFile.getProject());
- return baseFile.getProject().getFolder(path);
+ if(path != null)
+ return project.getFolder(path.removeFirstSegments(1));
+
+ return null;
}
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/RenameMethodParticipant.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/RenameMethodParticipant.java 2009-10-16 10:10:39 UTC (rev 18124)
+++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/RenameMethodParticipant.java 2009-10-16 10:17:02 UTC (rev 18125)
@@ -171,9 +171,12 @@
return projectSet.getViewFolder(project);
}
- IPath path = ProjectHome.getFirstWebContentPath(baseFile.getProject()).removeFirstSegments(1);
+ IPath path = ProjectHome.getFirstWebContentPath(baseFile.getProject());
- return baseFile.getProject().getFolder(path);
+ if(path != null)
+ return project.getFolder(path.removeFirstSegments(1));
+
+ return null;
}
}
14 years, 8 months
JBoss Tools SVN: r18124 - in trunk/ws/plugins: org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dennyxu
Date: 2009-10-16 06:10:39 -0400 (Fri, 16 Oct 2009)
New Revision: 18124
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java
Log:
JBIDE-5035: Add support for the option "--extension" in wsconsume command
Externalize string
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2009-10-16 10:04:02 UTC (rev 18123)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2009-10-16 10:10:39 UTC (rev 18124)
@@ -6,6 +6,7 @@
Label_Binding_File=Binding files
Label_JaxWS_Target=JAX-WS specification
Label_Update_Webxml=Update the default Web.xml
+Label_EnableSOAP12_Binding_Extension=Enable SOAP 1.2 binding extension (This option is only available for JBossWS 3.0 or later)
# START NON-TRANSLATABLE
Value_Target_0=2.0
Value_Target_1=2.1
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2009-10-16 10:04:02 UTC (rev 18123)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2009-10-16 10:10:39 UTC (rev 18124)
@@ -30,6 +30,7 @@
public static String Label_JaxWS_Target;
public static String Label_Update_Webxml;
+ public static String Label_EnableSOAP12_Binding_Extension;
public static String Value_Target_0;
public static String Value_Target_1;
public static String Label_Button_Text_Remove;
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2009-10-16 10:04:02 UTC (rev 18123)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2009-10-16 10:10:39 UTC (rev 18124)
@@ -166,7 +166,7 @@
gd = new GridData();
gd.horizontalSpan = 3;
btnExtension.setLayoutData(gd);
- btnExtension.setText("Enable SOAP 1.2 binding extension (This option is only available for JBossWS 3.0 or later)");
+ btnExtension.setText(JBossWSCreationCoreMessages.Label_EnableSOAP12_Binding_Extension);
btnExtension.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
model.setEnableSOAP12(btnExtension
14 years, 8 months
JBoss Tools SVN: r18123 - in trunk: seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2009-10-16 06:04:02 -0400 (Fri, 16 Oct 2009)
New Revision: 18123
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/ELProjectSet.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4856
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java 2009-10-16 08:47:57 UTC (rev 18122)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/refactoring/RefactorSearcher.java 2009-10-16 10:04:02 UTC (rev 18123)
@@ -298,11 +298,13 @@
if(expression instanceof ELPropertyInvocation){
ELPropertyInvocation pi = (ELPropertyInvocation)expression;
- return pi.getName().getStart();
+ if(pi.getName() != null)
+ return pi.getName().getStart();
}else if(expression instanceof ELMethodInvocation){
ELMethodInvocation mi = (ELMethodInvocation)expression;
- return mi.getName().getStart();
+ if(mi.getName() != null)
+ return mi.getName().getStart();
}
return 0;
}
@@ -311,11 +313,13 @@
if(expression instanceof ELPropertyInvocation){
ELPropertyInvocation pi = (ELPropertyInvocation)expression;
- return pi.getName().getLength();
+ if(pi.getName() != null)
+ return pi.getName().getLength();
}else if(expression instanceof ELMethodInvocation){
ELMethodInvocation mi = (ELMethodInvocation)expression;
- return mi.getName().getLength();
+ if(mi.getName() != null)
+ return mi.getName().getLength();
}
return 0;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/ELProjectSet.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/ELProjectSet.java 2009-10-16 08:47:57 UTC (rev 18122)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/ELProjectSet.java 2009-10-16 10:04:02 UTC (rev 18123)
@@ -40,9 +40,12 @@
else if(project.equals(projectsSet.getEarProject()))
return projectsSet.getDefaultEarViewsFolder();
- IPath path = ProjectHome.getFirstWebContentPath(project).removeFirstSegments(1);
+ IPath path = ProjectHome.getFirstWebContentPath(project);
- return project.getFolder(path);
+ if(path != null)
+ return project.getFolder(path.removeFirstSegments(1));
+
+ return null;
}
}
14 years, 8 months
JBoss Tools SVN: r18122 - in trunk/ws/plugins: org.jboss.tools.ws.creation.core/META-INF and 7 other directories.
by jbosstools-commits@lists.jboss.org
Author: dennyxu
Date: 2009-10-16 04:47:57 -0400 (Fri, 16 Oct 2009)
New Revision: 18122
Modified:
trunk/ws/plugins/org.jboss.tools.ws.core/plugin.xml
trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSRuntimeConfigBlock.java
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java
Log:
JBIDE-5035: Add support for the option "--extension" in wsconsume command
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/plugin.xml
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/plugin.xml 2009-10-16 08:19:05 UTC (rev 18121)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/plugin.xml 2009-10-16 08:47:57 UTC (rev 18122)
@@ -1,40 +1,49 @@
<plugin>
<extension
point="org.eclipse.wst.common.project.facet.core.facets">
- <category id="jbossws.category">
- <label>%JBOSSWS_CATOGERY_LABEL</label>
- <description>%JBOSSWS_CATOGERY_DISCRIPTION</description>
- </category>
<project-facet id="jbossws.core">
<label>%JBOSSWS_FACET_CORE_LABEL</label>
<description>%JBOSSWS_FACET_CORE_DISCRIPTION</description>
- <member category="jbossws.category "/>
</project-facet>
<project-facet-version facet="jbossws.core" version="2.0">
<constraint>
<requires facet="jst.web" version="2.2,2.3,2.4,2.5"/>
</constraint>
- <action
- facet="jbossws.core"
- id="jbossws.core.install"
- type="INSTALL">
- <delegate class="org.jboss.tools.ws.core.facet.delegate.JBossWSInstallRuntimeDelegate"/>
- <config-factory
- class="org.jboss.tools.ws.core.facet.delegate.JBossWSFacetInstallDataModelProvider">
- </config-factory>
- </action>
- <action
- facet="jbossws.core"
- id="jbossws.core.uninstall"
- type="UNINSTALL">
- <delegate
- class="org.jboss.tools.ws.core.facet.delegate.JBossWSUnInstallRuntimeDelegate">
- </delegate>
- </action>
</project-facet-version>
+ <project-facet-version
+ facet="jbossws.core"
+ version="3.0">
+ <constraint>
+ <requires
+ facet="jst.web"
+ version="2.2,2.3,2.4,2.5">
+ </requires>
+ </constraint>
+ </project-facet-version>
+ <action
+ facet="jbossws.core"
+ id="jbossws.core.install"
+ type="INSTALL"
+ version="2.0,3.0">
+ <delegate
+ class="org.jboss.tools.ws.core.facet.delegate.JBossWSInstallRuntimeDelegate">
+ </delegate>
+ <config-factory
+ class="org.jboss.tools.ws.core.facet.delegate.JBossWSFacetInstallDataModelProvider">
+ </config-factory>
+ </action>
+ <action
+ facet="jbossws.core"
+ id="jbossws.core.uninstall"
+ type="UNINSTALL"
+ version="2.0,3.0">
+ <delegate
+ class="org.jboss.tools.ws.core.facet.delegate.JBossWSUnInstallRuntimeDelegate">
+ </delegate>
+ </action>
</extension>
<extension
point="org.eclipse.wst.common.project.facet.core.runtimes">
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2009-10-16 08:19:05 UTC (rev 18121)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2009-10-16 08:47:57 UTC (rev 18122)
@@ -38,7 +38,8 @@
Export-Package: org.jboss.tools.ws.creation.core,
org.jboss.tools.ws.creation.core.commands,
org.jboss.tools.ws.creation.core.data,
- org.jboss.tools.ws.creation.core.messages
+ org.jboss.tools.ws.creation.core.messages,
+ org.jboss.tools.ws.creation.core.utils
Bundle-ClassPath: lib/wsdl4j.jar,
.
Bundle-Localization: plugin
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java 2009-10-16 08:19:05 UTC (rev 18121)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java 2009-10-16 08:47:57 UTC (rev 18122)
@@ -9,7 +9,6 @@
import java.util.List;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.internal.utils.Policy;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java 2009-10-16 08:19:05 UTC (rev 18121)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java 2009-10-16 08:47:57 UTC (rev 18122)
@@ -4,6 +4,7 @@
import java.util.List;
import org.jboss.tools.ws.creation.core.data.ServiceModel;
+import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
public class WSDL2JavaCommand extends AbstractGenerateCodeCommand{
@@ -54,6 +55,10 @@
command.add("-t"); //$NON-NLS-1$
command.add(model.getTarget());
}
+
+ if(model.enableSOAP12() && JBossWSCreationUtils.supportSOAP12(model.getWebProjectName())){
+ command.add("-e"); //$NON-NLS-1$
+ }
}
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java 2009-10-16 08:19:05 UTC (rev 18121)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java 2009-10-16 08:47:57 UTC (rev 18122)
@@ -18,6 +18,7 @@
private boolean isGenWSDL;
private String target;
private int wsScenario;
+ private boolean extension;
public int getWsScenario() {
return wsScenario;
@@ -156,4 +157,12 @@
public void setUpdateWebxml(boolean updateWebxml){
this.UpdateWebxml = updateWebxml;
}
+
+ public boolean enableSOAP12(){
+ return extension;
+ }
+
+ public void setEnableSOAP12(boolean enable){
+ this.extension = enable;
+ }
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2009-10-16 08:19:05 UTC (rev 18121)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2009-10-16 08:47:57 UTC (rev 18122)
@@ -38,13 +38,15 @@
Error_Create_Client_Sample=When create a client sample, a error comes up. Please check the generated files.
-Error_WS_Chose_runtime=Select an JBoss Web Service runtime. If a server supplied JBoss Web Service runtime is chosen ,\n the chosen server adapter must be capable of providing the JBoss Web Service runtime
+Error_WS_Chose_runtime=Select a JBoss Web Service runtime. If a server supplied JBoss Web Service runtime is chosen ,\n the chosen server adapter must be capable of providing the JBoss Web Service runtime
Error_WS_No_Runtime_Specifed=A JBossWS runtime has not been chosen
-JBossWSFacetInstallPage_Title=JBossWS Facet
-JBossWSFacetInstallPage_Description=Select JBossWS Web Service runtime
+JBossWSFacetInstallPage_Title=JBossWS Facet {0}
+JBossWSFacetInstallPage_Description=Select JBossWS {0} Web Service runtime
JBossWSFacetInstallPage_ServerSuppliedJBossWS=Server Supplied JBossWS Runtime
JBossWSFacetInstallPage_Deploy= Package all JBossWS runtime jars into the deployment archive
JBossWSFacetInstallPage_New=New...
JBossWSRuntimeConfigBlock_Duplicated_Jar=Duplicated jar on classpath:{0}
+JBossWSRuntimeInstallPage_NoTargetRuntime=Please the specify project target runtime.
+JBossWSRuntimeInstallPage_NoValidJBossWSRuntime=The specified target runtime should be JBoss AS 5.0 or later.
Client_Sample_Run_Over= Call Over!
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2009-10-16 08:19:05 UTC (rev 18121)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2009-10-16 08:47:57 UTC (rev 18122)
@@ -16,6 +16,8 @@
public static String JBossWSFacetInstallPage_Title;
public static String JBossWSRuntimeConfigBlock_Duplicated_Jar;
+ public static String JBossWSRuntimeInstallPage_NoTargetRuntime;
+ public static String JBossWSRuntimeInstallPage_NoValidJBossWSRuntime;
public static String Label_Custom_Package_Name;
public static String Label_Catalog_File;
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2009-10-16 08:19:05 UTC (rev 18121)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2009-10-16 08:47:57 UTC (rev 18122)
@@ -45,13 +45,17 @@
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jst.ws.internal.common.J2EEUtils;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeType;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.tools.ws.core.JBossWSCorePlugin;
import org.jboss.tools.ws.core.classpath.JBossWSRuntime;
import org.jboss.tools.ws.core.classpath.JBossWSRuntimeManager;
import org.jboss.tools.ws.core.facet.delegate.IJBossWSFacetDataModelProperties;
+import org.jboss.tools.ws.core.facet.delegate.JBossWSFacetInstallDataModelProvider;
import org.jboss.tools.ws.core.messages.JBossWSCoreMessages;
import org.jboss.tools.ws.core.utils.StatusUtils;
import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
@@ -339,7 +343,7 @@
}
// if no target runtime has been specified, get runtime location from
- // default jbossws runtime
+ // default jbossws runtime configured at Web Service preference page
if (prjFacetRuntime == null) {
JBossWSRuntime jbws = JBossWSRuntimeManager.getInstance()
.getDefaultRuntime();
@@ -356,6 +360,49 @@
return ""; //$NON-NLS-1$
}
+
+ public static boolean supportSOAP12(String projectName){
+ try {
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ if(project == null){
+ return false;
+ }
+
+ IFacetedProject facetedPrj = ProjectFacetsManager.create(project);
+ IProjectFacet jbossWSFacet = ProjectFacetsManager.getProjectFacet(JBossWSFacetInstallDataModelProvider.JBOSS_WS_FACET_ID);
+ IProjectFacetVersion fpVersion = facetedPrj.getProjectFacetVersion(jbossWSFacet);
+ if(fpVersion != null && fpVersion.getVersionString().compareTo("3.0") >= 0){ //$NON-NLS-1$
+ return true;
+ }
+
+// if the project doesn't get JBossWS facet installed, check its primary target runtime
+// if the jboss runtime version is 5.0 or higher, return true
+ org.eclipse.wst.common.project.facet.core.runtime.IRuntime targetRuntime = facetedPrj.getPrimaryRuntime();
+ if(targetRuntime != null){
+ IRuntime runtime = getRuntime(targetRuntime);
+ IRuntimeType rt = runtime.getRuntimeType();
+ if(rt.getName().toUpperCase().indexOf("JBOSS") >= 0){ //$NON-NLS-1$
+ String runtimeVersion = rt.getVersion();
+ if(runtimeVersion != null && runtimeVersion.compareTo("5.0") >= 0){ //$NON-NLS-1$
+ return true;
+ }
+ }
+
+ }
+ } catch (CoreException e) {
+// ignore
+// e.printStackTrace();
+ }
+
+ //check the version of default jbossws runtime configured at the Web Service preference page
+ JBossWSRuntime jbws = JBossWSRuntimeManager.getInstance()
+ .getDefaultRuntime();
+ if(jbws != null && "3.0".compareTo(jbws.getVersion()) <= 0){ //$NON-NLS-1$
+ return true;
+ }
+
+ return false;
+ }
public static IRuntime getRuntime(
org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime) {
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF 2009-10-16 08:19:05 UTC (rev 18121)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF 2009-10-16 08:47:57 UTC (rev 18122)
@@ -25,7 +25,8 @@
org.eclipse.jst.ws.creation.ui,
org.eclipse.wst.common.modulecore,
org.eclipse.wst.common.project.facet.ui,
- org.jboss.tools.ws.ui
+ org.jboss.tools.ws.ui,
+ org.eclipse.wst.server.core;bundle-version="1.1.3"
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.ws.creation.ui.wsrt
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java 2009-10-16 08:19:05 UTC (rev 18121)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java 2009-10-16 08:47:57 UTC (rev 18122)
@@ -10,12 +10,15 @@
******************************************************************************/
package org.jboss.tools.ws.creation.ui.project.facet;
+import java.text.MessageFormat;
+
import org.eclipse.swt.widgets.Composite;
import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage;
import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage;
+import org.jboss.tools.ws.core.facet.delegate.JBossWSFacetInstallDataModelProvider;
import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
/**
@@ -31,14 +34,14 @@
private JBossWSRuntimeConfigBlock block;
public JBossWSFacetInstallPage() {
- super(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_Title);
- setTitle(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_Title);
- setDescription(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_Description);
+ super("jbosswsfacet"); //$NON-NLS-1$
}
public void setConfig(Object config) {
this.model = (IDataModel) config;
-
+ String JbossWSVersion = (String)model.getProperty(JBossWSFacetInstallDataModelProvider.FACET_VERSION_STR);
+ setTitle(MessageFormat.format(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_Title, JbossWSVersion));
+ setDescription(MessageFormat.format(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_Description, JbossWSVersion));
}
public void createControl(Composite parent) {
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSRuntimeConfigBlock.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSRuntimeConfigBlock.java 2009-10-16 08:19:05 UTC (rev 18121)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSRuntimeConfigBlock.java 2009-10-16 08:47:57 UTC (rev 18122)
@@ -29,9 +29,14 @@
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeType;
+import org.eclipse.wst.server.core.ServerCore;
import org.jboss.tools.ws.core.classpath.JBossWSRuntime;
import org.jboss.tools.ws.core.classpath.JBossWSRuntimeManager;
import org.jboss.tools.ws.core.facet.delegate.IJBossWSFacetDataModelProperties;
+import org.jboss.tools.ws.core.facet.delegate.JBossWSFacetInstallDataModelProvider;
import org.jboss.tools.ws.core.utils.StatusUtils;
import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
import org.jboss.tools.ws.creation.ui.CreationUIPlugin;
@@ -47,12 +52,17 @@
private String errMsg;
private IMessageNotifier notifier;
+ private String jbossWSVersion;
private IDataModel model;
+ private final static String JBOSS_IDE_AS_RUNTIME_ID = "org.jboss.ide.eclipse.as.runtime"; //$NON-NLS-1$
+ private final static String JBOSS_IDE_EAP_RUNTIME_ID = "org.jboss.ide.eclipse.as.runtime.eap"; //$NON-NLS-1$
+
public JBossWSRuntimeConfigBlock(Object config){
this.model = (IDataModel) config;
-
+ jbossWSVersion = (String)model.getProperty(JBossWSFacetInstallDataModelProvider.FACET_VERSION_STR);
+// validateTargetRuntime();
}
@@ -141,6 +151,35 @@
}
+ private void validateTargetRuntime(){
+ IFacetedProjectWorkingCopy fpWorkingCopy = (IFacetedProjectWorkingCopy)model.getProperty(JBossWSFacetInstallDataModelProvider.FACETED_PROJECT_WORKING_COPY);
+ IRuntime runtime = fpWorkingCopy.getPrimaryRuntime();
+ if(runtime == null){
+ setErrorMessage(JBossWSCreationCoreMessages.JBossWSRuntimeInstallPage_NoTargetRuntime);
+ return;
+ }
+
+ org.eclipse.wst.server.core.IRuntime serverRuntime = ServerCore.findRuntime(runtime.getProperty("id")); //$NON-NLS-1$
+ IRuntimeType rt = serverRuntime.getRuntimeType();
+ String runtimeTypeId = rt.getId();
+ String version = rt.getVersion();
+ if(runtimeTypeId.indexOf(JBOSS_IDE_AS_RUNTIME_ID) < 0 && runtimeTypeId.indexOf(JBOSS_IDE_EAP_RUNTIME_ID) < 0){
+ setErrorMessage(JBossWSCreationCoreMessages.JBossWSRuntimeInstallPage_NoValidJBossWSRuntime);
+ return;
+ }
+
+ if("3.0".compareTo(jbossWSVersion) <= 0){ //$NON-NLS-1$
+ if("5.0".compareTo(version) > 0){ //$NON-NLS-1$
+ setErrorMessage(JBossWSCreationCoreMessages.JBossWSRuntimeInstallPage_NoValidJBossWSRuntime);
+ return;
+ }
+ }
+
+ setErrorMessage(null);
+
+
+ }
+
private void setInitialValues(){
boolean isServerSupplied = model.getBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED);
String runtimeName = model.getStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID);
@@ -194,7 +233,8 @@
IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, null);
model.setStringProperty(
IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, null);
- enableUserSupplied(false);
+ enableUserSupplied(false);
+
changePageStatus();
}
@@ -228,19 +268,22 @@
protected void initializeRuntimesCombo(Combo cmRuntime, String runtimeName) {
JBossWSRuntime selectedJbws = null;
JBossWSRuntime defaultJbws = null;
- int selectIndex = 0;
+// int selectIndex = 0;
int defaultIndex = 0;
cmRuntime.removeAll();
JBossWSRuntime[] runtimes = JBossWSRuntimeManager.getInstance()
.getRuntimes();
for (int i = 0; i < runtimes.length; i++) {
JBossWSRuntime jr = runtimes[i];
+ if(jbossWSVersion.compareTo(jr.getVersion()) > 0){
+ continue;
+ }
cmRuntime.add(jr.getName());
cmRuntime.setData(jr.getName(), jr);
if(jr.getName().equals(runtimeName)){
selectedJbws = jr;
- selectIndex = i;
+// selectIndex = i;
}
// get default jbossws runtime
if (jr.isDefault()) {
@@ -250,7 +293,7 @@
}
if(selectedJbws != null){
- cmRuntime.select(selectIndex);
+ cmRuntime.setText(runtimeName);
saveJBosswsRuntimeToModel(selectedJbws);
}else if(defaultJbws != null){
cmRuntime.select(defaultIndex);
@@ -306,7 +349,11 @@
}else{
setErrorMessage(null);
}
- }else{
+ }
+ else if(btnServerSupplied.getSelection()){
+ validateTargetRuntime();
+ }
+ else{
setErrorMessage(null);
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2009-10-16 08:19:05 UTC (rev 18121)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2009-10-16 08:47:57 UTC (rev 18122)
@@ -1,5 +1,7 @@
package org.jboss.tools.ws.creation.ui.widgets;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -19,8 +21,10 @@
import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
+import org.jboss.tools.ws.core.utils.JBossWSCoreUtils;
import org.jboss.tools.ws.creation.core.data.ServiceModel;
import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
+import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
public class CodeGenConfigWidget extends SimpleWidgetDataContributor {
@@ -37,6 +41,7 @@
private Button btnRemove;
private Button btnUpdateWebxml;
private Button btnGenDefaultImpl;
+ private Button btnExtension;
public CodeGenConfigWidget(ServiceModel model) {
this.model = model;
@@ -156,6 +161,19 @@
}
}
});
+
+ btnExtension = new Button(configCom, SWT.CHECK);
+ gd = new GridData();
+ gd.horizontalSpan = 3;
+ btnExtension.setLayoutData(gd);
+ btnExtension.setText("Enable SOAP 1.2 binding extension (This option is only available for JBossWS 3.0 or later)");
+ btnExtension.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ model.setEnableSOAP12(btnExtension
+ .getSelection());
+ }
+ });
+
if (model.getWsScenario() != WebServiceScenario.CLIENT) {
btnGenDefaultImpl = new Button(configCom, SWT.CHECK);
gd = new GridData();
@@ -191,8 +209,16 @@
}
});
}
+
+ //enable enable soap12 checkbox if the target jbossws runtime is less than 3.0
+ updateExtensionButtonStatus();
+
return this;
}
+
+ private void updateExtensionButtonStatus(){
+ btnExtension.setEnabled(JBossWSCreationUtils.supportSOAP12(model.getWebProjectName()));
+ }
private void loadBindingFiles(List bindingList) {
for (String fileLocation : model.getBindingFiles()) {
14 years, 8 months
JBoss Tools SVN: r18121 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2009-10-16 04:19:05 -0400 (Fri, 16 Oct 2009)
New Revision: 18121
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/jira/browse/JBIDE-4908
Dali plug-ins should validate required libraries versions more definitely
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2009-10-16 08:06:55 UTC (rev 18120)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2009-10-16 08:19:05 UTC (rev 18121)
@@ -13,7 +13,7 @@
org.eclipse.emf.ecore,
org.eclipse.jdt.core,
org.eclipse.wst.common.project.facet.core,
- org.eclipse.jpt.core,
+ org.eclipse.jpt.core;bundle-version="[2.2.0,2.2.1]",
org.eclipse.jpt.utility,
org.eclipse.jpt.db
Bundle-RequiredExecutionEnvironment: J2SE-1.5
14 years, 8 months
JBoss Tools SVN: r18120 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2009-10-16 04:06:55 -0400 (Fri, 16 Oct 2009)
New Revision: 18120
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
Log:
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2009-10-16 00:15:15 UTC (rev 18119)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2009-10-16 08:06:55 UTC (rev 18120)
@@ -49,8 +49,10 @@
import org.jboss.tools.jst.web.kb.internal.taglib.FacesConfigTagLibrary;
import org.jboss.tools.jst.web.kb.internal.taglib.TLDLibrary;
import org.jboss.tools.jst.web.kb.internal.taglib.composite.CompositeTagLibrary;
+import org.jboss.tools.jst.web.kb.internal.validation.ProjectValidationContext;
import org.jboss.tools.jst.web.kb.taglib.ICustomTagLibrary;
import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
+import org.jboss.tools.jst.web.kb.validation.IValidationContext;
import org.w3c.dom.Element;
/**
@@ -75,6 +77,9 @@
LibraryStorage libraries = new LibraryStorage();
+ ProjectValidationContext validationContext;
+
+ public KbProject() {}
/*
* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.IKbProject#getTagLibraries()
@@ -251,6 +256,10 @@
if(b) {
getClassPath().process();
}
+
+ if(root != null) {
+ getValidationContext().load(root);
+ }
} finally {
fireChanges();
@@ -323,6 +332,8 @@
storeProjectDependencies(root);
storeSourcePaths2(root);
+
+ if(validationContext != null) validationContext.store(root);
XMLUtilities.serialize(root, file.getAbsolutePath());
}
@@ -341,6 +352,12 @@
if(f != null && f.isFile()) f.delete();
}
+ public IValidationContext getValidationContext() {
+ if(validationContext == null) {
+ validationContext = new ProjectValidationContext();
+ }
+ return validationContext;
+ }
/*
*
*/
14 years, 8 months
JBoss Tools SVN: r18119 - in workspace: snjeza/seam-examples and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2009-10-15 20:15:15 -0400 (Thu, 15 Oct 2009)
New Revision: 18119
Added:
workspace/snjeza/seam-examples/booking22.zip
Modified:
workspace/examples/project-examples-3.1.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-5012 JBDS 2.1 GA and Seam 2.2 Examples for EAP 5
Modified: workspace/examples/project-examples-3.1.xml
===================================================================
--- workspace/examples/project-examples-3.1.xml 2009-10-15 23:25:45 UTC (rev 18118)
+++ workspace/examples/project-examples-3.1.xml 2009-10-16 00:15:15 UTC (rev 18119)
@@ -111,6 +111,25 @@
<project>
<category>Seam</category>
+ <name>booking22</name>
+ <included-projects>
+ booking22,booking22-ear,booking22-ejb,booking22-test
+ </included-projects>
+ <shortDescription>Seam 2.2 Booking Example - EAR (including a tutorial)</shortDescription>
+ <description>This example demonstrates the use of Seam in a Java EE 5 environment.
+Transaction and persistence context management is handled by the EJB container.
+This example has been tested on JBoss EAP 5.0.
+It includes the booking22, booking22-ear,booking22-test and booking22-ejb projects.
+</description>
+ <size>38203392</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <welcome type="cheatsheets" url="/booking22/cheatsheets/booking.xml"/>
+ </project>
+
+ <project>
+ <category>Seam</category>
<name>photoalbum-mavenized</name>
<included-projects>
photoalbum-mavenized,photoalbum-mavenized-ear,photoalbum-mavenized-ejb,photoalbum-mavenized-parent
Added: workspace/snjeza/seam-examples/booking22.zip
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/seam-examples/booking22.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 8 months