JBoss Tools SVN: r23265 - in trunk/maven: plugins and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2010-07-06 19:26:25 -0400 (Tue, 06 Jul 2010)
New Revision: 23265
Modified:
trunk/maven/features/pom.xml
trunk/maven/plugins/pom.xml
trunk/maven/site/site.xml
Log:
https://jira.jboss.org/browse/JBIDE-6576 Move JBoss Maven configurators to separate features
Modified: trunk/maven/features/pom.xml
===================================================================
--- trunk/maven/features/pom.xml 2010-07-06 23:03:12 UTC (rev 23264)
+++ trunk/maven/features/pom.xml 2010-07-06 23:26:25 UTC (rev 23265)
@@ -10,6 +10,9 @@
<module>org.jboss.tools.maven.feature</module>
<module>org.jboss.tools.maven.jsf.feature</module>
<module>org.jboss.tools.maven.seam.feature</module>
+ <module>org.jboss.tools.maven.cdi.feature</module>
+ <module>org.jboss.tools.maven.hibernate.feature</module>
+ <module>org.jboss.tools.maven.portlet.feature</module>
</modules>
</project>
Modified: trunk/maven/plugins/pom.xml
===================================================================
--- trunk/maven/plugins/pom.xml 2010-07-06 23:03:12 UTC (rev 23264)
+++ trunk/maven/plugins/pom.xml 2010-07-06 23:26:25 UTC (rev 23265)
@@ -11,6 +11,9 @@
<module>org.jboss.tools.maven.jsf</module>
<module>org.jboss.tools.maven.seam</module>
<module>org.jboss.tools.maven.ui</module>
+ <module>org.jboss.tools.maven.cdi</module>
+ <module>org.jboss.tools.maven.hibernate</module>
+ <module>org.jboss.tools.maven.portlet</module>
</modules>
</project>
Modified: trunk/maven/site/site.xml
===================================================================
--- trunk/maven/site/site.xml 2010-07-06 23:03:12 UTC (rev 23264)
+++ trunk/maven/site/site.xml 2010-07-06 23:26:25 UTC (rev 23265)
@@ -14,5 +14,14 @@
<feature url="features/org.jboss.tools.maven.jsf.feature_0.0.0.jar" id="org.jboss.tools.maven.jsf.feature" version="0.0.0">
<category name="JBoss Tools maven Nightly Build Update Site"/>
</feature>
+ <feature url="features/org.jboss.tools.maven.cdi.feature_0.0.0.jar" id="org.jboss.tools.maven.cdi.feature" version="0.0.0">
+ <category name="JBoss Tools maven Nightly Build Update Site"/>
+ </feature>
+ <feature url="features/org.jboss.tools.maven.portlet.feature_0.0.0.jar" id="org.jboss.tools.maven.portlet.feature" version="0.0.0">
+ <category name="JBoss Tools maven Nightly Build Update Site"/>
+ </feature>
+ <feature url="features/org.jboss.tools.maven.hibernate.feature_0.0.0.jar" id="org.jboss.tools.maven.hibernate.feature" version="0.0.0">
+ <category name="JBoss Tools maven Nightly Build Update Site"/>
+ </feature>
</site>
15 years, 9 months
JBoss Tools SVN: r23264 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2010-07-06 19:03:12 -0400 (Tue, 06 Jul 2010)
New Revision: 23264
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
Log:
groupId issues were fixed in ws component
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2010-07-06 22:10:48 UTC (rev 23263)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2010-07-06 23:03:12 UTC (rev 23264)
@@ -7,7 +7,7 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.tools.ws.tests</groupId>
<artifactId>org.jboss.tools.ws.ui.bot.test</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
15 years, 9 months
JBoss Tools SVN: r23263 - in trunk/ws/plugins/org.jboss.tools.ws.ui: src/org/jboss/tools/ws/ui/messages and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: bfitzpat
Date: 2010-07-06 18:10:48 -0400 (Tue, 06 Jul 2010)
New Revision: 23263
Added:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester2.java
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/TesterWSDLUtils.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java
Log:
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-07-06 21:26:46 UTC (rev 23262)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-07-06 22:10:48 UTC (rev 23263)
@@ -29,7 +29,8 @@
org.eclipse.wst.internet.monitor.core,
org.eclipse.wst.internet.monitor.ui,
javax.wsdl;bundle-version="1.6.2",
- org.jdom
+ org.jdom,
+ javax.xml.ws
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.ws.ui,
org.jboss.tools.ws.ui.messages,
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-07-06 21:26:46 UTC (rev 23262)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-07-06 22:10:48 UTC (rev 23263)
@@ -2,8 +2,6 @@
Command=wsconsume.sh
Bin=bin
Client=client
-DelimitedStringList_NO_COMMAS_WARNING=There are no commas delimiting the name and value for this key/value pair.
-DelimitedStringList_NO_EQUALS_DELIMITER_WARNING=Parameters should be in 'name=value' format.
Lib=lib
Endorsed=endorsed
# END NON-TRANSLATABLE
@@ -124,3 +122,11 @@
WSDLBrowseDialog_WSDL_URI_Field=WSDL URI:
WSDLBrowseDialog_WSDL_URL_Dialog_Title=WSDL URL
WSDLBrowseDialog_WSDL_URL_Prompt=Type the URL for the WSDL:
+DelimitedStringList_Msg_No_Btn=No
+DelimitedStringList_Msg_Text_ParseByAmpersand=Should we parse the string to be added by ampersands '&&' and add each individual string?
+DelimitedStringList_Msg_Text_ParseByComma=Should we parse the string to be added by commas ',' and add each individual string?
+DelimitedStringList_Msg_Title_ParseByAmpersand=Parse String by '&'?
+DelimitedStringList_Msg_Title_ParseByComma=Parse String by ','?
+DelimitedStringList_Msg_Yes_Btn=Yes
+DelimitedStringList_NO_COMMAS_WARNING=There are no commas delimiting the name and value for this key/value pair.
+DelimitedStringList_NO_EQUALS_DELIMITER_WARNING=Parameters should be in 'name=value' format.
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-07-06 21:26:46 UTC (rev 23262)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-07-06 22:10:48 UTC (rev 23263)
@@ -27,6 +27,12 @@
public static String Bin;
public static String Command;
public static String Client;
+ public static String DelimitedStringList_Msg_No_Btn;
+ public static String DelimitedStringList_Msg_Text_ParseByAmpersand;
+ public static String DelimitedStringList_Msg_Text_ParseByComma;
+ public static String DelimitedStringList_Msg_Title_ParseByAmpersand;
+ public static String DelimitedStringList_Msg_Title_ParseByComma;
+ public static String DelimitedStringList_Msg_Yes_Btn;
public static String DelimitedStringList_NO_COMMAS_WARNING;
public static String DelimitedStringList_NO_EQUALS_DELIMITER_WARNING;
public static String Lib;
Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester2.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester2.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester2.java 2010-07-06 22:10:48 UTC (rev 23263)
@@ -0,0 +1,113 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.ws.ui.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.net.URL;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Service;
+import javax.xml.ws.Service.Mode;
+import javax.xml.ws.handler.MessageContext;
+
+import org.apache.axis.message.SOAPEnvelope;
+
+/**
+ * Test a JAX-WS web service using the JAX-WS API
+ * @author bfitzpat
+ *
+ */
+public class JAXWSTester2 {
+
+ // the response message to pass back
+ private String resultBody;
+
+ private SOAPEnvelope resultSOAP;
+
+ private SOAPBody resultSOAPBody;
+
+ // the result HTTP headers to pass back
+ private Map<String, String> resultHeaders;
+
+ // utility constant
+ private static final String EMPTY_STRING = ""; //$NON-NLS-1$
+
+ /**
+ * Return the response message
+ * @return
+ */
+ public String getResultBody() {
+ return this.resultBody;
+ }
+
+ public SOAPBody getResultSOAPBody() {
+ return this.resultSOAPBody;
+ }
+
+ /**
+ * Return a map of HTTP headers from the response
+ * @return
+ */
+ public Map<String, String> getResultHeaders() {
+ return this.resultHeaders;
+ }
+
+ public SOAPEnvelope getResultSOAP(){
+ return this.resultSOAP;
+ }
+
+ /**
+ * Invoke the JAX-WS service
+ * @param endpointurl
+ * @param actionurl
+ * @param body
+ * @throws Exception
+ */
+ @SuppressWarnings("unchecked")
+ public void doTest( String endpointurl, String actionurl, String ns,
+ String serviceName, String messageName, String body ) throws Exception {
+
+ this.resultBody = EMPTY_STRING;
+
+ URL serviceURL = new URL (endpointurl); //"http://www.ecubicle.net/gsearch_rss.asmx"
+ QName serviceQName = new QName (ns, serviceName); // "http://www.ecubicle.net/webservices", "gsearch_rss"
+ Service s = Service.create(serviceURL, serviceQName);
+
+ QName messageQName = new QName(ns, messageName); //"http://www.ecubicle.net/webservices", "gsearch_rssSoap"
+ Dispatch<SOAPMessage> d = s.createDispatch(messageQName, SOAPMessage.class, Mode.MESSAGE);
+ d.getRequestContext().put(BindingProvider.SOAPACTION_URI_PROPERTY, actionurl); //"http://www.ecubicle.net/webservices/GetSearchResults");
+
+ MessageFactory mf = MessageFactory.newInstance();
+ SOAPMessage m = mf.createMessage( null, new ByteArrayInputStream(body.getBytes()));
+ m.saveChanges();
+
+ SOAPMessage o = d.invoke(m);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ o.writeTo(baos);
+ this.resultBody = baos.toString();
+ this.resultSOAPBody = o.getSOAPBody();
+
+ if (d.getResponseContext() != null) {
+ Object responseHeaders = d.getResponseContext().get(MessageContext.HTTP_RESPONSE_HEADERS);
+ if ( responseHeaders != null && responseHeaders instanceof Map) {
+ this.resultHeaders = (Map<String, String>) responseHeaders;
+ }
+ }
+ }
+}
Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester2.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/TesterWSDLUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/TesterWSDLUtils.java 2010-07-06 21:26:46 UTC (rev 23262)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/TesterWSDLUtils.java 2010-07-06 22:10:48 UTC (rev 23263)
@@ -141,6 +141,12 @@
if (opName != null && operation.getName().contentEquals(opName)) {
Message inputMsg = operation.getInput().getMessage();
Collection<?> parts = inputMsg.getParts().values();
+ StringBuffer buf = new StringBuffer();
+ if (parts.size() > 1) {
+ buf.append('<' + operation.getName());
+ buf.append(" xmlns = \"" + ns + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+ buf.append(">\n"); //$NON-NLS-1$
+ }
for( Iterator<?> it4 = parts.iterator(); it4.hasNext(); ) {
Part part = (Part) it4.next();
String schemaName = null;
@@ -149,9 +155,24 @@
} else {
schemaName = part.getName();
}
- String out = createMessageForSchemaElement(wsdlDefinition, schemaName, ns);
- return out;
+ if (parts.size() > 1) {
+ if (part != null && part.getTypeName() != null && !part.getTypeName().getNamespaceURI().
+ equalsIgnoreCase("http://www.w3.org/2001/XMLSchema")) { //$NON-NLS-1$
+ buf.append(createMessageForSchemaElement(wsdlDefinition, part.getName(), part.getTypeName().getLocalPart(), ns));
+ } else {
+ buf.append('<' + part.getName());
+ // buf.append(" xmlns = \"" + ns + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+ buf.append(">?"); //$NON-NLS-1$
+ buf.append("</" + part.getName() + ">\n");//$NON-NLS-1$//$NON-NLS-2$
+ }
+ } else {
+ String partName = part.getName();
+ if (parts.size() == 1) partName = null;
+ String out = createMessageForSchemaElement(wsdlDefinition, partName, schemaName, ns);
+ return out;
+ }
}
+ return buf.toString();
}
}
}
@@ -161,6 +182,36 @@
return null;
}
+ public static String[] getNSServiceNameAndMessageNameArray (Definition wsdlDefinition, String serviceName, String portName, String bindingName, String opName ) {
+ Map<?, ?> services = wsdlDefinition.getServices();
+ Set<?> serviceKeys = services.keySet();
+ for( Iterator<?> it = serviceKeys.iterator(); it.hasNext(); ) {
+ QName serviceKey = (QName) it.next();
+ if (serviceName != null && serviceKey.getLocalPart().contentEquals(serviceName)) {
+ Service service = (Service) services.get( serviceKey );
+ Map<?, ?> ports = service.getPorts();
+ Set<?> portKeys = ports.keySet();
+ for( Iterator<?> it2 = portKeys.iterator(); it2.hasNext(); ) {
+ String portKey = (String) it2.next();
+ if (portName != null && portKey.contentEquals(portName)) {
+ Port port = (Port) ports.get( portKey );
+ Binding wsdlBinding = port.getBinding();
+ PortType portType = wsdlBinding.getPortType();
+ String ns = portType.getQName().getNamespaceURI();
+ List<?> operations = portType.getOperations();
+ for (Iterator<?> it3 = operations.iterator(); it3.hasNext();){
+ Operation operation = (Operation) it3.next();
+ if (opName != null && operation.getName().contentEquals(opName)) {
+ return new String[] {ns, serviceName, portName};
+ }
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+
public static String getEndpointURL ( Definition wsdlDefinition, String serviceName, String portName, String bindingName, String opName ) {
Map<?, ?> services = wsdlDefinition.getServices();
Set<?> serviceKeys = services.keySet();
@@ -317,7 +368,7 @@
return null;
}
- private static String createMessageForSchemaElementFromTypes ( Definition wsdlDefinition, Types types, String messageName, String namespace ) {
+ private static String createMessageForSchemaElementFromTypes ( Definition wsdlDefinition, Types types, String partName, String messageName, String namespace ) {
if (types != null &&types.getExtensibilityElements().size() > 0) {
Schema schema = (Schema) types.getExtensibilityElements().get(0);
DOMBuilder domBuilder = new DOMBuilder();
@@ -377,10 +428,27 @@
if (rootName.equalsIgnoreCase(messageName)) {
StringBuffer buf = new StringBuffer();
- buf.append('<' + rootName);
- buf.append(" xmlns = \"" + namespace + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+ buf.append('<');
+ if (partName != null) {
+ buf.append(partName);
+ }
+ else {
+ buf.append(rootName);
+ buf.append(" xmlns = \"" + namespace + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+ }
buf.append(">\n"); //$NON-NLS-1$
- if (!temp.getChildren().isEmpty()){
+ if (temp.getChildren().isEmpty()) {
+ String nstemp = namespace;
+ String typeName = temp.getAttributeValue(TYPE_ATTR);
+ String prefix = null;
+ if (typeName.indexOf(':') > 0) {
+ prefix = typeName.substring(0, typeName.indexOf(':'));
+ nstemp = temp.getNamespace(prefix).getURI();
+ typeName = typeName.substring(typeName.indexOf(':') + 1, typeName.length());
+ }
+ temp = getNodeFromSchema(temp.getParentElement(), typeName, nstemp, prefix);
+ }
+ if (temp != null && !temp.getChildren().isEmpty()){
org.jdom.Element temp2 = (org.jdom.Element)temp.getChildren().get(0);
if (temp2.getName().contains(COMPLEX_TYPE_NAME)) {
String elementStr = processComplexType(wsdlDefinition, temp2);
@@ -390,8 +458,32 @@
buf.append(elementStr);
}
}
- buf.append("</" + rootName + ">\n");//$NON-NLS-1$//$NON-NLS-2$
+ buf.append("</");//$NON-NLS-1$
+ if (partName != null)
+ buf.append(partName);
+ else
+ buf.append(rootName);
+ buf.append(">\n");//$NON-NLS-1$
return buf.toString();
+ } else {
+ Message msg = wsdlDefinition.getMessage(new QName(namespace, messageName));
+ if (msg != null) {
+ StringBuffer buf = new StringBuffer();
+ buf.append('<');
+ if (partName != null)
+ buf.append(partName);
+ else
+ buf.append(rootName);
+ buf.append(" xmlns = \"" + namespace + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+ buf.append(">?"); //$NON-NLS-1$
+ buf.append("</");//$NON-NLS-1$
+ if (partName != null)
+ buf.append(partName);
+ else
+ buf.append(rootName);
+ buf.append(">\n");//$NON-NLS-1$
+ return buf.toString();
+ }
}
}
}
@@ -400,6 +492,25 @@
return null;
}
+ private static org.jdom.Element getNodeFromSchema ( org.jdom.Element root, String name, String ns, String prefix) {
+ if (root != null) {
+ List<?> childList = root.getChildren();
+ Iterator<?> iter1 = childList.iterator();
+ while (iter1.hasNext()) {
+ Object test = iter1.next();
+ if (test instanceof org.jdom.Element) {
+ org.jdom.Element childEl = (org.jdom.Element) test;
+ if (childEl.getAttributeValue(NAME_ATTR, ns).equalsIgnoreCase(name)) {
+ String typeName = childEl.getAttributeValue(TYPE_ATTR);
+ if (typeName == null || !typeName.equalsIgnoreCase(prefix + ':' + name))
+ return childEl;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
private static String processComplexType (Definition wsdlDefinition, org.jdom.Element childEl ) {
StringBuffer buf = new StringBuffer();
if (!childEl.getChildren().isEmpty()) {
@@ -426,11 +537,6 @@
buf.append("?"); //$NON-NLS-1$
} else if (type.contains(SIMPLE_TYPE_NAME)) {
buf.append("?"); //$NON-NLS-1$
-// for (int j = 0; j < childEl.getChildren().size(); j++) {
-// org.jdom.Element tempEl = (org.jdom.Element) childEl.getChildren().get(j);
-// String elementStr = processChild(wsdlDefinition, tempEl);
-// buf.append(elementStr);
-// }
} else if (type.contains(RESTRICTION_NAME)) {
for (int j = 0; j < childEl.getChildren().size(); j++) {
org.jdom.Element tempEl = (org.jdom.Element) childEl.getChildren().get(j);
@@ -510,7 +616,7 @@
return buf.toString();
}
- public static String createMessageForSchemaElement ( Definition wsdlDefinition, String messageName, String namespace ) {
+ public static String createMessageForSchemaElement ( Definition wsdlDefinition, String partName, String messageName, String namespace ) {
Types types = wsdlDefinition.getTypes();
if (types == null) {
Map<?, ?> imports = wsdlDefinition.getImports();
@@ -523,18 +629,18 @@
Import importInstance = (Import) iter.next();
if (importInstance.getDefinition().getTypes() != null) {
types = importInstance.getDefinition().getTypes();
- String attempt = createMessageForSchemaElementFromTypes(wsdlDefinition, types, messageName, namespace);
+ String attempt = createMessageForSchemaElementFromTypes(wsdlDefinition, types, partName, messageName, namespace);
if (attempt != null)
return attempt;
} else if (importInstance.getDefinition().getImports() != null) {
- String attempt = createMessageForSchemaElement(importInstance.getDefinition(), messageName, namespace);
+ String attempt = createMessageForSchemaElement(importInstance.getDefinition(), partName, messageName, namespace);
if (attempt != null)
return attempt;
}
}
}
} else {
- String attempt = createMessageForSchemaElementFromTypes(wsdlDefinition, types, messageName, namespace);
+ String attempt = createMessageForSchemaElementFromTypes(wsdlDefinition, types, partName, messageName, namespace);
if (attempt != null)
return attempt;
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java 2010-07-06 21:26:46 UTC (rev 23262)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java 2010-07-06 22:10:48 UTC (rev 23263)
@@ -16,6 +16,7 @@
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -245,11 +246,42 @@
*/
private void addStringToList() {
if (this.mAddText.getText().length() > 0) {
- this.mPropsList.add(this.mAddText.getText().trim());
+ String text = this.mAddText.getText().trim();
+ if (text.indexOf('&') > -1) {
+ MessageDialog dialog = new MessageDialog(
+ null, JBossWSUIMessages.DelimitedStringList_Msg_Title_ParseByAmpersand, null,
+ JBossWSUIMessages.DelimitedStringList_Msg_Text_ParseByAmpersand,
+ MessageDialog.QUESTION,
+ new String[] {JBossWSUIMessages.DelimitedStringList_Msg_Yes_Btn, JBossWSUIMessages.DelimitedStringList_Msg_No_Btn},
+ 0); // yes is the default
+ int result = dialog.open();
+ if (result == 0) {
+ String[] parsed = parseString(text, "&"); //$NON-NLS-1$
+ for (int i = 0; i < parsed.length; i++) {
+ this.mPropsList.add(parsed[i]);
+ }
+ }
+ } else if (text.indexOf(',') > -1) {
+ MessageDialog dialog = new MessageDialog(
+ null, JBossWSUIMessages.DelimitedStringList_Msg_Title_ParseByComma, null,
+ JBossWSUIMessages.DelimitedStringList_Msg_Text_ParseByComma,
+ MessageDialog.QUESTION,
+ new String[] {JBossWSUIMessages.DelimitedStringList_Msg_Yes_Btn, JBossWSUIMessages.DelimitedStringList_Msg_No_Btn},
+ 0); // yes is the default
+ int result = dialog.open();
+ if (result == 0) {
+ String[] parsed = parseString(text, ","); //$NON-NLS-1$
+ for (int i = 0; i < parsed.length; i++) {
+ this.mPropsList.add(parsed[i]);
+ }
+ }
+ } else {
+ this.mPropsList.add(text);
+ }
if (!isReadOnly){
this.mClearAllButton.setEnabled(true);
}
- this.mAddText.setSelection(0, this.mAddText.getText().length());
+ this.mAddText.setSelection(0, text.length());
this.mAddText.setFocus();
}
}
@@ -431,11 +463,11 @@
}
private boolean validateText(String text) {
- if (text != null && text.trim().length() > 0 && text.indexOf(",") > -1) { //$NON-NLS-1$
- this.mWarning = JBossWSUIMessages.DelimitedStringList_NO_COMMAS_WARNING;
- return false;
- }
- else if (text != null && text.trim().length() > 0 && text.indexOf("=") == -1) { //$NON-NLS-1$
+// if (text != null && text.trim().length() > 0 && text.indexOf(",") > -1) { //$NON-NLS-1$
+// this.mWarning = JBossWSUIMessages.DelimitedStringList_NO_COMMAS_WARNING;
+// return false;
+// }
+ /*else*/ if (text != null && text.trim().length() > 0 && text.indexOf("=") == -1) { //$NON-NLS-1$
this.mWarning = JBossWSUIMessages.DelimitedStringList_NO_EQUALS_DELIMITER_WARNING;
return false;
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java 2010-07-06 21:26:46 UTC (rev 23262)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java 2010-07-06 22:10:48 UTC (rev 23263)
@@ -18,9 +18,11 @@
import java.util.Map.Entry;
import javax.wsdl.Definition;
+import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
+import org.apache.axis.utils.XMLUtils;
import org.eclipse.core.resources.IStorage;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -70,11 +72,12 @@
import org.jboss.tools.ws.ui.JBossWSUIPlugin;
import org.jboss.tools.ws.ui.messages.JBossWSUIMessages;
import org.jboss.tools.ws.ui.utils.JAXRSTester;
-import org.jboss.tools.ws.ui.utils.JAXWSTester;
+import org.jboss.tools.ws.ui.utils.JAXWSTester2;
import org.jboss.tools.ws.ui.utils.ResultsXMLStorage;
import org.jboss.tools.ws.ui.utils.ResultsXMLStorageInput;
import org.jboss.tools.ws.ui.utils.TesterWSDLUtils;
import org.jboss.tools.ws.ui.utils.WSTestUtils;
+import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -128,6 +131,7 @@
private Button addTCPIPMonitorButton;
private SOAPEnvelope envelope;
+ private SOAPBody soapbody;
private MenuItem openInXMLEditorAction;
private MenuItem openResponseTagInXMLEditor;
private Menu resultsTextMenu;
@@ -136,6 +140,7 @@
private MenuItem copyResultHeaderMenuAction;
private boolean showSampleButton = false;
+ private String[] serviceNSMessage = null;
/**
* The constructor.
@@ -287,6 +292,7 @@
WSDLBrowseDialog wbDialog = new WSDLBrowseDialog(getSite().getShell());
int rtnCode = wbDialog.open();
if (rtnCode == Window.OK){
+ serviceNSMessage = null;
Definition wsdlDef = wbDialog.getWSDLDefinition();
String output = TesterWSDLUtils.getSampleSOAPInputMessage(wsdlDef,
wbDialog.getServiceTextValue(),
@@ -303,6 +309,11 @@
wbDialog.getPortTextValue(),
wbDialog.getBindingValue(),
wbDialog.getOperationTextValue());
+ serviceNSMessage = TesterWSDLUtils.getNSServiceNameAndMessageNameArray(wsdlDef,
+ wbDialog.getServiceTextValue(),
+ wbDialog.getPortTextValue(),
+ wbDialog.getBindingValue(),
+ wbDialog.getOperationTextValue());
String soapIn = generateSampleSOAP(output);
bodyText.setText(soapIn);
urlCombo.setText(endpointURL);
@@ -408,35 +419,41 @@
public void widgetSelected(SelectionEvent arg0) {
String string = null;
- if (envelope != null){
- try {
- NodeList list = envelope.getBody().getChildNodes();
- for (int i = 0; i< list.getLength(); i++){
- Node node = list.item(i);
- if (node.getNodeName().contains("Response")){ //$NON-NLS-1$
- NodeList list2 = node.getChildNodes();
- for (int j = 0; j<list2.getLength(); j++){
- Node node2 = list2.item(j);
- if (node2.getNodeName().contains("Result")){ //$NON-NLS-1$
- Node node3 = node2.getChildNodes().item(0);
- if (node3.getNodeType() == Node.TEXT_NODE) {
- string = node3.getNodeValue();
- break;
- } else if (node3.getNodeType() == Node.ELEMENT_NODE) {
- string = node2.toString();
- break;
- }
+ try {
+ SOAPBody body = null;
+ if (envelope != null){
+ body = envelope.getBody();
+ } else if (soapbody != null) {
+ body = soapbody;
+ }
+
+ NodeList list = body.getChildNodes();
+ for (int i = 0; i< list.getLength(); i++){
+ Node node = list.item(i);
+ if (node.getNodeName().contains("Response")){ //$NON-NLS-1$
+ NodeList list2 = node.getChildNodes();
+ for (int j = 0; j<list2.getLength(); j++){
+ Node node2 = list2.item(j);
+ if (node2.getNodeName().contains("Result")){ //$NON-NLS-1$
+ Node node3 = node2.getChildNodes().item(0);
+ if (node3.getNodeType() == Node.TEXT_NODE) {
+ string = node3.getNodeValue();
+ break;
+ } else if (node3.getNodeType() == Node.ELEMENT_NODE) {
+ Element element = (Element) node3;
+ string = XMLUtils.ElementToString(element);
+ break;
}
}
- if (string != null) break;
}
+ if (string != null) break;
}
- if (string != null){
- openXMLEditor(string);
- }
- } catch (SOAPException e) {
- JBossWSUIPlugin.log(e);
}
+ if (string != null){
+ openXMLEditor(string);
+ }
+ } catch (SOAPException e) {
+ JBossWSUIPlugin.log(e);
}
}
@@ -833,12 +850,16 @@
try {
envelope = null;
+ soapbody = null;
monitor.worked(10);
- JAXWSTester tester = new JAXWSTester();
- tester.doTest(url, action, body);
+// JAXWSTester tester = new JAXWSTester();
+// tester.doTest(url, action, body);
+ JAXWSTester2 tester = new JAXWSTester2();
+ tester.doTest(url, action, serviceNSMessage[0], serviceNSMessage[1], serviceNSMessage[2], body);
monitor.worked(70);
String result = tester.getResultBody();
envelope = tester.getResultSOAP();
+ soapbody = tester.getResultSOAPBody();
String cleanedUp = WSTestUtils.addNLsToXML(result);
WSTestStatus status = new WSTestStatus(IStatus.OK,
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java 2010-07-06 21:26:46 UTC (rev 23262)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java 2010-07-06 22:10:48 UTC (rev 23263)
@@ -223,7 +223,7 @@
IFile resource = (IFile) objects[0];
File tempFile = new File(resource.getRawLocationURI());
try {
- URL testURL = tempFile.toURL();
+ URL testURL = tempFile.toURI().toURL();
locationCombo.setText(testURL.toExternalForm());
wsdlDefinition =
TesterWSDLUtils.readWSDLURL(testURL);
@@ -265,7 +265,7 @@
if (fileText != null){
File tempFile = new File(fileText);
try {
- URL testURL = tempFile.toURL();
+ URL testURL = tempFile.toURI().toURL();
locationCombo.setText(testURL.toExternalForm());
wsdlDefinition =
TesterWSDLUtils.readWSDLURL(testURL);
15 years, 9 months
JBoss Tools SVN: r23262 - workspace/dgolovin/experimental-build.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2010-07-06 17:26:46 -0400 (Tue, 06 Jul 2010)
New Revision: 23262
Modified:
workspace/dgolovin/experimental-build/dgolovin-pom.xml
Log:
enable seam and struts
Modified: workspace/dgolovin/experimental-build/dgolovin-pom.xml
===================================================================
--- workspace/dgolovin/experimental-build/dgolovin-pom.xml 2010-07-06 21:23:32 UTC (rev 23261)
+++ workspace/dgolovin/experimental-build/dgolovin-pom.xml 2010-07-06 21:26:46 UTC (rev 23262)
@@ -23,7 +23,7 @@
<module>portlet</module>
<module>workingset</module>
- <!--module>struts</module-->
+ <module>struts</module>
<module>profiler</module>
<module>smooks</module>
@@ -31,13 +31,13 @@
<module>birt</module>
<module>bpel</module>
<module>esb</module>
- <!-- module>seam</module-->
+ <module>seam</module>
<module>examples</module>
<module>maven</module>
<module>tptp</module>
<module>ws</module>
- <!-- todo -->
+
<module>modeshape</module>
<module>flow</module>
<module>jbpm</module>
15 years, 9 months
JBoss Tools SVN: r23261 - trunk/seam/tests/org.jboss.tools.seamfp.ui.test/src/org/jboss/tools/seam/ui/test/wizard.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2010-07-06 17:23:32 -0400 (Tue, 06 Jul 2010)
New Revision: 23261
Modified:
trunk/seam/tests/org.jboss.tools.seamfp.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java
Log:
Property changes on: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 9 months
JBoss Tools SVN: r23260 - trunk/seam/tests/org.jboss.tools.seamfp.ui.test/src/org/jboss/tools/seam/ui/test/wizard.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2010-07-06 17:23:26 -0400 (Tue, 06 Jul 2010)
New Revision: 23260
Added:
trunk/seam/tests/org.jboss.tools.seamfp.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java
Log:
error fix for seamfp test errors --This line, and those below, will be ignored--
A Seam20XOperationsTestSuiteFP.java
Added: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seamfp.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seamfp.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java 2010-07-06 21:23:26 UTC (rev 23260)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * 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.ui.test.wizard;
+
+/**
+ * @author eskimo
+ *
+ */
+public class Seam20XOperationsTestSuiteFP extends
+ Seam20XOperationsTestSuite201GA {
+
+}
15 years, 9 months
JBoss Tools SVN: r23259 - in trunk/seam: tests/org.jboss.tools.seam.core.test and 17 other directories.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2010-07-06 17:22:12 -0400 (Tue, 06 Jul 2010)
New Revision: 23259
Removed:
trunk/seam/tests/org.jboss.tools.seamfp.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java
Modified:
trunk/seam/pom.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml
trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml
trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml
Log:
seam tests code coverage enabled --This line, and those below, will be ignored--
M seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml
M seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml
M seam/tests/org.jboss.tools.seam.ui.test/pom.xml
M seam/tests/org.jboss.tools.seamfp.core.test/pom.xml
M seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml
M seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml
M seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml
M seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml
M seam/tests/org.jboss.tools.seam.core.test/pom.xml
M seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml
M seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml
M seam/tests/org.jboss.tools.seam.xml.test/pom.xml
M seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml
D seam/tests/org.jboss.tools.seamfp.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java
M seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml
M seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml
M seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml
M seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml
M seam/pom.xml
Modified: trunk/seam/pom.xml
===================================================================
--- trunk/seam/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -4,7 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools</groupId>
- <artifactId>seam.all</artifactId>
+ <artifactId>seam</artifactId>
+ <name>seam.all</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -14,10 +14,9 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <requirements>jbeap,eapseamgen,seamfp,seam-2.0.1.GA,seam-2.1.1.GA</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
<systemProperties>-Djbosstools.test.seam.1.2.1.eap.home=${projectRoot}/requirements/target/jboss-eap-4.3/seam -Djbosstools.test.seam.2fp.eap.home=${projectRoot}/requirements/target/jboss-eap-4.3/seamfp -Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.1.0.GA.home=${projectRoot}/requirements/target/jboss-seam-2.1.1.GA</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
<build>
Modified: trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -11,4 +11,8 @@
<artifactId>org.jboss.tools.seam.pages.xml.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
+ <properties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.pages.xml</emma.instrument.bundles>
+ </properties>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -1,22 +1,22 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.seam.tests</groupId>
- <artifactId>org.jboss.tools.seam.ui.test</artifactId>
+ <artifactId>org.jboss.tools.seam.ui.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
-
<packaging>eclipse-test-plugin</packaging>
- <properties>
- <requirements>jbossas</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
- <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirements.build}/jboss-4.2.3.GA -Djbosstools.test.seam.1.2.1.eap.home=${projectRoot}/requirements/target/jboss-eap-4.3/seam -Djbosstools.test.seam.2fp.eap.home=${projectRoot}/requirements/target/jboss-eap-4.3/seamfp -Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.1.0.GA.home=${projectRoot}/requirements/target/jboss-seam-2.1.1.GA</systemProperties>
+
+ <properties>
+ <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA -Djbosstools.test.seam.1.2.1.eap.home=${requirement.build.root}/jboss-eap-4.3/seam -Djbosstools.test.seam.2fp.eap.home=${requirement.build.root}/jboss-eap-4.3/seamfp -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.1.0.GA.home=${requirement.build.root}/jboss-seam-2.1.1.GA</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.core,org.jboss.tools.seam.ui</emma.instrument.bundles>
</properties>
<build>
@@ -25,19 +25,29 @@
<groupId>org.sonatype.tycho</groupId>
<artifactId>maven-osgi-test-plugin</artifactId>
<configuration>
+ <product>org.jboss.tools.tests</product>
<explodedBundles>
<bundle>org.jboss.tools.seam.core.test</bundle>
- <bundle>org.jboss.tools.seam.core</bundle>
+ <bundle>org.jboss.tools.vpe</bundle>
+ <bundle>org.mozilla.xulrunner.carbon.macosx</bundle>
+ <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
+ <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
</explodedBundles>
- <product>org.jboss.tools.tests</product>
<includes>
<include>org/jboss/tools/seam/ui/test/SeamUiAllTests.class</include>
</includes>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.xulrunner.initializer</artifactId>
+ <version>3.1.0</version>
+ <type>eclipse-plugin</type>
+ </dependency>
+ </dependencies>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -1,14 +1,20 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.seam.tests</groupId>
- <artifactId>org.jboss.tools.seam.xml.test</artifactId>
+ <artifactId>org.jboss.tools.seam.xml.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
+
+ <properties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.xml</emma.instrument.bundles>
+ </properties>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -14,10 +14,9 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <requirements>jbeap,eapseamgen</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
- <systemProperties>-Djbosstools.test.seam.1.2.1.eap.home=${projectRoot}/requirements/target/jboss-eap-4.3/seam</systemProperties>
+ <systemProperties>-Djbosstools.test.seam.1.2.1.eap.home=${requirement.build.root}/jboss-eap-4.3/seam</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
<build>
@@ -36,9 +35,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -1,22 +1,22 @@
<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>../../../parent-pom.xml</relativePath>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.seam.tests</groupId>
- <artifactId>org.jboss.tools.seam121EAP.ui.test</artifactId>
+ <artifactId>org.jboss.tools.seam121EAP.ui.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
-
+
<properties>
- <requirements>jbeap,eapseamgen</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
- <systemProperties>-Djbosstools.test.seam.1.2.1.eap.home=${projectRoot}/requirements/target/jboss-eap-4.3/seam</systemProperties>
+ <systemProperties>-Djbosstools.test.seam.1.2.1.eap.home=${requirement.build.root}/jboss-eap-4.3/seam</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
<build>
@@ -36,9 +36,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -14,10 +14,9 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <requirements>seam-2.0.1.GA</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
- <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.1.GA</systemProperties>
+ <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
<build>
@@ -36,9 +35,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -13,10 +13,9 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <requirements>seam-2.0.1.GA</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
- <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.1.GA</systemProperties>
+ <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
<build>
@@ -36,9 +35,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -14,10 +14,9 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <requirements>seam-2.0.2.SP1</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
- <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.2.SP1</systemProperties>
+ <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.2.SP1</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
<build>
@@ -35,9 +34,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -13,10 +13,9 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <requirements>seam-2.0.2.SP1</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
- <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.2.SP1</systemProperties>
+ <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.2.SP1</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
<build>
@@ -36,9 +35,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -14,10 +14,9 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <requirements>seam-2.0.3.CR1</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
- <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.3.CR1</systemProperties>
+ <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.3.CR1</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
<build>
@@ -36,9 +35,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -13,10 +13,9 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <requirements>seam-2.0.3.CR1</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
- <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.3.CR1</systemProperties>
+ <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.3.CR1</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
<build>
@@ -36,9 +35,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -13,10 +13,9 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <requirements>seam-2.1.1.GA</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
- <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.1.1.GA</systemProperties>
+ <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.1.1.GA</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
<build>
@@ -36,9 +35,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -13,10 +13,9 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <requirements>seam-2.2.0.CR1</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
- <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.2.0.CR1</systemProperties>
+ <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.0.CR1</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
<build>
@@ -36,9 +35,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -13,10 +13,9 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <requirements>seam-2.2.0.GA</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
- <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.2.0.GA</systemProperties>
+ <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.0.GA</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
<build>
@@ -36,9 +35,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -14,10 +14,9 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <requirements>jbeap,eapseamgen,seamfp</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
- <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-eap-4.3/seamfp</systemProperties>
+ <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-eap-4.3/seamfp</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
<build>
@@ -36,9 +35,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Modified: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2010-07-06 21:22:12 UTC (rev 23259)
@@ -13,10 +13,9 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <requirements>jbeap,eapseamgen,seamfp</requirements>
- <projectRoot>${basedir}/../../..</projectRoot>
- <requirements.build>${projectRoot}/requirements/target</requirements.build>
- <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-eap-4.3/seamfp</systemProperties>
+ <systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-eap-4.3/seamfp</systemProperties>
+ <emma.filter>org.jboss.tools.seam*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
</properties>
<build>
@@ -36,9 +35,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
Deleted: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seamfp.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java 2010-07-06 21:19:22 UTC (rev 23258)
+++ trunk/seam/tests/org.jboss.tools.seamfp.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java 2010-07-06 21:22:12 UTC (rev 23259)
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * 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.ui.test.wizard;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- *
- * @author eskimo
- */
-public class Seam20XOperationsTestSuite201GA {
-
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.setName("Seam 2.0.X Operations Test");
- suite.addTest(
- new Seam20EARNewOperationTestSetup(
- new TestSuite(Seam20EARNewOperationTest.class)));
- suite.addTest(
- new Seam20WARNewOperationTestSetup(
- new TestSuite(Seam20WARNewOperationTest.class)));
- return suite;
- }
-
- public static class Seam20EARNewOperationTestSetup extends TestSetup {
- Seam20EARNewOperationTest delegate = new Seam20EARNewOperationTest("delegate");
-
- /**
- * @param test
- */
- public Seam20EARNewOperationTestSetup(Test test) {
- super(test);
- }
-
- @Override
- protected void setUp() throws Exception {
- delegate.setUp();
- }
-
- @Override
- protected void tearDown() throws Exception {
- delegate.tearDown();
- }
- }
-
- public static class Seam20WARNewOperationTestSetup extends TestSetup {
- Seam20WARNewOperationTest delegate = new Seam20WARNewOperationTest("delegate");
- /**
- * @param test
- */
- public Seam20WARNewOperationTestSetup(Test test) {
- super(test);
- }
-
- @Override
- protected void setUp() throws Exception {
- delegate.setUp();
- }
-
- @Override
- protected void tearDown() throws Exception {
- delegate.tearDown();
- }
- }
-}
15 years, 9 months
JBoss Tools SVN: r23258 - in trunk/seam/tests: org.jboss.tools.seam.ui.test and 13 other directories.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2010-07-06 17:19:22 -0400 (Tue, 06 Jul 2010)
New Revision: 23258
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/requirements.properties
trunk/seam/tests/org.jboss.tools.seam.ui.test/requirements.properties
trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/requirements.properties
trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/requirements.properties
trunk/seam/tests/org.jboss.tools.seam201GA.core.test/requirements.properties
trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/requirements.properties
trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/requirements.properties
trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/requirements.properties
trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/requirements.properties
trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/requirements.properties
trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/requirements.properties
trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/requirements.properties
trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/requirements.properties
trunk/seam/tests/org.jboss.tools.seamfp.core.test/requirements.properties
trunk/seam/tests/org.jboss.tools.seamfp.ui.test/requirements.properties
Log:
seam requirements profile activated for seam tests
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=jbeap,eapseamgen,seamfp,seam-2.0.1.GA,seam-2.1.1.GA
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=jbossas,jbeap,eapseamgen,seamfp,seam-2.0.1.GA,seam-2.1.1.GA
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=jbeap,eapseamgen
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=jbeap,eapseamgen
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam201GA.core.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam201GA.core.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam201GA.core.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=seam-2.0.1.GA
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam201GA.core.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=seam-2.0.1.GA
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=seam-2.0.2.SP1
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=seam-2.0.2.SP1
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=seam-2.0.3.CR1
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=seam-2.0.3.CR1
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=seam-2.1.1.GA
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=seam-2.2.0.CR1
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=seam-2.2.0.GA
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seamfp.core.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seamfp.core.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seamfp.core.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=jbeap,eapseamgen,seamfp
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seamfp.core.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/requirements.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seamfp.ui.test/requirements.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seamfp.ui.test/requirements.properties 2010-07-06 21:19:22 UTC (rev 23258)
@@ -0,0 +1 @@
+requirements=jbeap,eapseamgen,seamfp
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/requirements.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 9 months
JBoss Tools SVN: r23257 - in trunk: site and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-07-06 15:52:28 -0400 (Tue, 06 Jul 2010)
New Revision: 23257
Modified:
trunk/build/aggregate/site/site.xml
trunk/site/site.xml
Log:
add maven.jsf feature to update sites
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2010-07-06 18:38:55 UTC (rev 23256)
+++ trunk/build/aggregate/site/site.xml 2010-07-06 19:52:28 UTC (rev 23257)
@@ -153,6 +153,12 @@
>
<category name="MavenTools" />
</feature>
+ <feature url="features/org.jboss.tools.maven.jsf.feature_0.0.0.jar"
+ id="org.jboss.tools.maven.jsf.feature"
+ version="0.0.0"
+ >
+ <category name="MavenTools" />
+ </feature>
<feature url="features/org.jboss.tools.xulrunner.feature_0.0.0.jar"
id="org.jboss.tools.xulrunner.feature"
version="0.0.0"
@@ -273,7 +279,7 @@
<feature url="features/org.pi4soa.core.feature_0.0.0.jar" id="org.pi4soa.core.feature" version="0.0.0">
<category name="AllTools" />
</feature>
-<!--
+<!-- removed temporarily because pi4soa doesn't work w/ Eclipse 3.6. yet.
<feature url="features/org.teiid.datatools.connectivity.feature_0.0.0.jar" id="org.teiid.datatools.connectivity.feature" version="0.0.0">
<category name="AllTools" />
<category name="DataTools" />
Modified: trunk/site/site.xml
===================================================================
--- trunk/site/site.xml 2010-07-06 18:38:55 UTC (rev 23256)
+++ trunk/site/site.xml 2010-07-06 19:52:28 UTC (rev 23257)
@@ -6,16 +6,16 @@
<!-- only in JBDS -->
<!--
- <feature url="features/com.jboss.jbds.product.feature_${product.versionTag}.jar"
+ <feature url="features/com.jboss.jbds.product.feature_0.0.0.jar"
id="com.jboss.jbds.product.feature"
- version="${product.versionTag}"
+ version="0.0.0"
patch="false"
>
<category name="AllTools" />
</feature>
- <feature url="features/org.jboss.tools.runtime.feature_${runtime.versionTag}.jar"
+ <feature url="features/org.jboss.tools.runtime.feature_0.0.0.jar"
id="org.jboss.tools.runtime.feature"
- version="${runtime.versionTag}"
+ version="0.0.0"
patch="false"
>
<category name="AllTools" />
@@ -153,6 +153,12 @@
>
<category name="MavenTools" />
</feature>
+ <feature url="features/org.jboss.tools.maven.jsf.feature_0.0.0.jar"
+ id="org.jboss.tools.maven.jsf.feature"
+ version="0.0.0"
+ >
+ <category name="MavenTools" />
+ </feature>
<feature url="features/org.jboss.tools.xulrunner.feature_0.0.0.jar"
id="org.jboss.tools.xulrunner.feature"
version="0.0.0"
15 years, 9 months
JBoss Tools SVN: r23256 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-07-06 14:38:55 -0400 (Tue, 06 Jul 2010)
New Revision: 23256
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/NameSection.java
Log:
GPD-362
GPD-372
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/NameSection.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/NameSection.java 2010-07-06 18:06:58 UTC (rev 23255)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/NameSection.java 2010-07-06 18:38:55 UTC (rev 23256)
@@ -85,11 +85,18 @@
protected void updateValues() {
IPropertySource input = getInput();
+ String newValue = getValueNotNull((String)input.getPropertyValue(NAME));
if (input != null) {
- nameText.setText(getValueNotNull((String)input.getPropertyValue(NAME)));
+ if (isUpdateNeeded(newValue)) {
+ nameText.setText(newValue);
+ }
} else {
nameText.setText("");
}
}
+
+ private boolean isUpdateNeeded(String newValue) {
+ return !newValue.equals(nameText.getText());
+ }
}
15 years, 9 months