JBoss Tools SVN: r23528 - trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-07-19 04:24:56 -0400 (Mon, 19 Jul 2010)
New Revision: 23528
Modified:
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentForm.java
Log:
remove comment
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentForm.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentForm.java 2010-07-19 08:22:54 UTC (rev 23527)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/DeploymentForm.java 2010-07-19 08:24:56 UTC (rev 23528)
@@ -174,7 +174,6 @@
additionalFilesSection.marginWidth = 5;
additionalFilesSection.setText("Additional Files");
GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-// gridData.verticalAlignment = GridData.BEGINNING;
additionalFilesSection.setLayoutData(gridData);
Composite additionalFilesClient = toolkit.createComposite(additionalFilesSection);
15 years, 9 months
JBoss Tools SVN: r23527 - in trunk/bpel/plugins: org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-07-19 04:22:54 -0400 (Mon, 19 Jul 2010)
New Revision: 23527
Modified:
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELUtils.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionContentAssistProcessor.java
Log:
JBIDE-6607: verified the patch from Bob and commit to trunk
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELUtils.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELUtils.java 2010-07-19 07:30:27 UTC (rev 23526)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/BPELUtils.java 2010-07-19 08:22:54 UTC (rev 23527)
@@ -185,8 +185,6 @@
* @throws RuntimeException
* if the prefix is already set.
*/
-
- @SuppressWarnings("unchecked")
public static void setPrefix(EObject eObject, String namespaceURI,
String prefix) {
@@ -248,6 +246,7 @@
* @return the namespace map for the given object.
*/
+ @SuppressWarnings("unchecked")
static public INamespaceMap<String, String> getNamespaceMap(EObject eObject) {
if (eObject == null) {
@@ -277,11 +276,11 @@
if (object instanceof EObject) {
// check if *this* is already the process object
if (object instanceof Process)
- return (Process)object;
- EObject cont = ((EObject)object).eContainer();
+ return (Process) object;
+ EObject cont = ((EObject) object).eContainer();
while (cont != null) {
if (cont.eClass() == BPELPackage.eINSTANCE.getProcess())
- return (Process)cont;
+ return (Process) cont;
cont = cont.eContainer();
}
}
@@ -343,7 +342,7 @@
* @param parent
* @return the reordered list.
*/
-
+ @SuppressWarnings("unchecked")
public static List<ExtensibleElement> reorderExtensibilityList(
List<IExtensibilityElementListHandler> extensibilityElementListHandlers,
ExtensibleElement parent) {
@@ -373,14 +372,15 @@
* @return the node
*/
- public static Node convertStringToNode(EObject parent, String s, BPELResource bpelResource) {
+ public static Node convertStringToNode(EObject parent, String s,
+ BPELResource bpelResource) {
// Create DOM document
DocumentBuilderFactory factory = new DocumentBuilderFactoryImpl();
factory.setNamespaceAware(true);
factory.setValidating(false);
StringBuilder namespaces = new StringBuilder();
- Map<String, String> nsMap = getAllNamespacesForContext(parent);
+ Map<String, String> nsMap = getAllNamespacesForContext(parent);
for (Entry<String, String> e : nsMap.entrySet()) {
String prefix = e.getKey();
String value = e.getValue();
@@ -396,15 +396,17 @@
namespaces.append("=\"");
namespaces.append(value);
namespaces.append("\" ");
- }
-
+ }
+
String namespaceURI = bpelResource.getNamespaceURI();
if (bpelResource.getOptionUseNSPrefix()) {
String prefix = "bpws";
- s = "<" + prefix + ":from xmlns:" + prefix + "=\"" + namespaceURI + "\" "
- + namespaces.toString() + ">" + s + "</" + prefix + ":from>";
+ s = "<" + prefix + ":from xmlns:" + prefix + "=\"" + namespaceURI
+ + "\" " + namespaces.toString() + ">" + s + "</" + prefix
+ + ":from>";
} else {
- s = "<from xmlns=\"" + namespaceURI + "\" " + namespaces.toString() + ">" + s + "</from>";
+ s = "<from xmlns=\"" + namespaceURI + "\" " + namespaces.toString()
+ + ">" + s + "</from>";
}
try {
@@ -465,8 +467,10 @@
String namespaceURI = DOMUtils.getNamespaceURIFromPrefix(element,
prefix);
- // namespaceURI may be null. That's okay.
- return new QName(namespaceURI, localPart);
+ if (prefix == null) {
+ return new QName(namespaceURI, localPart);
+ }
+ return new QName(namespaceURI, localPart, prefix);
}
/**
@@ -759,7 +763,7 @@
return (BPELResourceSetImpl) resourceSet;
}
- Map map = resourceSet.getLoadOptions();
+ Map<Object, Object> map = resourceSet.getLoadOptions();
BPELResourceSetImpl result = (BPELResourceSetImpl) map
.get(BPELResourceSetImpl.SLIGHTLY_HACKED_KEY);
if (result == null) {
@@ -889,34 +893,34 @@
|| (child instanceof Expression && parent instanceof From)
|| (child instanceof Expression && parent instanceof To);
}
-
+
public static boolean isActivityNode(Node node) {
String name = node.getLocalName();
- return isBPELElement(node) &&
- (BPELConstants.ND_INVOKE.equals(name) ||
- BPELConstants.ND_ASSIGN.equals(name) ||
- BPELConstants.ND_WHILE.equals(name) ||
- BPELConstants.ND_REPEAT_UNTIL.equals(name) ||
- BPELConstants.ND_RECEIVE.equals(name) ||
- BPELConstants.ND_REPLY.equals(name) ||
- BPELConstants.ND_THROW.equals(name) ||
- BPELConstants.ND_WAIT.equals(name) ||
- BPELConstants.ND_SEQUENCE.equals(name) ||
- BPELConstants.ND_PICK.equals(name) ||
- BPELConstants.ND_FLOW.equals(name) ||
- BPELConstants.ND_SCOPE.equals(name) ||
- BPELConstants.ND_COMPENSATE.equals(name) ||
- BPELConstants.ND_RETHROW.equals(name) ||
- BPELConstants.ND_EXIT.equals(name) ||
- BPELConstants.ND_EXTENSION_ACTIVITY.equals(name) ||
- BPELConstants.ND_INVOKE.equals(name) ||
- BPELConstants.ND_FOR_EACH.equals(name) ||
- BPELConstants.ND_IF.equals(name) ||
- BPELConstants.ND_VALIDATE.equals(name) ||
- BPELConstants.ND_COMPENSATE_SCOPE.equals(name) ||
- BPELConstants.ND_EMPTY.equals(name) ||
- BPELConstants.ND_OPAQUEACTIVITY.equals(name));
-
+ return isBPELElement(node)
+ && (BPELConstants.ND_INVOKE.equals(name)
+ || BPELConstants.ND_ASSIGN.equals(name)
+ || BPELConstants.ND_WHILE.equals(name)
+ || BPELConstants.ND_REPEAT_UNTIL.equals(name)
+ || BPELConstants.ND_RECEIVE.equals(name)
+ || BPELConstants.ND_REPLY.equals(name)
+ || BPELConstants.ND_THROW.equals(name)
+ || BPELConstants.ND_WAIT.equals(name)
+ || BPELConstants.ND_SEQUENCE.equals(name)
+ || BPELConstants.ND_PICK.equals(name)
+ || BPELConstants.ND_FLOW.equals(name)
+ || BPELConstants.ND_SCOPE.equals(name)
+ || BPELConstants.ND_COMPENSATE.equals(name)
+ || BPELConstants.ND_RETHROW.equals(name)
+ || BPELConstants.ND_EXIT.equals(name)
+ || BPELConstants.ND_EXTENSION_ACTIVITY.equals(name)
+ || BPELConstants.ND_INVOKE.equals(name)
+ || BPELConstants.ND_FOR_EACH.equals(name)
+ || BPELConstants.ND_IF.equals(name)
+ || BPELConstants.ND_VALIDATE.equals(name)
+ || BPELConstants.ND_COMPENSATE_SCOPE.equals(name)
+ || BPELConstants.ND_EMPTY.equals(name) || BPELConstants.ND_OPAQUEACTIVITY
+ .equals(name));
+
}
// TODO: (DU) This is here due to
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionContentAssistProcessor.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionContentAssistProcessor.java 2010-07-19 07:30:27 UTC (rev 23526)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/contentassist/ExpressionContentAssistProcessor.java 2010-07-19 08:22:54 UTC (rev 23527)
@@ -323,8 +323,7 @@
theStatus = -1;
return false;
}
- }
- else if (tempExpr.theType == ExpressionType.EXPRTYPE_FUNCTION_ARGUMENTS) {
+ } else if (tempExpr.theType == ExpressionType.EXPRTYPE_FUNCTION_ARGUMENTS) {
if (currChar == ')') {
return true;
}
@@ -334,13 +333,10 @@
theStatus = -1;
return false;
}
- }
- catch (EmptyStackException e) {
+ } catch (EmptyStackException e) {
theStatus = -1;
return false;
}
- theStatus = -1;
- return false;
}
else if (currChar == ',') {
// could be a function argument
@@ -959,10 +955,22 @@
return results.toArray(EMPTY_COMPLETION_PROPOSALS);
}
+ String getNamespacePrefix(EObject context, String namespace)
+ {
+ String prefix = BPELUtils.getNamespacePrefix(context, namespace);
+ while ( prefix==null )
+ {
+ prefix = BPELUtil.lookupOrCreateNamespacePrefix(context, namespace, null, null);
+ if ( prefix == null )
+ throw new IllegalArgumentException("namespace prefix is null");
+ }
+ return prefix;
+ }
/**
* From model, determine list of variables the user may want to choose from.
*/
+
ICompletionProposal[] generateVariableProposals(String context, int offset) {
boolean seekChildren = false;
@@ -992,227 +1000,234 @@
Image partImg = BPELUIPlugin.INSTANCE.getImage(IBPELUIConstants.ICON_PART_16);
Image elementImg = BPELUIPlugin.INSTANCE.getImage(IBPELUIConstants.ICON_XSD_ELEMENT_DECLARATION_16);
Image attrImg = BPELUIPlugin.INSTANCE.getImage(IBPELUIConstants.ICON_XSD_ATTRIBUTE_DECLARATION_16);
- if (seekChildren) {
- // walk down path
- int index = 0;
- int level = 0;
- int token = -1;
- char t = 0;
- String levelName;
-
- while (index < context2.length()) {
- t = context2.charAt(index);
- if ((t == '.') || (t == '/')) {
- levelName = context2.substring(token+1, index);
- /*
- // check for namespace
- int ns = levelName.indexOf(':');
- if (ns > -1) {
- levelNSPrefix = levelName.substring(0, ns);
- levelName = levelName.substring(ns+1);
- }
- else
- levelNSPrefix = null;
- */
-
- // find variable
- if (level == 0) {
- for (int i=0; i<variables.length; i++) {
- if (levelName.compareTo(variables[i].getName()) == 0) {
- currVar = variables[i];
- currXsdType = currVar.getType();
- currMsg = currVar.getMessageType();
- currXsdElem = currVar.getXSDElement();
-
- level++;
+ try
+ {
+ if (seekChildren) {
+ // walk down path
+ int index = 0;
+ int level = 0;
+ int token = -1;
+ char t = 0;
+ String levelName;
+
+ while (index < context2.length()) {
+ t = context2.charAt(index);
+ if ((t == '.') || (t == '/')) {
+ levelName = context2.substring(token+1, index);
+ /*
+ // check for namespace
+ int ns = levelName.indexOf(':');
+ if (ns > -1) {
+ levelNSPrefix = levelName.substring(0, ns);
+ levelName = levelName.substring(ns+1);
+ }
+ else
+ levelNSPrefix = null;
+ */
+
+ // find variable
+ if (level == 0) {
+ for (int i=0; i<variables.length; i++) {
+ if (levelName.compareTo(variables[i].getName()) == 0) {
+ currVar = variables[i];
+ currXsdType = currVar.getType();
+ currMsg = currVar.getMessageType();
+ currXsdElem = currVar.getXSDElement();
+
+ level++;
+ break;
+ }
+ }
+ if (currVar == null)
break;
- }
}
- if (currVar == null)
- break;
- }
- // traverse down
- else {
- boolean childFound = false;
- if (context2.charAt(token) == '.') {
- if (currMsg != null) {
- if (currMsg.getParts() != null) {
- for(Object next : currMsg.getParts().values()) {
- Part item = (Part) next ;
- if (levelName.compareTo(item.getName()) == 0) {
- currXsdType = item.getTypeDefinition();
- currMsg = item.getEMessage();
- currXsdElem = item.getElementDeclaration();
- childFound = true;
- break;
+ // traverse down
+ else {
+ boolean childFound = false;
+ if (context2.charAt(token) == '.') {
+ if (currMsg != null) {
+ if (currMsg.getParts() != null) {
+ for(Object next : currMsg.getParts().values()) {
+ Part item = (Part) next ;
+ if (levelName.compareTo(item.getName()) == 0) {
+ currXsdType = item.getTypeDefinition();
+ currMsg = item.getEMessage();
+ currXsdElem = item.getElementDeclaration();
+ childFound = true;
+ break;
+ }
}
}
}
+ if (!childFound)
+ break;
}
- if (!childFound)
- break;
- }
- // search for child objects
- else if (context2.charAt(token) == '/') {
- if (currXsdType == null) {
- if (currXsdElem != null) {
- currXsdType = currXsdElem.getTypeDefinition();
+ // search for child objects
+ else if (context2.charAt(token) == '/') {
+ if (currXsdType == null) {
+ if (currXsdElem != null) {
+ currXsdType = currXsdElem.getTypeDefinition();
+ }
}
- }
- if (currXsdType instanceof XSDComplexTypeDefinition) {
- XSDComplexTypeDefinition xsdcomplex = (XSDComplexTypeDefinition)currXsdType;
-
- for(Object next : XSDUtils.getChildElements(xsdcomplex)) {
- XSDElementDeclaration elem = ((XSDElementDeclaration)next).getResolvedElementDeclaration();
- String elemName = elem.getName();
- if (elem.getTargetNamespace() != null) {
- String elemNSPrefix = BPELUtils.getNamespacePrefix(currVar, elem.getTargetNamespace());
- if (elemNSPrefix != null) {
- elemName = elemNSPrefix + COLON + elemName;
+ if (currXsdType instanceof XSDComplexTypeDefinition) {
+ XSDComplexTypeDefinition xsdcomplex = (XSDComplexTypeDefinition)currXsdType;
+
+ for(Object next : XSDUtils.getChildElements(xsdcomplex)) {
+ XSDElementDeclaration elem = ((XSDElementDeclaration)next).getResolvedElementDeclaration();
+ String elemName = elem.getName();
+ if (elem.getTargetNamespace() != null) {
+ String elemNSPrefix = getNamespacePrefix(currVar, elem.getTargetNamespace());
+ if (elemNSPrefix != null) {
+ elemName = elemNSPrefix + COLON + elemName;
+ }
}
+
+ if (levelName.compareTo(elemName) == 0) {
+ currXsdType = elem.getTypeDefinition();
+ currXsdElem = null;
+ currMsg = null;
+ //currXsdElem = elem.getResolvedElementDeclaration();
+ childFound = true;
+ break;
+ }
}
-
- if (levelName.compareTo(elemName) == 0) {
- currXsdType = elem.getTypeDefinition();
- currXsdElem = null;
- currMsg = null;
- //currXsdElem = elem.getResolvedElementDeclaration();
+ }
+ else if (currXsdType instanceof XSDSimpleTypeDefinition) {
+ XSDSimpleTypeDefinition xsdsimple = (XSDSimpleTypeDefinition)currXsdType;
+ //currXsdType = xsdsimple.getBaseType();
+ //XSDSimpleTypeDefinition tempsimple = xsdsimple.getBaseTypeDefinition();
+ //org.eclipse.xsd.XSDParticle temppart = xsdsimple.getComplexType();
+ //XSDSimpleTypeDefinition tempsimple2 = xsdsimple.getItemTypeDefinition();
+ String tempname = xsdsimple.getName();
+ if (levelName.compareTo(tempname) == 0) {
childFound = true;
- break;
}
}
+ if (!childFound)
+ break;
}
- else if (currXsdType instanceof XSDSimpleTypeDefinition) {
- XSDSimpleTypeDefinition xsdsimple = (XSDSimpleTypeDefinition)currXsdType;
- //currXsdType = xsdsimple.getBaseType();
- //XSDSimpleTypeDefinition tempsimple = xsdsimple.getBaseTypeDefinition();
- //org.eclipse.xsd.XSDParticle temppart = xsdsimple.getComplexType();
- //XSDSimpleTypeDefinition tempsimple2 = xsdsimple.getItemTypeDefinition();
- String tempname = xsdsimple.getName();
- if (levelName.compareTo(tempname) == 0) {
- childFound = true;
- }
- }
- if (!childFound)
- break;
- }
- }
- token = index;
+ }
+ token = index;
+ }
+ else if (t == '@')
+ token = index;
+
+ index++;
}
- else if (t == '@')
- token = index;
-
- index++;
- }
- // determine if last character is a special character if above is successful
- if (index == context2.length()) {
- // looking for parts, attributes or elements?
- String beginsWith;
- if ((index-1) == token)
- beginsWith = EMPTY_STRING;
- else
- beginsWith = context2.substring(token+1);
-
- if ((context2.charAt(token) == '/') || (context2.charAt(token) == '@')) {
- if (currXsdType == null) {
- if (currXsdElem != null) {
- currXsdType = currXsdElem.getTypeDefinition();
- }
- }
- if (currXsdType instanceof XSDComplexTypeDefinition) {
- XSDComplexTypeDefinition xsdcomplex = (XSDComplexTypeDefinition)currXsdType;
- Iterator eaIter;
- if (context2.charAt(token) == '/')
- eaIter = XSDUtils.getXSDElementsAndAttributes(xsdcomplex).iterator();
- else
- eaIter = XSDUtils.getChildAttributes(xsdcomplex).iterator();
- Image img = null;
- String tempReplName = null;
- String tempDispName = null;
- String namespace = null;
- String nsprefix = null;
- while (eaIter.hasNext()) {
- Object tempEA = eaIter.next();
-
- if (tempEA instanceof XSDAttributeDeclaration) {
- XSDAttributeDeclaration attr = (XSDAttributeDeclaration)tempEA;
- tempReplName = AT + attr.getName();
- tempDispName = attr.getName();
- namespace = attr.getTargetNamespace();
- if ((namespace != null) && (namespace.length() > 0)) {
- nsprefix = BPELUtils.getNamespacePrefix(currVar, namespace);
- tempReplName = AT + nsprefix + COLON + attr.getName();
- tempDispName = nsprefix + COLON + tempDispName;
- }
- img = attrImg;
+ // determine if last character is a special character if above is successful
+ if (index == context2.length()) {
+ // looking for parts, attributes or elements?
+ String beginsWith;
+ if ((index-1) == token)
+ beginsWith = EMPTY_STRING;
+ else
+ beginsWith = context2.substring(token+1);
+
+ if ((context2.charAt(token) == '/') || (context2.charAt(token) == '@')) {
+ if (currXsdType == null) {
+ if (currXsdElem != null) {
+ currXsdType = currXsdElem.getTypeDefinition();
}
- else if (tempEA instanceof XSDElementDeclaration) {
- XSDElementDeclaration elem = ((XSDElementDeclaration)tempEA).getResolvedElementDeclaration();
- tempReplName = elem.getName();
- tempDispName = tempReplName;
- namespace = elem.getTargetNamespace();
- if ((namespace != null) && (namespace.length() > 0)) {
- nsprefix = BPELUtils.getNamespacePrefix(currVar, namespace);
- tempReplName = nsprefix + COLON + tempDispName;
+ }
+ if (currXsdType instanceof XSDComplexTypeDefinition) {
+ XSDComplexTypeDefinition xsdcomplex = (XSDComplexTypeDefinition)currXsdType;
+ @SuppressWarnings("rawtypes")
+ Iterator eaIter;
+ if (context2.charAt(token) == '/')
+ eaIter = XSDUtils.getXSDElementsAndAttributes(xsdcomplex).iterator();
+ else
+ eaIter = XSDUtils.getChildAttributes(xsdcomplex).iterator();
+ Image img = null;
+ String tempReplName = null;
+ String tempDispName = null;
+ String namespace = null;
+ String nsprefix = null;
+ while (eaIter.hasNext()) {
+ Object tempEA = eaIter.next();
+
+ if (tempEA instanceof XSDAttributeDeclaration) {
+ XSDAttributeDeclaration attr = (XSDAttributeDeclaration)tempEA;
+ tempReplName = AT + attr.getName();
+ tempDispName = attr.getName();
+ namespace = attr.getTargetNamespace();
+ if ((namespace != null) && (namespace.length() > 0)) {
+ nsprefix = getNamespacePrefix(currVar, namespace);
+ tempReplName = AT + nsprefix + COLON + attr.getName();
+ tempDispName = nsprefix + COLON + tempDispName;
+ }
+ img = attrImg;
+ }
+ else if (tempEA instanceof XSDElementDeclaration) {
+ XSDElementDeclaration elem = ((XSDElementDeclaration)tempEA).getResolvedElementDeclaration();
+ tempReplName = elem.getName();
tempDispName = tempReplName;
+ namespace = elem.getTargetNamespace();
+ if ((namespace != null) && (namespace.length() > 0)) {
+ nsprefix = getNamespacePrefix(currVar, namespace);
+ tempReplName = nsprefix + COLON + tempDispName;
+ tempDispName = tempReplName;
+ }
+ img = elementImg;
}
- img = elementImg;
- }
- if (tempReplName != null) {
- if ((beginsWith.length() == 0) || (tempDispName.startsWith(beginsWith))) {
- int replOffset = offset-beginsWith.length();
- int replLen = beginsWith.length();
- if (context2.charAt(token) == '@') {
- replOffset--;
- replLen++;
+ if (tempReplName != null) {
+ if ((beginsWith.length() == 0) || (tempDispName != null && tempDispName.startsWith(beginsWith))) {
+ int replOffset = offset-beginsWith.length();
+ int replLen = beginsWith.length();
+ if (context2.charAt(token) == '@') {
+ replOffset--;
+ replLen++;
+ }
+
+ prop = new CompletionProposal(tempReplName, replOffset, replLen,
+ tempReplName.length(), img, tempDispName + " " , //$NON-NLS-1$
+ null, null);
+ results.add(prop);
}
-
- prop = new CompletionProposal(tempReplName, replOffset, replLen,
- tempReplName.length(), img, tempDispName + " " , //$NON-NLS-1$
- null, null);
- results.add(prop);
}
+ tempReplName = null;
+ tempDispName = null;
}
- tempReplName = null;
- tempDispName = null;
}
+// else if (currXsdType instanceof XSDSimpleTypeDefinition) {
+// XSDSimpleTypeDefinition simple = (XSDSimpleTypeDefinition)currXsdType;
+// // do nothing?
+// }
}
- else if (currXsdType instanceof XSDSimpleTypeDefinition) {
- XSDSimpleTypeDefinition simple = (XSDSimpleTypeDefinition)currXsdType;
- // do nothing?
- }
- }
- // search for parts
- else if (context2.charAt(token) == '.') {
- if (currMsg != null) {
- if (currMsg.getParts() != null) {
- for(Object next : currMsg.getParts().values() ) {
- Part item = (Part) next;
- if ((beginsWith.length() == 0) || (item.getName().startsWith(beginsWith))) {
- prop = new CompletionProposal(item.getName(), offset-beginsWith.length(), beginsWith.length(),
- item.getName().length(), partImg, item.getName() + " " , //$NON-NLS-1$
- null, null);
- results.add(prop);
+ // search for parts
+ else if (context2.charAt(token) == '.') {
+ if (currMsg != null) {
+ if (currMsg.getParts() != null) {
+ for(Object next : currMsg.getParts().values() ) {
+ Part item = (Part) next;
+ if ((beginsWith.length() == 0) || (item.getName().startsWith(beginsWith))) {
+ prop = new CompletionProposal(item.getName(), offset-beginsWith.length(), beginsWith.length(),
+ item.getName().length(), partImg, item.getName() + " " , //$NON-NLS-1$
+ null, null);
+ results.add(prop);
+ }
}
}
}
}
}
}
- }
- //variables
- else {
- for (Variable v : variables) {
- name = v.getName();
- if (name.startsWith(context2)) {
- prop = new CompletionProposal(DOLLAR + name, offset-context.length(), context.length(),
- name.length()+1, varImg, name + " " , //$NON-NLS-1$
- null, null);
- results.add(prop);
+ //variables
+ else {
+ for (Variable v : variables) {
+ name = v.getName();
+ if (name.startsWith(context2)) {
+ prop = new CompletionProposal(DOLLAR + name, offset-context.length(), context.length(),
+ name.length()+1, varImg, name + " " , //$NON-NLS-1$
+ null, null);
+ results.add(prop);
+ }
}
}
}
-
+ catch(IllegalArgumentException ex)
+ {
+ results.toArray(EMPTY_COMPLETION_PROPOSALS);
+ }
if (results.size() < 1) {
return new ICompletionProposal [] {
15 years, 9 months
JBoss Tools SVN: r23526 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-07-19 03:30:27 -0400 (Mon, 19 Jul 2010)
New Revision: 23526
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6645 , TestCase was updated
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java 2010-07-19 07:23:10 UTC (rev 23525)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeEditAnyDialogTest.java 2010-07-19 07:30:27 UTC (rev 23526)
@@ -13,6 +13,7 @@
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.vpe.editor.template.VpeAnyData;
import org.jboss.tools.vpe.editor.template.VpeEditAnyDialog;
+import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.ui.test.VpeTest;
@@ -28,7 +29,8 @@
*/
VpeAnyData data = new VpeAnyData(Constants.EMPTY, Constants.EMPTY, Constants.EMPTY);
VpeEditAnyDialog dialog = new VpeEditAnyDialog(PlatformUI
- .getWorkbench().getDisplay().getActiveShell(), data);
+ .getWorkbench().getDisplay().getActiveShell(), data,
+ VpeTemplateManager.getInstance().getAnyTemplates());
dialog.setBlockOnOpen(false);
int code = dialog.open();
/*
@@ -50,7 +52,8 @@
data.setName("my:tag"); //$NON-NLS-1$
data.setUri("http://my.uri.com/tags"); //$NON-NLS-1$
dialog = new VpeEditAnyDialog(PlatformUI
- .getWorkbench().getDisplay().getActiveShell(), data);
+ .getWorkbench().getDisplay().getActiveShell(), data,
+ VpeTemplateManager.getInstance().getAnyTemplates());
dialog.setBlockOnOpen(false);
code = dialog.open();
assertEquals(Window.OK, code);
15 years, 9 months
JBoss Tools SVN: r23525 - 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: dvinnichek
Date: 2010-07-19 03:23:10 -0400 (Mon, 19 Jul 2010)
New Revision: 23525
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
Log:
fix assertion in JBIDE788Test.testCAforHtmlFiles()
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2010-07-19 06:02:11 UTC (rev 23524)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2010-07-19 07:23:10 UTC (rev 23525)
@@ -14,6 +14,8 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.CompletionProposal;
+import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.text.contentassist.IContentAssistant;
@@ -55,9 +57,9 @@
setException(null);
// Tests CA
- checkOfCAByStartString(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml","s:validateFormat",11,2); //$NON-NLS-1$//$NON-NLS-2$
- checkOfCAByStartString(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml","rich:validateA", 14,14); //$NON-NLS-1$ //$NON-NLS-2$
- checkOfCAByStartString(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml","c:otherwi",18,6); //$NON-NLS-1$//$NON-NLS-2$
+ checkOfCAByStartString(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml","s:validateFormat",11,2,3); //$NON-NLS-1$//$NON-NLS-2$
+ checkOfCAByStartString(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml","rich:validateA", 14,14,3); //$NON-NLS-1$ //$NON-NLS-2$
+ checkOfCAByStartString(CA_NAME, "JBIDE/788/TestChangeUriInInnerNodes.xhtml","c:otherwi",18,6,3); //$NON-NLS-1$//$NON-NLS-2$
// check exception
if (getException() != null) {
@@ -72,7 +74,7 @@
TestUtil.waitForJobs();
// set exception
setException(null);
- ICompletionProposal[] results = checkOfCAByStartString(CA_NAME, "JBIDE/6131/6131test.xhtml","Common",1,1,false); //$NON-NLS-1$ //$NON-NLS-2$
+ ICompletionProposal[] results = checkOfCAByStartString(CA_NAME, "JBIDE/6131/6131test.xhtml","Common",1,1,false,3); //$NON-NLS-1$ //$NON-NLS-2$
boolean proposalExists=false;
for (ICompletionProposal completionProposal : results) {
String displayString = ((ICompletionProposal) completionProposal).getDisplayString();
@@ -99,7 +101,7 @@
setException(null);
// Tests CA
- ICompletionProposal[] results = checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml","",11,31,false); //$NON-NLS-1$ //$NON-NLS-2$
+ ICompletionProposal[] results = checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml","",11,31,false,3); //$NON-NLS-1$ //$NON-NLS-2$
assertNotNull(results);
assertTrue("The length should be more than 0",results.length>0); //$NON-NLS-1$
boolean proposalExists=false;
@@ -112,7 +114,7 @@
}
assertTrue(REQUIRED_PROPOSAL + " should be in proposals", proposalExists); //$NON-NLS-1$
proposalExists=false;
- results = checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAPathProposals.xhtml","",11,41,false); //$NON-NLS-1$//$NON-NLS-2$
+ results = checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAPathProposals.xhtml","",11,41,false,3); //$NON-NLS-1$//$NON-NLS-2$
assertNotNull(results);
for(ICompletionProposal completionProposal : results) {
String displayString = ((ICompletionProposal) completionProposal).getDisplayString();
@@ -139,7 +141,7 @@
// set exception
setException(null);
// Tests CA
- ICompletionProposal[] results =checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml","",21,58); //$NON-NLS-1$//$NON-NLS-2$
+ ICompletionProposal[] results =checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml","",21,58,3); //$NON-NLS-1$//$NON-NLS-2$
assertNotNull(results);
assertTrue(results.length>=2);
for(ICompletionProposal completionProposal : results) {
@@ -170,7 +172,7 @@
// set exception
setException(null);
// Tests CA
- ICompletionProposal[] results =checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAforHtml.html", "", 5, 13,false); //$NON-NLS-1$//$NON-NLS-2$
+ ICompletionProposal[] results = checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAforHtml.html", "", 5, 13,false,3); //$NON-NLS-1$//$NON-NLS-2$
assertNotNull(results);
assertTrue("The lenft should be more than 0",results.length>0); //$NON-NLS-1$
@@ -206,7 +208,7 @@
// Tests CA
// cursor will set after "outputText" tag
- ICompletionProposal[] results = checkOfCAByStartString(JSP_CA_NAME, "JBIDE/788/testCAforJSP.jsp", "h:outp",26,14,false); //$NON-NLS-1$ //$NON-NLS-2$
+ ICompletionProposal[] results = checkOfCAByStartString(JSP_CA_NAME, "JBIDE/788/testCAforJSP.jsp", "h:outp",26,14,false,5); //$NON-NLS-1$ //$NON-NLS-2$
for (ICompletionProposal completionProposal : results) {
@@ -237,11 +239,11 @@
// cursor will set after "<" simbol
checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAforXHTML.xhtml", "c", //$NON-NLS-1$ //$NON-NLS-2$
- 15,12);
+ 15,12,3);
// cursor will set after "outputText" tag
checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAforXHTML.xhtml", "s", //$NON-NLS-1$//$NON-NLS-2$
- 19,43);
+ 19,43,3);
// check exception
if (getException() != null) {
@@ -262,9 +264,9 @@
* @throws IOException
*/
private ICompletionProposal[] checkOfCAByStartString(String caName, String testPagePath,
- String partOfString, int lineIndex, int linePosition)
+ String partOfString, int lineIndex, int linePosition, int proposalPopupTypesNum)
throws CoreException, IOException {
- return this.checkOfCAByStartString(caName, testPagePath, partOfString, lineIndex, linePosition,true);
+ return this.checkOfCAByStartString(caName, testPagePath, partOfString, lineIndex, linePosition, true, proposalPopupTypesNum);
}
/**
@@ -280,8 +282,8 @@
* @throws IOException
*/
- private ICompletionProposal[] checkOfCAByStartString(String caName, String testPagePath,
- String partOfString, int lineIndex, int linePosition,boolean isCheck) throws CoreException, IOException {
+ private ICompletionProposal[] checkOfCAByStartString(String caName, String testPagePath, String partOfString,
+ int lineIndex, int linePosition, boolean isCheck, int proposalPopupTypesNum) throws CoreException, IOException {
// get test page path
IFile file = (IFile) TestUtil.getComponentPath(testPagePath,
JsfAllTests.IMPORT_PROJECT_NAME);
@@ -296,18 +298,17 @@
ICompletionProposal[] results;
try {
JSPMultiPageEditor part = openEditor(input);
+ ITextViewer viewer = part.getSourceEditor().getTextViewer();
- int position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), lineIndex, linePosition);
+ int position = TestUtil.getLinePositionOffcet(viewer, lineIndex, linePosition);
// insert string
- part.getSourceEditor().getTextViewer().getTextWidget()
- .replaceTextRange(position, 0, partOfString);
+ viewer.getTextWidget().replaceTextRange(position, 0, partOfString);
int newPosition = position + partOfString.length();
// sets cursor position
- part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(
- newPosition);
+ viewer.getTextWidget().setCaretOffset(newPosition);
TestUtil.waitForJobs();
TestUtil.delay(1000);
@@ -327,12 +328,13 @@
.getContentAssistProcessor(caName);
assertNotNull(iContentAssistProcessor);
- results = iContentAssistProcessor
- .computeCompletionProposals(part.getSourceEditor()
- .getTextViewer(), newPosition);
+ for (int i = 0; i < proposalPopupTypesNum - 1; i++) {
+ iContentAssistProcessor.computeCompletionProposals(viewer, newPosition);
+ }
+ results = iContentAssistProcessor.computeCompletionProposals(viewer, newPosition);//obtain default proposals
// remove inserted string
- part.getSourceEditor().getTextViewer().getTextWidget()
+ viewer.getTextWidget()
.replaceTextRange(position, partOfString.length(), ""); //$NON-NLS-1$
assertNotNull(results);
assertTrue("Number of ca proposals shouldn't be a 0",results.length>0); //$NON-NLS-1$
15 years, 9 months
JBoss Tools SVN: r23524 - branches/jbosstools-3.2.0.M1/build/results.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-19 02:02:11 -0400 (Mon, 19 Jul 2010)
New Revision: 23524
Modified:
branches/jbosstools-3.2.0.M1/build/results/build.xml
Log:
add more path options for finding parent ${build.xml}
Modified: branches/jbosstools-3.2.0.M1/build/results/build.xml
===================================================================
--- branches/jbosstools-3.2.0.M1/build/results/build.xml 2010-07-19 06:00:52 UTC (rev 23523)
+++ branches/jbosstools-3.2.0.M1/build/results/build.xml 2010-07-19 06:02:11 UTC (rev 23524)
@@ -35,6 +35,12 @@
<condition property="build.xml" value="${basedir}/../../build.xml">
<available file="${basedir}/../../build.xml" type="file" />
</condition>
+ <condition property="build.xml" value="${basedir}/../../sources/build.xml">
+ <available file="${basedir}/../../sources/build.xml" type="file" />
+ </condition>
+ <condition property="build.xml" value="${basedir}/../build.xml">
+ <available file="${basedir}/../build.xml" type="file" />
+ </condition>
<!-- if can't calculate where build/build.xml is located, must pass in path from parent when calling this script -->
<target name="init">
@@ -107,16 +113,14 @@
regexp=".+/([^/]+\.zip)"
replace="\1"
casesensitive="false"
- override="true"
- />
+ override="true" />
<propertyregex property="COMPONENT"
input="${filename}"
defaultvalue="${filename}"
regexp="(.+)-(Update|Sources)-${ZIPSUFFIX}\.zip"
replace="\1"
casesensitive="false"
- override="true"
- />
+ override="true" />
<if>
<and>
@@ -150,7 +154,7 @@
<propertycopy from="${COMPONENT}-filesize" property="filesize" override="true" silent="true" />
<echo level="info">filesize = ${filesize}</echo>
<echo level="info">filename = ${filename}</echo>
- <var name="filesize" unset="true" />
+ <var name="filesize" unset="true" />
<var name="filename" unset="true" />
</sequential>
</for>
15 years, 9 months
JBoss Tools SVN: r23523 - trunk/build/results.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-19 02:00:52 -0400 (Mon, 19 Jul 2010)
New Revision: 23523
Modified:
trunk/build/results/build.xml
Log:
add more path options for finding parent ${build.xml}
Modified: trunk/build/results/build.xml
===================================================================
--- trunk/build/results/build.xml 2010-07-19 05:27:12 UTC (rev 23522)
+++ trunk/build/results/build.xml 2010-07-19 06:00:52 UTC (rev 23523)
@@ -35,6 +35,12 @@
<condition property="build.xml" value="${basedir}/../../build.xml">
<available file="${basedir}/../../build.xml" type="file" />
</condition>
+ <condition property="build.xml" value="${basedir}/../../sources/build.xml">
+ <available file="${basedir}/../../sources/build.xml" type="file" />
+ </condition>
+ <condition property="build.xml" value="${basedir}/../build.xml">
+ <available file="${basedir}/../build.xml" type="file" />
+ </condition>
<!-- if can't calculate where build/build.xml is located, must pass in path from parent when calling this script -->
<target name="init">
@@ -107,16 +113,14 @@
regexp=".+/([^/]+\.zip)"
replace="\1"
casesensitive="false"
- override="true"
- />
+ override="true" />
<propertyregex property="COMPONENT"
input="${filename}"
defaultvalue="${filename}"
regexp="(.+)-(Update|Sources)-${ZIPSUFFIX}\.zip"
replace="\1"
casesensitive="false"
- override="true"
- />
+ override="true" />
<if>
<and>
@@ -150,7 +154,7 @@
<propertycopy from="${COMPONENT}-filesize" property="filesize" override="true" silent="true" />
<echo level="info">filesize = ${filesize}</echo>
<echo level="info">filename = ${filename}</echo>
- <var name="filesize" unset="true" />
+ <var name="filesize" unset="true" />
<var name="filename" unset="true" />
</sequential>
</for>
15 years, 9 months
JBoss Tools SVN: r23522 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-19 01:27:12 -0400 (Mon, 19 Jul 2010)
New Revision: 23522
Modified:
trunk/build/publish.sh
Log:
add third dir option for where to find results/build.xml (aggregator case)
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-07-19 05:26:14 UTC (rev 23521)
+++ trunk/build/publish.sh 2010-07-19 05:27:12 UTC (rev 23522)
@@ -102,11 +102,12 @@
if [[ ${RELEASE} == "Yes" ]]; then
mkdir -p ${STAGINGDIR}/logs
ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
- if [[ -f ${WORKSPACE}/build/results/build.xml ]]; then
- ant -f ${WORKSPACE}/build/results/build.xml ${ANT_PARAMS}
- elif [[ -f ${WORKSPACE}/sources/build/results/build.xml ]]; then
- ant -f ${WORKSPACE}/sources/build/results/build.xml ${ANT_PARAMS}
- fi
+ for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do
+ if [[ -f ${buildxml} ]]; then
+ ANT_SCRIPT=${buildxml}
+ fi
+ done
+ ant -f ${ANT_SCRIPT} ${ANT_PARAMS}
fi
# get full build log and filter out Maven test failures
15 years, 9 months
JBoss Tools SVN: r23521 - branches/jbosstools-3.2.0.M1/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-19 01:26:14 -0400 (Mon, 19 Jul 2010)
New Revision: 23521
Modified:
branches/jbosstools-3.2.0.M1/build/publish.sh
Log:
add third dir option for where to find results/build.xml (aggregator case)
Modified: branches/jbosstools-3.2.0.M1/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-18 14:36:45 UTC (rev 23520)
+++ branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-19 05:26:14 UTC (rev 23521)
@@ -102,11 +102,12 @@
if [[ ${RELEASE} == "Yes" ]]; then
mkdir -p ${STAGINGDIR}/logs
ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
- if [[ -f ${WORKSPACE}/build/results/build.xml ]]; then
- ant -f ${WORKSPACE}/build/results/build.xml ${ANT_PARAMS}
- elif [[ -f ${WORKSPACE}/sources/build/results/build.xml ]]; then
- ant -f ${WORKSPACE}/sources/build/results/build.xml ${ANT_PARAMS}
- fi
+ for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do
+ if [[ -f ${buildxml} ]]; then
+ ANT_SCRIPT=${buildxml}
+ fi
+ done
+ ant -f ${ANT_SCRIPT} ${ANT_PARAMS}
fi
# get full build log and filter out Maven test failures
15 years, 9 months
JBoss Tools SVN: r23520 - branches/jbosstools-3.2.0.M1/build/component.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-18 10:36:45 -0400 (Sun, 18 Jul 2010)
New Revision: 23520
Added:
branches/jbosstools-3.2.0.M1/build/component/drools.xml
branches/jbosstools-3.2.0.M1/build/component/drools.xml.README.txt
branches/jbosstools-3.2.0.M1/build/component/vpe.xml
Log:
add component builders for drools, vpe
Added: branches/jbosstools-3.2.0.M1/build/component/drools.xml
===================================================================
--- branches/jbosstools-3.2.0.M1/build/component/drools.xml (rev 0)
+++ branches/jbosstools-3.2.0.M1/build/component/drools.xml 2010-07-18 14:36:45 UTC (rev 23520)
@@ -0,0 +1,15 @@
+<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>
+ <groupId>org.jboss.build.component</groupId>
+ <artifactId>common</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>../../tests</module>
+ <module>../../common</module>
+ <module>../../jst</module>
+ <module>../../flow</module>
+ <module>../../drools</module>
+ </modules>
+</project>
Added: branches/jbosstools-3.2.0.M1/build/component/drools.xml.README.txt
===================================================================
--- branches/jbosstools-3.2.0.M1/build/component/drools.xml.README.txt (rev 0)
+++ branches/jbosstools-3.2.0.M1/build/component/drools.xml.README.txt 2010-07-18 14:36:45 UTC (rev 23520)
@@ -0,0 +1,9 @@
+To build drools, you first need to run the build.xml script:
+
+$ cd ../../drools; ant
+
+Then run maven:
+
+$ cd ../build/component; mvn clean install -f drools.xml
+
+
Added: branches/jbosstools-3.2.0.M1/build/component/vpe.xml
===================================================================
--- branches/jbosstools-3.2.0.M1/build/component/vpe.xml (rev 0)
+++ branches/jbosstools-3.2.0.M1/build/component/vpe.xml 2010-07-18 14:36:45 UTC (rev 23520)
@@ -0,0 +1,18 @@
+<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>
+ <groupId>org.jboss</groupId>
+ <artifactId>tools</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>../../tests</module>
+ <module>../../jmx</module>
+ <module>../../archives</module>
+ <module>../../as</module>
+ <module>../../common</module>
+ <module>../../jst</module>
+ <module>../../xulrunner</module>
+ <module>../../vpe</module>
+ </modules>
+</project>
15 years, 9 months
JBoss Tools SVN: r23519 - trunk/build/component.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-18 10:36:21 -0400 (Sun, 18 Jul 2010)
New Revision: 23519
Added:
trunk/build/component/vpe.xml
Log:
add component builder for vpe
Added: trunk/build/component/vpe.xml
===================================================================
--- trunk/build/component/vpe.xml (rev 0)
+++ trunk/build/component/vpe.xml 2010-07-18 14:36:21 UTC (rev 23519)
@@ -0,0 +1,18 @@
+<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>
+ <groupId>org.jboss</groupId>
+ <artifactId>tools</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>../../tests</module>
+ <module>../../jmx</module>
+ <module>../../archives</module>
+ <module>../../as</module>
+ <module>../../common</module>
+ <module>../../jst</module>
+ <module>../../xulrunner</module>
+ <module>../../vpe</module>
+ </modules>
+</project>
15 years, 9 months