JBoss Tools SVN: r37712 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-01-09 02:45:20 -0500 (Mon, 09 Jan 2012)
New Revision: 37712
Added:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/TODO
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
Log:
JBDS-1974 - changing jboss_config to jboss_config_dir, which accounts for more usecases
Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/TODO
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/TODO (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/TODO 2012-01-09 07:45:20 UTC (rev 37712)
@@ -0,0 +1 @@
+# NEW_SERVER_ADAPTER Add the default port xpaths in it's own file in this folder
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32 2012-01-09 04:17:56 UTC (rev 37711)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32 2012-01-09 07:45:20 UTC (rev 37712)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<filesets>
-<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
+<fileset excludes="" folder="${jboss_config_dir}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
</filesets>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40 2012-01-09 04:17:56 UTC (rev 37711)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40 2012-01-09 07:45:20 UTC (rev 37712)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<filesets>
-<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
+<fileset excludes="" folder="${jboss_config_dir}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
</filesets>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42 2012-01-09 04:17:56 UTC (rev 37711)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42 2012-01-09 07:45:20 UTC (rev 37712)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<filesets>
-<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
+<fileset excludes="" folder="${jboss_config_dir}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
</filesets>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50 2012-01-09 04:17:56 UTC (rev 37711)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50 2012-01-09 07:45:20 UTC (rev 37712)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<filesets>
-<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
+<fileset excludes="" folder="${jboss_config_dir}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
</filesets>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51 2012-01-09 04:17:56 UTC (rev 37711)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51 2012-01-09 07:45:20 UTC (rev 37712)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<filesets>
-<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
+<fileset excludes="" folder="${jboss_config_dir}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
</filesets>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43 2012-01-09 04:17:56 UTC (rev 37711)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43 2012-01-09 07:45:20 UTC (rev 37712)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<filesets>
-<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
+<fileset excludes="" folder="${jboss_config_dir}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
</filesets>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50 2012-01-09 04:17:56 UTC (rev 37711)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50 2012-01-09 07:45:20 UTC (rev 37712)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<filesets>
-<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
+<fileset excludes="" folder="${jboss_config_dir}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/>
</filesets>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-01-09 04:17:56 UTC (rev 37711)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-01-09 07:45:20 UTC (rev 37712)
@@ -97,7 +97,7 @@
LocalJBossServerRuntime ajbsr = (LocalJBossServerRuntime)
server2.getRuntime().loadAdapter(LocalJBossServerRuntime.class, null);
if(ajbsr != null ) {
- String configFolder = "server/${jboss_config}"; //ajbsr.getConfigurationFullPath(); //$NON-NLS-1$
+ String configFolder = "${jboss_config_dir}"; //ajbsr.getConfigurationFullPath(); //$NON-NLS-1$
if( configFolder != null ) {
ArrayList<XPathCategory> defaults = loadDefaults(server2, configFolder);
serverToCategories.put(server2.getId(), defaults);
12 years, 11 months
JBoss Tools SVN: r37711 - in trunk/ws/docs/soap_reference/en-US: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-01-08 23:17:56 -0500 (Sun, 08 Jan 2012)
New Revision: 37711
Modified:
trunk/ws/docs/soap_reference/en-US/Book_Info.xml
trunk/ws/docs/soap_reference/en-US/images/image-jbt-generate_a_simple_web_service_02.png
trunk/ws/docs/soap_reference/en-US/proc-jbt-generate_a_simple_web_service.xml
Log:
updated for 3.3.0.M5
Modified: trunk/ws/docs/soap_reference/en-US/Book_Info.xml
===================================================================
--- trunk/ws/docs/soap_reference/en-US/Book_Info.xml 2012-01-09 04:14:51 UTC (rev 37710)
+++ trunk/ws/docs/soap_reference/en-US/Book_Info.xml 2012-01-09 04:17:56 UTC (rev 37711)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
- <pubsnumber>2</pubsnumber>
+ <pubsnumber>3</pubsnumber>
<abstract>
<para>The JBoss SOAP Web Services User Guide explains how to use the JBoss Web Services module to implement SOAP web services in Java.</para>
</abstract>
Modified: trunk/ws/docs/soap_reference/en-US/images/image-jbt-generate_a_simple_web_service_02.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/proc-jbt-generate_a_simple_web_service.xml
===================================================================
--- trunk/ws/docs/soap_reference/en-US/proc-jbt-generate_a_simple_web_service.xml 2012-01-09 04:14:51 UTC (rev 37710)
+++ trunk/ws/docs/soap_reference/en-US/proc-jbt-generate_a_simple_web_service.xml 2012-01-09 04:17:56 UTC (rev 37711)
@@ -121,6 +121,14 @@
<entry>Checkbox is checked by default, but is not mandatory.</entry>
<entry>Leaving this checked will add your new service to the <filename>web.xml</filename> in your project.</entry>
</row>
+ <row>
+ <entry>
+ </entry>
+ <entry>Add RESTEasy Jars from root runtime directory</entry>
+ <entry>no</entry>
+ <entry>Check this box to add RESTEasy JARs to the project.</entry>
+ <entry>This option allows you to add RESTEasy JARs to the project if they appear in the root runtime directory but are not installed in the runtime. While this is not required, it will assist when working with JBoss Application Server 5 and JBoss Enterprse Application Platform 5 web service projects.</entry>
+ </row>
<row>
<entry>Service implementation</entry>
<entry>Package</entry>
12 years, 11 months
JBoss Tools SVN: r37710 - in trunk/ws/docs/restful_reference/en-US: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-01-08 23:14:51 -0500 (Sun, 08 Jan 2012)
New Revision: 37710
Modified:
trunk/ws/docs/restful_reference/en-US/Book_Info.xml
trunk/ws/docs/restful_reference/en-US/JBoss_RESTful_Web_Services_User_Guide.xml
trunk/ws/docs/restful_reference/en-US/images/image-jbt-generate_a_sample_restful_web_service_02.png
trunk/ws/docs/restful_reference/en-US/images/image-jbt-generate_a_simple_web_service_02.png
trunk/ws/docs/restful_reference/en-US/proc-jbt-generate_a_sample_restful_web_service.xml
trunk/ws/docs/restful_reference/en-US/proc-jbt-generate_a_simple_web_service.xml
Log:
updated for 3.3.0.M5
Modified: trunk/ws/docs/restful_reference/en-US/Book_Info.xml
===================================================================
--- trunk/ws/docs/restful_reference/en-US/Book_Info.xml 2012-01-09 04:07:08 UTC (rev 37709)
+++ trunk/ws/docs/restful_reference/en-US/Book_Info.xml 2012-01-09 04:14:51 UTC (rev 37710)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
- <pubsnumber>3</pubsnumber>
+ <pubsnumber>4</pubsnumber>
<abstract>
<para>The JBoss RESTful Web Services User Guide explains how to use RESTful Web Services to implement web services in Java.</para>
</abstract>
Modified: trunk/ws/docs/restful_reference/en-US/JBoss_RESTful_Web_Services_User_Guide.xml
===================================================================
--- trunk/ws/docs/restful_reference/en-US/JBoss_RESTful_Web_Services_User_Guide.xml 2012-01-09 04:07:08 UTC (rev 37709)
+++ trunk/ws/docs/restful_reference/en-US/JBoss_RESTful_Web_Services_User_Guide.xml 2012-01-09 04:14:51 UTC (rev 37710)
@@ -9,6 +9,7 @@
</xi:include>
<xi:include href="working_with_RESTful_web_services.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
</xi:include>
+<xi:include href="simple_web_service.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="sample_web_service_wizards.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="resteasy_simple_project_example.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="web_service_test_view.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Modified: trunk/ws/docs/restful_reference/en-US/images/image-jbt-generate_a_sample_restful_web_service_02.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/restful_reference/en-US/images/image-jbt-generate_a_simple_web_service_02.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/restful_reference/en-US/proc-jbt-generate_a_sample_restful_web_service.xml
===================================================================
--- trunk/ws/docs/restful_reference/en-US/proc-jbt-generate_a_sample_restful_web_service.xml 2012-01-09 04:07:08 UTC (rev 37709)
+++ trunk/ws/docs/restful_reference/en-US/proc-jbt-generate_a_sample_restful_web_service.xml 2012-01-09 04:14:51 UTC (rev 37710)
@@ -70,7 +70,9 @@
</textobject>
</mediaobject>
</figure>
- <!-- <para>&HORIZ_LINE;</para>-->
+ <para>
+ Due to the nature in which JBoss Application Server 7 and JBoss Enterprise Application Server 5 handle JAX-RS support, the wizard can now be completed without the need for RESTEasy JARs in the project classpath or associated project runtime.
+ </para>
</step>
<step>
<title>Define the service attributes</title>
@@ -117,6 +119,14 @@
<entry>Check this box to add the service to the deployment descriptor.</entry>
<entry>This option is checked by default and may be unchecked when deploying to JBoss AS 6.0 or RESTEasy 2.0 servers. Service information is not required in the deployment descriptor for these servers.</entry>
</row>
+ <row>
+ <entry>
+ </entry>
+ <entry>Add RESTEasy Jars from root runtime directory</entry>
+ <entry>no</entry>
+ <entry>Check this box to add RESTEasy JARs to the project.</entry>
+ <entry>This option allows you to add RESTEasy JARs to the project if they appear in the root runtime directory but are not installed in the runtime. While this is not required, it will assist when working with JBoss Application Server 5 and JBoss Enterprse Application Platform 5 web service projects.</entry>
+ </row>
<row>
<entry>Sample Web Service Class</entry>
<entry>Package</entry>
Modified: trunk/ws/docs/restful_reference/en-US/proc-jbt-generate_a_simple_web_service.xml
===================================================================
--- trunk/ws/docs/restful_reference/en-US/proc-jbt-generate_a_simple_web_service.xml 2012-01-09 04:07:08 UTC (rev 37709)
+++ trunk/ws/docs/restful_reference/en-US/proc-jbt-generate_a_simple_web_service.xml 2012-01-09 04:14:51 UTC (rev 37710)
@@ -121,6 +121,14 @@
<entry>Checkbox is checked by default, but is not mandatory.</entry>
<entry>Leaving this checked will add your new service to the <filename>web.xml</filename> in your project.</entry>
</row>
+ <row>
+ <entry>
+ </entry>
+ <entry>Add RESTEasy Jars from root runtime directory</entry>
+ <entry>no</entry>
+ <entry>Check this box to add RESTEasy JARs to the project.</entry>
+ <entry>This option allows you to add RESTEasy JARs to the project if they appear in the root runtime directory but are not installed in the runtime. While this is not required, it will assist when working with JBoss Application Server 5 and JBoss Enterprse Application Platform 5 web service projects.</entry>
+ </row>
<row>
<entry>Service implementation</entry>
<entry>Package</entry>
12 years, 11 months
JBoss Tools SVN: r37709 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-01-08 23:07:08 -0500 (Sun, 08 Jan 2012)
New Revision: 37709
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ExpressionResolverUtil.java
Log:
Rogue sysout removed.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ExpressionResolverUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ExpressionResolverUtil.java 2012-01-07 20:46:19 UTC (rev 37708)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ExpressionResolverUtil.java 2012-01-09 04:07:08 UTC (rev 37709)
@@ -69,7 +69,6 @@
String resolvedValue = null;
for (int i = 0; i < len; i = value.offsetByCodePoints(i, 1)) {
final int ch = value.codePointAt(i);
- System.out.print((char)ch);
switch (state) {
case INITIAL: {
switch (ch) {
12 years, 11 months
JBoss Tools SVN: r37708 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-01-07 15:46:19 -0500 (Sat, 07 Jan 2012)
New Revision: 37708
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java
Log:
JBIDE-10603 https://issues.jboss.org/browse/JBIDE-10603
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2012-01-07 01:44:41 UTC (rev 37707)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2012-01-07 20:46:19 UTC (rev 37708)
@@ -45,7 +45,6 @@
@Override
public boolean performFinish() {
- page.finishPage();
final List<Project> selectedProjects = new ArrayList<Project>();
if (page.getSelection() == null || page.getSelection().size() <= 0) {
return false;
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java 2012-01-07 01:44:41 UTC (rev 37707)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java 2012-01-07 20:46:19 UTC (rev 37708)
@@ -91,8 +91,7 @@
private Composite noteComposite;
private List<Category> categories;
private Text descriptionText;
- private Button isWorkspace;
- private Text outputDirectoryText;
+
public NewProjectExamplesWizardPage() {
super("org.jboss.tools.project.examples"); //$NON-NLS-1$
@@ -107,8 +106,6 @@
GridData gd = new GridData(SWT.FILL, SWT.FILL, false, false);
composite.setLayoutData(gd);
- //createOutputDirectoryGroup(composite);
-
Composite siteComposite = new Composite(composite,SWT.NONE);
GridLayout gridLayout = new GridLayout(2,false);
gridLayout.marginHeight = 0;
@@ -325,68 +322,7 @@
siteCombo.setText(ProjectExamplesActivator.ALL_SITES);
}
- private void createOutputDirectoryGroup(Composite composite) {
- GridData gd;
- Group outputDirectoryGroup = new Group(composite, SWT.NONE);
- GridLayout layout = new GridLayout(2, false);
- outputDirectoryGroup.setLayout(layout);
- outputDirectoryGroup.setText(Messages.ProjectExamplesPreferencePage_Output_directory);
- gd = new GridData(SWT.FILL, SWT.FILL, true, false);
- outputDirectoryGroup.setLayoutData(gd);
-
- isWorkspace = new Button(outputDirectoryGroup, SWT.CHECK);
- gd = new GridData(SWT.FILL, SWT.FILL, true, false);
- gd.horizontalSpan = 2;
- isWorkspace.setLayoutData(gd);
- isWorkspace.setText(Messages.ProjectExamplesPreferencePage_Use_default_workspace_location);
- isWorkspace.setSelection(ProjectExamplesActivator.getDefault().getPreferenceStore().getBoolean(ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT));
-
- outputDirectoryText = new Text(outputDirectoryGroup, SWT.SINGLE|SWT.BORDER);
- gd = new GridData(SWT.FILL, SWT.FILL, true, false);
- gd.verticalAlignment = SWT.CENTER;
- outputDirectoryText.setLayoutData(gd);
- final IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
- String outputDirectoryValue = store.getString(ProjectExamplesActivator.PROJECT_EXAMPLES_OUTPUT_DIRECTORY);
- outputDirectoryText.setText(outputDirectoryValue == null ? "" : outputDirectoryValue); //$NON-NLS-1$
- final Button outputDirectoryBrowse = new Button(outputDirectoryGroup, SWT.PUSH);
- outputDirectoryBrowse.setText(Messages.Browse);
- outputDirectoryBrowse.addSelectionListener(new SelectionAdapter(){
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SINGLE);
- String value = outputDirectoryText.getText();
- if (value.trim().length() == 0) {
- value = Platform.getLocation().toOSString();
- }
- dialog.setFilterPath(value);
-
- String result = dialog.open();
- if (result == null || result.trim().length() == 0) {
- return;
- }
- outputDirectoryText.setText(result);
-
- }
-
- });
- enableControls(outputDirectoryBrowse);
-
- isWorkspace.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- enableControls(outputDirectoryBrowse);
- }
-
- });
- }
- protected void enableControls(Button outputDirectoryBrowse) {
- outputDirectoryText.setEnabled(!isWorkspace.getSelection());
- outputDirectoryBrowse.setEnabled(!isWorkspace.getSelection());
- }
-
private void configureSizeAndLocation() {
Shell shell = getContainer().getShell();
Point size = new Point(DEFAULT_WIDTH, getHeight());
@@ -658,11 +594,4 @@
details.setEnabled(true);
}
- public void finishPage() {
- final IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
- store.setValue(ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT, isWorkspace.getSelection());
- if (outputDirectoryText.getText().trim().length() > 0) {
- store.setValue(ProjectExamplesActivator.PROJECT_EXAMPLES_OUTPUT_DIRECTORY, outputDirectoryText.getText());
- }
- }
}
12 years, 11 months
JBoss Tools SVN: r37707 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-06 20:44:41 -0500 (Fri, 06 Jan 2012)
New Revision: 37707
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/JavaStringELInfoHover.java
Log:
JBIDE-10601
https://issues.joss.org/browse/JBIDE-10601
When computing hover, use safe methods, that do not require current file to be in the class path.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/JavaStringELInfoHover.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/JavaStringELInfoHover.java 2012-01-07 01:39:07 UTC (rev 37706)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/JavaStringELInfoHover.java 2012-01-07 01:44:41 UTC (rev 37707)
@@ -160,6 +160,10 @@
// Ignore. It is probably because of Java element's resource is not found
}
+ if(file == null) {
+ return null;
+ }
+
ELContext context = PageContextFactory.createPageContext(file, JavaCore.JAVA_SOURCE_CONTENT_TYPE);
TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, context);
@@ -238,15 +242,11 @@
if (input == null)
return null;
- IFile file = null;
-
- try {
- IResource resource = input.getCorrespondingResource();
- if (resource instanceof IFile)
- file = (IFile) resource;
- } catch (JavaModelException e) {
- // Ignore. It is probably because of Java element's resource is not found
+ IResource r = input.getResource();
+ if(!(r instanceof IFile) || !r.exists() || r.getName().endsWith(".jar")) { //$NON-NLS-1$
+ return null;
}
+ IFile file = (IFile)r;
ELContext context = PageContextFactory.createPageContext(file, JavaCore.JAVA_SOURCE_CONTENT_TYPE);
12 years, 12 months
JBoss Tools SVN: r37706 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-06 20:39:07 -0500 (Fri, 06 Jan 2012)
New Revision: 37706
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java
Log:
JBIDE-10601
https://issues.joss.org/browse/JBIDE-10601
When detecting hyperlinks, use safe methods, that do not require current file to be in the class path.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java 2012-01-07 00:27:05 UTC (rev 37705)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java 2012-01-07 01:39:07 UTC (rev 37706)
@@ -14,7 +14,6 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IField;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMemberValuePair;
@@ -33,7 +32,6 @@
import org.eclipse.ui.texteditor.ITextEditor;
import org.jboss.tools.cdi.internal.core.refactoring.CDIMarkerResolutionUtils;
import org.jboss.tools.cdi.seam.text.ext.CDISeamExtPlugin;
-import org.jboss.tools.common.EclipseUtil;
public class CDISeamResourceLoadingHyperlinkDetector extends AbstractHyperlinkDetector{
public static final String RESOURCE_ANNOTATION = "org.jboss.seam.solder.resourceLoader.Resource";
@@ -54,24 +52,15 @@
IDocument document= textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
- IFile file = null;
-
- try {
- IResource resource = input.getCorrespondingResource();
- if (resource instanceof IFile)
- file = (IFile) resource;
- } catch (JavaModelException e) {
- CDISeamExtPlugin.log(e);
+ IResource r = input.getResource();
+ if(!(r instanceof IFile) || !r.exists() || r.getName().endsWith(".jar")) {
+ return null;
}
+ IFile file = (IFile)r;
- if(file == null)
- return null;
-
try {
- ICompilationUnit cu = EclipseUtil.getCompilationUnit(file);
-
- IJavaElement element = cu == null ? null : cu.getElementAt(offset);
+ IJavaElement element = input.getElementAt(offset);
if(element != null){
if(element instanceof IField){
IAnnotation annotation = CDIMarkerResolutionUtils.findAnnotation(element, RESOURCE_ANNOTATION);
12 years, 12 months
JBoss Tools SVN: r37705 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-06 19:27:05 -0500 (Fri, 06 Jan 2012)
New Revision: 37705
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/WebValidator.java
Log:
JBIDE-10601
https://issues.joss.org/browse/JBIDE-10601
Check that EclipseUtil.getCompilationUnit(IFile) returns not null to determine if Java file should be validated.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/WebValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/WebValidator.java 2012-01-07 00:26:17 UTC (rev 37704)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/WebValidator.java 2012-01-07 00:27:05 UTC (rev 37705)
@@ -15,6 +15,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.validation.ContextValidationHelper;
import org.jboss.tools.common.validation.IProjectValidationContext;
@@ -79,6 +80,10 @@
if(shouldValidateJavaSources()) {
for (int i = 0; currentSources!=null && i < currentSources.length; i++) {
if(currentSources[i].getLocation().isPrefixOf(file.getLocation())) {
+ if(JAVA_EXT.equalsIgnoreCase(file.getFileExtension())) {
+ //check that Java is not excluded from class path.
+ return EclipseUtil.getCompilationUnit(file) != null;
+ }
return true;
}
}
12 years, 12 months
JBoss Tools SVN: r37704 - in trunk/cdi/tests: org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-01-06 19:26:17 -0500 (Fri, 06 Jan 2012)
New Revision: 37704
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/search.jsp
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java
Log:
Ctrl+Shift+G on a java element doesn't work for complex ELs https://issues.jboss.org/browse/JBIDE-10593
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/search.jsp
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/search.jsp 2012-01-06 23:48:12 UTC (rev 37703)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/search.jsp 2012-01-07 00:26:17 UTC (rev 37704)
@@ -10,6 +10,7 @@
<h:outputText value="#{mySearchableBean.sFoo2()}"/>
<h:outputText value="#{sFoo}"/>
<h:outputText value="#{sFoo1}"/>
+ <h:outputText value="#{sFoo + mySearchableBean.sFoo2()}"/>
</h1>
</f:view>
</body>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java 2012-01-06 23:48:12 UTC (rev 37703)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java 2012-01-07 00:26:17 UTC (rev 37704)
@@ -76,6 +76,7 @@
ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
matches.add(new MatchStructure("/tck/WebContent/search.jsp", "mySearchableBean"));
+ matches.add(new MatchStructure("/tck/WebContent/search.jsp", "mySearchableBean"));
QueryParticipantTestUtils.testSearchParticipant(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/jbt/search/MySearchableBean.java",
@@ -104,6 +105,7 @@
ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
matches.add(new MatchStructure("/tck/WebContent/search.jsp", "sFoo"));
+ matches.add(new MatchStructure("/tck/WebContent/search.jsp", "sFoo"));
QueryParticipantTestUtils.testSearchParticipant(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/jbt/search/MySearchableBean.java",
12 years, 12 months
JBoss Tools SVN: r37703 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-06 18:48:12 -0500 (Fri, 06 Jan 2012)
New Revision: 37703
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
Log:
JBIDE-10601
https://issues.joss.org/browse/JBIDE-10601
Use EclipseUtil.getCompilationUnit(IFile) instead of JavaCore.create(IFile).
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-01-06 21:31:50 UTC (rev 37702)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-01-06 23:48:12 UTC (rev 37703)
@@ -36,6 +36,7 @@
import org.eclipse.wst.validation.internal.core.ValidationException;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.jboss.tools.common.CommonPlugin;
+import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.el.core.ELReference;
import org.jboss.tools.common.el.core.model.ELExpression;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
@@ -439,24 +440,21 @@
}
IJavaSourceReference getJavaReference(final IFile file, final int startPosition, final int length) {
- IMember m = null;
+ IJavaElement el = null;
if(file.getName().endsWith(".java")) {
- IJavaElement el = JavaCore.create(file);
- if(el instanceof ICompilationUnit) {
+ ICompilationUnit u = EclipseUtil.getCompilationUnit(file);
+ if(u != null) {
try {
- el = ((ICompilationUnit)el).getElementAt(startPosition);
+ el = u.getElementAt(startPosition);
} catch (CoreException exc) {
CommonPlugin.getDefault().logError(exc);
}
- if(el instanceof IMember) {
- m = (IMember)el;
- }
}
}
- if(m != null) {
- final IMember mm = m;
+ if(el instanceof IMember) {
+ final IMember member = (IMember)el;
return new IJavaSourceReference() {
public int getStartPosition() {
return startPosition;
@@ -468,10 +466,10 @@
return file;
}
public IMember getSourceMember() {
- return mm;
+ return member;
}
public IJavaElement getSourceElement() {
- return mm;
+ return member;
}
};
}
12 years, 12 months