JBoss Tools SVN: r40467 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-25 02:47:57 -0400 (Wed, 25 Apr 2012)
New Revision: 40467
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
Log:
JBIDE-11267 for as<7
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2012-04-25 06:41:08 UTC (rev 40466)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2012-04-25 06:47:57 UTC (rev 40467)
@@ -108,6 +108,10 @@
IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JBOSS_SERVER_HOME_URL,
"file:" + new Path(rseHome).append(IJBossRuntimeResourceConstants.SERVER).toOSString());
+ currentArgs = ArgsUtil.setArg(currentArgs, null,
+ IJBossRuntimeConstants.STARTUP_ARG_CONFIG_LONG,
+ RSEUtils.getRSEConfigName(jbossServer.getServer()));
+
currentVMArgs = ArgsUtil.setArg(currentVMArgs, null,
IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.ENDORSED_DIRS,
new Path(rseHome).append(
13 years, 11 months
JBoss Tools SVN: r40466 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-25 02:41:08 -0400 (Wed, 25 Apr 2012)
New Revision: 40466
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java
Log:
JBIDE-11267 for as7
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-04-25 05:48:50 UTC (rev 40465)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-04-25 06:41:08 UTC (rev 40466)
@@ -16,6 +16,7 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerType;
+import org.eclipse.wst.server.core.internal.Base;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.ILaunchConfigConfigurator;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
@@ -81,9 +82,11 @@
IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT,
null, "0.0.0.0");
}
+ String rseConfigFile = ((Base)jbossServer.getServer()).getAttribute(
+ RSEUtils.RSE_SERVER_CONFIG, (String)null);
programArguments = ArgsUtil.setArg(programArguments, null,
- IJBossRuntimeConstants.JB7_SERVER_CONFIG_ARG,
- ((LocalJBoss7ServerRuntime)jbossRuntime).getConfigurationFile());
+ IJBossRuntimeConstants.JB7_SERVER_CONFIG_ARG, rseConfigFile
+ );
String vmArguments = getDefaultVMArguments(jbossServer, jbossRuntime);
String jar = getJar(jbossServer, jbossRuntime);
13 years, 11 months
JBoss Tools SVN: r40465 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-25 01:48:50 -0400 (Wed, 25 Apr 2012)
New Revision: 40465
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java
Log:
JBIDE-9239
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2012-04-25 04:09:04 UTC (rev 40464)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2012-04-25 05:48:50 UTC (rev 40465)
@@ -44,8 +44,6 @@
if (!result.isOK()) {
previousStopFailed = true;
setServerStarted();
- } else {
- forceStop();
}
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java 2012-04-25 04:09:04 UTC (rev 40464)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java 2012-04-25 05:48:50 UTC (rev 40465)
@@ -113,8 +113,9 @@
IStatus s = util.addDeploymentScanner(server, newScannerName, path);
if( s.isOK()){
props.put(newScannerName, path);
+ util.updateDeploymentScannerInterval(server, newScannerName, 5000);
}
- Trace.trace(Trace.STRING_FINER, "Added Deployment Scanner: success="+s.isOK() + ", " + scannerName + ":" + props.get(scannerName)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ Trace.trace(Trace.STRING_FINER, "Added Deployment Scanner: success="+s.isOK() + ", " + scannerName + ":" + props.get(newScannerName)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
// Write the file out
13 years, 11 months
JBoss Tools SVN: r40464 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-04-25 00:09:04 -0400 (Wed, 25 Apr 2012)
New Revision: 40464
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java
Log:
Added code to undeploy all projects when each test completes.
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-04-25 03:43:53 UTC (rev 40463)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-04-25 04:09:04 UTC (rev 40464)
@@ -105,17 +105,19 @@
//String text2 = console.getConsoleText(TIME_5S, TIME_20S, false);
String text2 = console.getConsoleText(TIME_5S, TIME_60S, false); /* https://issues.jboss.org/browse/JBQA-5838 - ldimaggi */
- log.info("text2=" + text2);
- console.clearConsole();
-
- if (text2.length() == 0) {
+ log.info("text2 = " + text2);
+ //console.clearConsole();
+
+ if (text2.length() == 0) {
return null;
}
else {
return text2;
- }
-
+ }
}
+
+
+
/**
* executes given class in given project (path must include project name)
* @param path clientClass as could be seen in package explorer (e.g src, org.jboss.tools.test.Class.java)
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java 2012-04-25 03:43:53 UTC (rev 40463)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java 2012-04-25 04:09:04 UTC (rev 40464)
@@ -27,14 +27,14 @@
protected void executeExample() {
super.executeExample();
String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.helloworld.test","SendJMSMessage.java");
+ assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]"));
assertNotNull("Calling JMS Send message failed, nothing appened to server log",text);
- assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]"));
assertTrue("Calling JMS Send message failed, unexpected server output :"+text,text.contains("Body: Hello World"));
text = null;
text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.helloworld.test","SendEsbMessage.java");
- assertNotNull("Calling ESB Send message failed, nothing appened to server log",text);
assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]"));
+ assertNotNull("Calling ESB Send message failed, nothing appened to server log",text);
assertTrue("Calling ESB Send message failed, unexpected server output :"+text,text.contains("hello world esb"));
SWTTestExt.servers.removeAllProjectsFromServer();
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java 2012-04-25 03:43:53 UTC (rev 40463)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldAction.java 2012-04-25 04:09:04 UTC (rev 40464)
@@ -23,6 +23,6 @@
String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.helloworldaction.test","SendJMSMessage.java");
assertNotNull("Calling JMS Send message failed, nothing appened to server log",text);
assertTrue("Calling JMS Send message failed, unexpected server output :"+text,text.contains("Hello World Action ESB invoked!"));
- SWTTestExt.servers.removeAllProjectsFromServer();
+ SWTTestExt.servers.removeAllProjectsFromServer();
}
}
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2012-04-25 03:43:53 UTC (rev 40463)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorldFileAction.java 2012-04-25 04:09:04 UTC (rev 40464)
@@ -114,7 +114,7 @@
String text = executeClientGetServerOutput(getExampleClientProjectName(),"src",
"org.jboss.soa.esb.samples.quickstart.helloworldfileaction.test",
"CreateTestFile.java");
-
+ assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]"));
assertNotNull("Calling JMS Send message failed, nothing appened to server log",text);
assertTrue("Calling JMS Send message failed, unexpected server output :"+text,text.contains("Body: Hello World"));
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java 2012-04-25 03:43:53 UTC (rev 40463)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksCSV2XML.java 2012-04-25 04:09:04 UTC (rev 40464)
@@ -20,6 +20,7 @@
protected void executeExample() {
super.executeExample();
String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformcsv2xml","SendJMSMessage.java");
+ assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]"));
assertNotNull("Calling Send message failed, nothing appened to server log",text);
assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("<csv-set>"));
SWTTestExt.servers.removeAllProjectsFromServer();
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java 2012-04-25 03:43:53 UTC (rev 40463)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2POJO.java 2012-04-25 04:09:04 UTC (rev 40464)
@@ -22,9 +22,13 @@
super.executeExample();
String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2pojo.test","SendJMSMessage.java");
bot.sleep(Timing.time3S());
+ assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]"));
assertNotNull("Calling Send message failed, nothing appened to server log",text);
assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Order Items"));
+
text = executeClient(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2pojo.test","ReceiveJMSMessage.java");
+ assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]"));
+ assertNotNull("Calling Send message failed, nothing appened to server log",text);
assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Order Items"));
SWTTestExt.servers.removeAllProjectsFromServer();
}
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java 2012-04-25 03:43:53 UTC (rev 40463)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLDateManipulation.java 2012-04-25 04:09:04 UTC (rev 40464)
@@ -21,6 +21,7 @@
super.executeExample();
String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2xmldatemanipulation.test","SendJMSMessage.java");
bot.sleep(Timing.time3S());
+ assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]"));
assertNotNull("Calling Send message failed, nothing appened to server log",text);
assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("OrderDate"));
SWTTestExt.servers.removeAllProjectsFromServer();
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java 2012-04-25 03:43:53 UTC (rev 40463)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java 2012-04-25 04:09:04 UTC (rev 40464)
@@ -22,6 +22,7 @@
super.executeExample();
String text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.transformxml2xmlsimple.test","SendJMSMessage.java");
bot.sleep(Timing.time3S());
+ assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]"));
assertNotNull("Calling Send message failed, nothing appened to server log",text);
assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("<Order"));
SWTTestExt.servers.removeAllProjectsFromServer();
13 years, 11 months
JBoss Tools SVN: r40463 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-24 23:43:53 -0400 (Tue, 24 Apr 2012)
New Revision: 40463
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java
Log:
/JBIDE-11488 patch for clean workspace
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java 2012-04-25 00:57:58 UTC (rev 40462)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java 2012-04-25 03:43:53 UTC (rev 40463)
@@ -51,6 +51,9 @@
public void setFolder(String folder) {
setInput(folder);
+ String t = getSelectedConfiguration();
+ if( t != null )
+ setSelection(new StructuredSelection(new Object[]{t}));
}
public String getSelectedConfiguration() {
13 years, 11 months
JBoss Tools SVN: r40462 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb: internal and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-24 20:57:58 -0400 (Tue, 24 Apr 2012)
New Revision: 40462
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java
Log:
JBIDE-11539
https://issues.jboss.org/browse/JBIDE-11539
Unnecessary reference to document is removed.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2012-04-24 23:41:56 UTC (rev 40461)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2012-04-25 00:57:58 UTC (rev 40462)
@@ -386,9 +386,8 @@
if (context != null) {
IDOMDocument domDocument = domModel.getDocument();
context.setResource(file);
- if (document != null && context instanceof XmlContextImpl) {
- // Renew the document in context, since it might be cleared by context.setResource() call
- ((XmlContextImpl)context).setDocument(document);
+ if (document == null && context instanceof XmlContextImpl) {
+ document = model.getStructuredDocument();
}
IProject project = file != null ? file.getProject() : getActiveProject();
@@ -396,7 +395,7 @@
context.setElResolvers(ELResolverFactoryManager.getInstance().getResolvers(project));
if (context instanceof JspContextImpl && !(context instanceof FaceletPageContextImpl)) {
// Fill JSP namespaces defined in TLDCMDocumentManager
- fillJSPNameSpaces((JspContextImpl)context);
+ fillJSPNameSpaces((JspContextImpl)context, document);
}
// The subsequently called functions may use the file and document
// already stored in context for their needs
@@ -520,9 +519,9 @@
* @param context
*/
@SuppressWarnings("rawtypes")
- private static void fillJSPNameSpaces(JspContextImpl context) {
- TLDCMDocumentManager manager = TaglibController.getTLDCMDocumentManager(context.getDocument());
- List trackers = (manager == null? null : manager.getCMDocumentTrackers(context.getDocument().getLength() - 1));
+ private static void fillJSPNameSpaces(JspContextImpl context, IDocument document) {
+ TLDCMDocumentManager manager = TaglibController.getTLDCMDocumentManager(document);
+ List trackers = (manager == null? null : manager.getCMDocumentTrackers(document.getLength() - 1));
for (int i = 0; trackers != null && i < trackers.size(); i++) {
TaglibTracker tt = (TaglibTracker)trackers.get(i);
final String prefix = tt.getPrefix() == null ? null : tt.getPrefix().trim();
@@ -530,7 +529,7 @@
if (prefix != null && prefix.length() > 0 &&
uri != null && uri.length() > 0) {
- IRegion region = new Region(0, context.getDocument().getLength());
+ IRegion region = new Region(0, document.getLength());
INameSpace nameSpace = new NameSpace(
uri, prefix,
TagLibraryManager.getLibraries(
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java 2012-04-24 23:41:56 UTC (rev 40461)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/XmlContextImpl.java 2012-04-25 00:57:58 UTC (rev 40462)
@@ -17,7 +17,6 @@
import java.util.Map;
import java.util.Set;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
@@ -36,20 +35,13 @@
*
*/
public class XmlContextImpl extends ELContextImpl implements IXmlContext {
- protected IDocument document;
// Fix for JBIDE-5097: It must be a map of <IRegion to Map of <NS-Prefix to NS>>
protected Map<IRegion, Map<String, INameSpace>> nameSpaces = new HashMap<IRegion, Map<String, INameSpace>>();
protected Set<String> uris = new HashSet<String>();
- /**
- * Sets up the context resource and retrieves the document for the specified resource
- */
- @Override
- public void setResource(IFile resource) {
- super.setResource(resource);
-
- document = null;
+ public IDocument getDocument() {
+ IDocument document = null;
if (resource != null) {
FileEditorInput editorInput = null;
try {
@@ -59,24 +51,9 @@
releaseConnectedDocument(editorInput);
}
}
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.PageContext#getDocument()
- */
- public IDocument getDocument() {
return document;
}
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.PageContext#getDocument()
- */
- public void setDocument(IDocument document) {
- this.document = document;
- }
-
+
/*
* TODO: the visibility must differ between 'include'-like and 'template'-like inclusion
*
13 years, 11 months
JBoss Tools SVN: r40461 - trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-24 19:41:56 -0400 (Tue, 24 Apr 2012)
New Revision: 40461
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties
Log:
Renamed "GWT Entry Point Modules" to just "GWT", because it now configures modules and output folder
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2012-04-24 21:06:16 UTC (rev 40460)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2012-04-24 23:41:56 UTC (rev 40461)
@@ -34,7 +34,7 @@
ConfiguratorPreferencePage_Configure_Seam_Artifacts=Seam Artifacts (view folder, model source folder, package ...)
ConfiguratorPreferencePage_Configure_Seam_Runtime=Seam Runtime
ConfiguratorPreferencePage_Configure_Seam_when_importing_Maven_projects=Seam
-ConfiguratorPreferencePage_Configure_GWT=GWT Entry Point Modules
+ConfiguratorPreferencePage_Configure_GWT=GWT
ConfiguratorPreferencePage_When_importing_Maven_projects_configure_the_following=When importing Maven projects configure the following:
13 years, 11 months
JBoss Tools SVN: r40460 - trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-24 17:06:16 -0400 (Tue, 24 Apr 2012)
New Revision: 40460
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean1.java
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
Log:
JBIDE-11510
https://issues.jboss.org/browse/JBIDE-11510
Test for case #{a['b'].c|} is added.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean1.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean1.java 2012-04-24 21:05:34 UTC (rev 40459)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/Bean1.java 2012-04-24 21:06:16 UTC (rev 40460)
@@ -11,5 +11,6 @@
String s1 = "#{ mybean1}";
String s2 = "#{ mybean1. }";
String s3 = "#{ mybean1 }";
+ String s4 = "#{mybean2['100'].ch}";
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml 2012-04-24 21:05:34 UTC (rev 40459)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml 2012-04-24 21:06:16 UTC (rev 40460)
@@ -11,4 +11,5 @@
<h:outputText value="#{testA.addB(testB.addA(testA.addB(testB.addA())))}"/>
<h:outputText value="#{mybean2['10']}"/>
<h:outputText value="#{mybean2[]}"/>
+<h:outputText value="#{mybean2['100'].ch}"/>
</html>
\ No newline at end of file
13 years, 11 months
JBoss Tools SVN: r40459 - trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-24 17:05:34 -0400 (Tue, 24 Apr 2012)
New Revision: 40459
Modified:
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java
Log:
JBIDE-11510
https://issues.jboss.org/browse/JBIDE-11510
Case #{a['b'].c|} is fixed.
Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java 2012-04-24 21:03:58 UTC (rev 40458)
+++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java 2012-04-24 21:05:34 UTC (rev 40459)
@@ -644,7 +644,8 @@
if (string.indexOf('\'') != -1 && restOfEL.indexOf('\'') != -1) // Exclude last quote if this char already exists
string = string.substring(0, string.lastIndexOf('\''));
- if ((string.indexOf('[') != -1 || prefix.indexOf('[') != -1) && string.indexOf(']') == -1 && restOfEL.indexOf(']') == -1) // Add closing square bracket if needed
+ if ((string.indexOf('[') != -1 || (prefix.indexOf('[') != -1 && prefix.indexOf(']', prefix.lastIndexOf('[')) == -1))
+ && string.indexOf(']') == -1 && restOfEL.indexOf(']') == -1) // Add closing square bracket if needed
string += ']';
string += proposalSufix;
13 years, 11 months
JBoss Tools SVN: r40458 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-24 17:03:58 -0400 (Tue, 24 Apr 2012)
New Revision: 40458
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java
Log:
JBIDE-11510
https://issues.jboss.org/browse/JBIDE-11510
Test for case #{a['b'].c|} is added.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java 2012-04-24 19:35:51 UTC (rev 40457)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java 2012-04-24 21:03:58 UTC (rev 40458)
@@ -8,6 +8,7 @@
boolean makeCopy = true;
private static final String PROJECT_NAME = "JSF2Beans";
private static final String PAGE_NAME = "/src/test/beans/inputname.xhtml";
+ private static final String JAVA_NAME = "/src/test/beans/Bean1.java";
public void setUp() throws Exception {
provider = new TestProjectProvider("org.jboss.tools.jsf.base.test",
@@ -61,5 +62,10 @@
String text2 = "#{mybean2[]}";
checkProposals(PAGE_NAME, text2, 10, properties, false);
+
+ properties = new String[]{"mybean2['100'].charAt()"};
+ String text3 = "#{mybean2['100'].ch}";
+ checkProposals(PAGE_NAME, text3, 19, properties, false);
+ checkProposals(JAVA_NAME, text3, 19, properties, false);
}
}
13 years, 11 months