JBoss Tools SVN: r7794 - trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-04-25 01:21:33 -0400 (Fri, 25 Apr 2008)
New Revision: 7794
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/ProviderInvokeCodeGenConfigWidget.java
Log:
change for wsprovide
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/ProviderInvokeCodeGenConfigWidget.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/ProviderInvokeCodeGenConfigWidget.java 2008-04-25 05:21:27 UTC (rev 7793)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/ProviderInvokeCodeGenConfigWidget.java 2008-04-25 05:21:33 UTC (rev 7794)
@@ -16,6 +16,7 @@
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -35,6 +36,7 @@
public ProviderInvokeCodeGenConfigWidget(ServiceModel model){
this.model = model;
+ model.setGenWSDL(true);
}
public WidgetDataEvents addControls( Composite parent, Listener statusListener){
@@ -53,17 +55,24 @@
model.setCustomPackage(txtCustomPkgName.getText());
}});
- Button wsdlGen = new Button(configCom, SWT.CHECK|SWT.NONE);
+ final Button wsdlGen = new Button(configCom, SWT.CHECK|SWT.NONE);
GridData wsdlGenData = new GridData();
wsdlGenData.horizontalSpan = 2;
wsdlGen.setLayoutData(wsdlGenData);
wsdlGen.setText("Generete WSDL file");
- wsdlGen.setSelection(true);
+ wsdlGen.setSelection(true);
+ wsdlGen.addSelectionListener(new SelectionListener(){
-
-
-
-
+ public void widgetDefaultSelected(SelectionEvent e) {
+
+ }
+
+ public void widgetSelected(SelectionEvent e) {
+ model.setGenWSDL(wsdlGen.getSelection());
+
+ }
+
+ });
return this;
}
}
16 years, 2 months
JBoss Tools SVN: r7793 - trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-04-25 01:21:27 -0400 (Fri, 25 Apr 2008)
New Revision: 7793
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java
Log:
change for wsprovide
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java 2008-04-25 05:20:51 UTC (rev 7792)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java 2008-04-25 05:21:27 UTC (rev 7793)
@@ -37,7 +37,7 @@
command = "cmd wsprovide.bat";
}
String args = getCommandlineArgs();
- command += " -k " + args + " " + model.getServiceClass();
+ command += " -k " + args;
try {
@@ -78,7 +78,11 @@
if(model.isGenWSDL()){
commandLine += " -w ";
}
- commandLine += " -o " + projectRoot + Path.SEPARATOR + "WebContext" + Path.SEPARATOR + "wsdl";
+ commandLine += " -r " + projectRoot + Path.SEPARATOR + "WebContent" + Path.SEPARATOR + "wsdl ";
+
+ commandLine += " -c " + projectRoot + Path.SEPARATOR + "build/classes/ ";
+
+ commandLine += model.getServiceClass();
return commandLine;
16 years, 2 months
JBoss Tools SVN: r7792 - in trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core: command and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-04-25 01:20:51 -0400 (Fri, 25 Apr 2008)
New Revision: 7792
Modified:
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore.properties
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessages.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java
Log:
change for wsprovide
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore.properties 2008-04-25 03:34:23 UTC (rev 7791)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore.properties 2008-04-25 05:20:51 UTC (rev 7792)
@@ -1,5 +1,6 @@
PROGRESS_INSTALL_JBOSSWS_RUNTIME=JBoss Web Service Runtime
DIR_LIB=lib
+DIR_CLIENT=client
DIR_WEB_INF=WEB-INF
DIR_WEB_CONTENT=WebContent
ERROR_COPY=Exception while copy JBossWS jars
\ No newline at end of file
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessages.java 2008-04-25 03:34:23 UTC (rev 7791)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessages.java 2008-04-25 05:20:51 UTC (rev 7792)
@@ -23,6 +23,7 @@
public static String PROGRESS_INSTALL_JBOSSWS_RUNTIME;
public static String DIR_LIB;
+ public static String DIR_CLIENT;
public static String DIR_WEB_INF;
public static String DIR_WEB_CONTENT;
public static String ERROR_COPY;
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java 2008-04-25 03:34:23 UTC (rev 7791)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java 2008-04-25 05:20:51 UTC (rev 7792)
@@ -46,7 +46,7 @@
.getPreferenceStore();
runtimeLocation = ps.getString("jbosswsruntimelocation");
- // copy jars to project's folder
+ // copy lib jars to project's folder
IPath libPath = new Path(runtimeLocation);
libPath = libPath.append(JbossWSCoreMessages.DIR_LIB);
@@ -56,6 +56,11 @@
.append(JbossWSCoreMessages.DIR_WEB_INF).append(
JbossWSCoreMessages.DIR_LIB);
status = JbossWSCoreUtils.copy(libPath, targetPath);
+
+ // copy lib jars to project's folder
+ IPath clientPath = new Path(runtimeLocation);
+ clientPath = clientPath.append(JbossWSCoreMessages.DIR_CLIENT);
+ JbossWSCoreUtils.copy(clientPath,targetPath);
return status;
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java 2008-04-25 03:34:23 UTC (rev 7791)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java 2008-04-25 05:20:51 UTC (rev 7792)
@@ -136,10 +136,8 @@
}
} else {
try {
- copy(sourcePath.append(children[i].getName()), makeFolder(
- getWorkspaceRoot().getContainerForLocation(
- targetPath), children[i].getName())
- .getFullPath());
+ IFolder temp = makeFolder(getWorkspaceRoot().getContainerForLocation(targetPath), children[i].getName());
+ copy(sourcePath.append(children[i].getName()), temp.getLocation());
} catch (CoreException e) {
status = StatusUtils.errorStatus(
NLS.bind(JbossWSCoreMessages.ERROR_COPY,
16 years, 2 months
JBoss Tools SVN: r7791 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-04-24 23:34:23 -0400 (Thu, 24 Apr 2008)
New Revision: 7791
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1730Test.java
Log:
fix JUnit Test error
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1730Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1730Test.java 2008-04-25 03:18:48 UTC (rev 7790)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1730Test.java 2008-04-25 03:34:23 UTC (rev 7791)
@@ -78,7 +78,7 @@
assertEquals(4, elements.size());
- nsIDOMElement table = (nsIDOMElement) elements.get(2).queryInterface(
+ nsIDOMElement table = (nsIDOMElement) elements.get(3).queryInterface(
nsIDOMElement.NS_IDOMELEMENT_IID);
// test border attribute
16 years, 2 months
JBoss Tools SVN: r7790 - in trunk/jsf/tests: org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-04-24 23:18:48 -0400 (Thu, 24 Apr 2008)
New Revision: 7790
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java
Log:
fix index out of bounds exceptions in JUnit Tests
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-04-24 23:50:51 UTC (rev 7789)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-04-25 03:18:48 UTC (rev 7790)
@@ -163,7 +163,7 @@
assertEquals(1, elements.size());
- nsIDOMElement div = (nsIDOMElement) elements.get(1).queryInterface(
+ nsIDOMElement div = (nsIDOMElement) elements.get(0).queryInterface(
nsIDOMElement.NS_IDOMELEMENT_IID);
String title = div.getAttribute("title"); //$NON-NLS-1$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2008-04-24 23:50:51 UTC (rev 7789)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2008-04-25 03:18:48 UTC (rev 7790)
@@ -78,7 +78,7 @@
assertEquals(1, elements.size());
- nsIDOMNode span = elements.get(2);
+ nsIDOMNode span = elements.get(0);
nsIDOMNode text = span.getFirstChild();
assertEquals(text.getNodeValue().trim(), "#{item.nodes}");
16 years, 2 months
JBoss Tools SVN: r7789 - trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-04-24 19:50:51 -0400 (Thu, 24 Apr 2008)
New Revision: 7789
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
Log:
flatten had no default. UI required one. tiny cleanup.
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2008-04-24 23:47:17 UTC (rev 7788)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2008-04-24 23:50:51 UTC (rev 7789)
@@ -333,6 +333,9 @@
rootDirIsWorkspaceRelative = true;
rootDir = parentNode.getProjectPath();
workspaceRelativeRootDir = "";
+ flattened = false;
+ flattenedYes.setSelection(flattened);
+ flattenedNo.setSelection(!flattened);
}
IProject[] project = ResourcesPlugin.getWorkspace().getRoot().getProjects();
for( int i = 0; i < project.length; i++ )
16 years, 2 months
JBoss Tools SVN: r7788 - 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: 2008-04-24 19:47:17 -0400 (Thu, 24 Apr 2008)
New Revision: 7788
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
Log:
very tiny changes to wizard for UI cleanliness
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2008-04-24 23:42:19 UTC (rev 7787)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2008-04-24 23:47:17 UTC (rev 7788)
@@ -139,7 +139,7 @@
homeDir = rt.getRuntime().getLocation().toOSString();
config = rt.getJBossConfiguration();
configurations.setConfiguration(config);
- configLabel.setText(Messages.wf_ConfigLabel + ": " + config);
+ configLabel.setText(Messages.wf_ConfigLabel);
IVMInstall install = rt.getVM();
String vmName = install.getName();
@@ -386,9 +386,10 @@
configurations.setJBossHome(homeDirText.getText());
} else {
configurations.getControl().setEnabled(true);
- configurations.setJBossHome(homeDirText.getText());
- if( !homeDirText.getText().equals(configurations.getInput()))
+ if( !homeDirText.getText().equals(configurations.getInput())) {
+ configurations.setJBossHome(homeDirText.getText());
configurations.setConfiguration(IJBossServerConstants.DEFAULT_SERVER_NAME);
+ }
}
int sel = jreCombo.getSelectionIndex();
16 years, 2 months
JBoss Tools SVN: r7787 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-04-24 19:42:19 -0400 (Thu, 24 Apr 2008)
New Revision: 7787
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1730Test.java
Log:
fix testJBIDE_1730, testJBIDE_1460, testJBIDE_1615 JUnit test errors
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2008-04-24 23:24:59 UTC (rev 7786)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2008-04-24 23:42:19 UTC (rev 7787)
@@ -76,7 +76,7 @@
// find "span" elements
TestUtil.findElementsByName(node, elements, HTML.TAG_SPAN);
- assertEquals(5, elements.size());
+ assertEquals(1, elements.size());
nsIDOMNode span = elements.get(2);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java 2008-04-24 23:24:59 UTC (rev 7786)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java 2008-04-24 23:42:19 UTC (rev 7787)
@@ -74,9 +74,9 @@
List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>();
// find "span" elements
- TestUtil.findElementsByName(node, elements, HTML.TAG_SPAN);
+ TestUtil.findElementsByName(node, elements, HTML.TAG_TD);
- assertEquals(31, elements.size());
+ assertEquals(8, elements.size());
if (getException() != null) {
throw getException();
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1730Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1730Test.java 2008-04-24 23:24:59 UTC (rev 7786)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1730Test.java 2008-04-24 23:42:19 UTC (rev 7787)
@@ -76,7 +76,7 @@
// find "table" elements
TestUtil.findAllElementsByName(node, elements, HTML.TAG_TABLE);
- assertEquals(3, elements.size());
+ assertEquals(4, elements.size());
nsIDOMElement table = (nsIDOMElement) elements.get(2).queryInterface(
nsIDOMElement.NS_IDOMELEMENT_IID);
16 years, 2 months
JBoss Tools SVN: r7786 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-04-24 19:24:59 -0400 (Thu, 24 Apr 2008)
New Revision: 7786
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
Log:
fix FaceletsAllTests errors
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-04-24 22:48:44 UTC (rev 7785)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-04-24 23:24:59 UTC (rev 7786)
@@ -93,13 +93,13 @@
// find "span" elements
TestUtil.findAllElementsByName(node, elements, HTML.TAG_SPAN);
- assertEquals(39, elements.size());
+ assertEquals(3, elements.size());
- nsIDOMElement elementSpan0 = (nsIDOMElement) elements.get(12)
+ nsIDOMElement elementSpan0 = (nsIDOMElement) elements.get(0)
.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
- nsIDOMElement elementSpan1 = (nsIDOMElement) elements.get(17)
+ nsIDOMElement elementSpan1 = (nsIDOMElement) elements.get(1)
.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
- nsIDOMElement elementSpan2 = (nsIDOMElement) elements.get(25)
+ nsIDOMElement elementSpan2 = (nsIDOMElement) elements.get(2)
.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
nsIDOMText text0 = (nsIDOMText) elementSpan0.getFirstChild()
@@ -111,7 +111,8 @@
assertEquals(DEFINED_CONTENT_IS_NOT_SHOWN, text0.getNodeValue(),
"Greeting Page"); //$NON-NLS-1$
- assertEquals(DEFINED_CONTENT_IS_NOT_SHOWN, text1.getNodeValue(), USER);
+ assertEquals(DEFINED_CONTENT_IS_NOT_SHOWN, text1.getNodeValue(),
+ USER);
assertEquals(DEFINED_CONTENT_IS_NOT_SHOWN, text2.getNodeValue(),
"#{person.name}!"); //$NON-NLS-1$
@@ -160,9 +161,9 @@
// find "div" elements
TestUtil.findAllElementsByName(node, elements, HTML.TAG_DIV);
- assertEquals(4, elements.size());
+ assertEquals(1, elements.size());
- nsIDOMElement div = (nsIDOMElement) elements.get(3).queryInterface(
+ nsIDOMElement div = (nsIDOMElement) elements.get(1).queryInterface(
nsIDOMElement.NS_IDOMELEMENT_IID);
String title = div.getAttribute("title"); //$NON-NLS-1$
16 years, 2 months
JBoss Tools SVN: r7785 - in trunk/seam/tests/org.jboss.tools.seam.core.test: src/org/jboss/tools/seam/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-04-24 18:48:44 -0400 (Thu, 24 Apr 2008)
New Revision: 7785
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/components.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java
Log:
Fix seam core test error in testLocation_JBIDE_2080 Failure XML declaration for component org.jboss.seam.core.ejb is not found in components.xml.
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/components.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/components.xml 2008-04-24 21:46:27 UTC (rev 7784)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/components.xml 2008-04-24 22:48:44 UTC (rev 7785)
@@ -28,6 +28,8 @@
concurrent-request-timeout="2"
conversation-timeout="3"
/>
+
+ <core:ejb installed="true"/>
<factory name="factory1" scope="conversation"/>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2008-04-24 21:46:27 UTC (rev 7784)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2008-04-24 22:48:44 UTC (rev 7785)
@@ -508,9 +508,11 @@
break;
}
}
- assertNotNull("XML declaration for component " + EJB + " is not found in components.xml.", xml);
+
+ String MY_COMPONENT = "myComponent";
+ assertNotNull("XML declaration for component " + MY_COMPONENT + " is not found in components.xml.", xml);
ISeamTextSourceReference location = xml.getLocationFor(ISeamXmlComponentDeclaration.NAME);
- assertNotNull("Location of declaration of component " + EJB + " in components.xml is not found.", location);
+ assertNotNull("Location of declaration of component " + MY_COMPONENT + " in components.xml is not found.", location);
assertTrue("Location should not point to 0", location.getStartPosition() > 0 && location.getLength() > 0);
}
16 years, 2 months