August 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r24487 - in trunk/cdi/plugins: org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2010-08-27 03:42:20 -0400 (Fri, 27 Aug 2010) New Revision: 24487 Removed: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidator.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java Log: https://jira.jboss.org/browse/JBIDE-6523 beans.xml validation Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml 2010-08-27 07:39:28 UTC (rev 24486) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml 2010-08-27 07:42:20 UTC (rev 24487) @@ -102,10 +102,6 @@ class="org.jboss.tools.cdi.internal.core.validation.CDICoreValidator" id="org.jboss.tools.cdi.core.CoreValidator"> </validator> -  </extension>  Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidator.java 2010-08-27 07:39:28 UTC (rev 24486) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidator.java 2010-08-27 07:42:20 UTC (rev 24487) @@ -1,204 +0,0 @@ -/******************************************************************************* - * 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.cdi.internal.core.validation; - -import java.io.IOException; -import java.util.Set; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IType; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.validation.internal.core.ValidationException; -import org.eclipse.wst.validation.internal.provisional.core.IReporter; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; -import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.preferences.CDIPreferences; -import org.jboss.tools.common.EclipseUtil; -import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.util.EclipseJavaUtil; -import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper; -import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * @author Alexey Kazakov - */ -public class BeansXmlValidator extends CDICoreValidator { - - public String ENT_CDI_BEANS = "FileCDIBeans"; //$NON-NLS-1$ - public static final String ID = "org.jboss.tools.cdi.core.BeansXmlValidator"; //$NON-NLS-1$ - - private IJavaProject javaProject; - - /* - * (non-Javadoc) - * - * @see org.jboss.tools.jst.web.kb.validation.IValidator#getId() - */ - public String getId() { - return ID; - } - - @Override - public void init(IProject project, ContextValidationHelper validationHelper, org.eclipse.wst.validation.internal.provisional.core.IValidator manager, - IReporter reporter) { - super.init(project, validationHelper, manager, reporter); - javaProject = EclipseUtil.getJavaProject(project); - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.cdi.internal.core.validation.CDICoreValidator#shouldValidate(org.eclipse.core.resources.IProject) - */ - @Override - public boolean shouldValidate(IProject project) { - return super.shouldValidate(project) && CDIPreferences.shouldValidateBeansXml(project); - } - - /* - * (non-Javadoc) - * - * @see - * org.jboss.tools.jst.web.kb.validation.IValidator#validate(java.util.Set, - * org.eclipse.core.resources.IProject, - * org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper, - * org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager, - * org.eclipse.wst.validation.internal.provisional.core.IReporter) - */ - public IStatus validate(Set<IFile> changedFiles, IProject project, ContextValidationHelper validationHelper, ValidatorManager manager, IReporter reporter) - throws ValidationException { - init(project, validationHelper, manager, reporter); - displaySubtask(CDIValidationMessages.SEARCHING_RESOURCES); - - if (cdiProject == null) { - return OK_STATUS; - } - IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - for (IFile currentFile : changedFiles) { - if (reporter.isCancelled()) { - break; - } - // Check if it's a beans.xml - XModelObject xmo = EclipseResourceUtil.createObjectForResource(currentFile); - if(xmo != null && xmo.getModelEntity().getName().startsWith(ENT_CDI_BEANS)) { - validateBeansXml(currentFile); - } - } - - return OK_STATUS; - } - - /* - * (non-Javadoc) - * - * @see - * org.jboss.tools.jst.web.kb.validation.IValidator#validateAll(org.eclipse - * .core.resources.IProject, - * org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper, - * org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager, - * org.eclipse.wst.validation.internal.provisional.core.IReporter) - */ - public IStatus validateAll(IProject project, ContextValidationHelper validationHelper, ValidatorManager manager, IReporter reporter) - throws ValidationException { - init(project, validationHelper, manager, reporter); - if (cdiProject == null) { - return OK_STATUS; - } - displaySubtask(CDIValidationMessages.VALIDATING_PROJECT, new String[] { projectName }); - removeAllMessagesFromResource(cdiProject.getNature().getProject()); - - // TODO get all the beans.xml and validate them - - return OK_STATUS; - } - - private void validateBeansXml(IFile beansXml) { - IModelManager manager = StructuredModelManager.getModelManager(); - if(manager == null) { - // this may happen if plug-in org.eclipse.wst.sse.core - // is stopping or un-installed, that is Eclipse is shutting down. - // there is no need to report it, just stop validation. - return; - } - - IStructuredModel model = null; - try { - model = manager.getModelForRead(beansXml); - if (model instanceof IDOMModel) { - IDOMModel domModel = (IDOMModel) model; - IDOMDocument document = domModel.getDocument(); - - NodeList list = document.getElementsByTagName("class"); - for (int i = 0; i < list.getLength(); i++) { - Node classNode = list.item(i); - NodeList children = classNode.getChildNodes(); - - boolean empty = true; - for (int j = 0; j < children.getLength(); j++) { - Node node = children.item(j); - if(node.getNodeType() == Node.TEXT_NODE) { - String value = node.getNodeValue(); - if(value!=null) { - String className = value.trim(); - if(className.length()==0) { - continue; - } - empty = false; - if(node instanceof IndexedRegion) { - int start = ((IndexedRegion)node).getStartOffset() + value.indexOf(className); - int length = className.length(); - IType type = EclipseJavaUtil.findType(javaProject, className); - if(type==null) { - if(node instanceof IndexedRegion) { - addError(CDIValidationMessages.CONFLICTING_INTERCEPTOR_BINDINGS, CDIPreferences.CONFLICTING_INTERCEPTOR_BINDINGS, - new String[]{}, length, start, beansXml); - break; - } - } - } - } - } - } - - if(empty) { - if(classNode instanceof IndexedRegion) { - int start = ((IndexedRegion)classNode).getStartOffset(); - int end = ((IndexedRegion)classNode).getEndOffset(); - int length = end - start; - addError(CDIValidationMessages.CONFLICTING_INTERCEPTOR_BINDINGS, CDIPreferences.CONFLICTING_INTERCEPTOR_BINDINGS, - new String[]{}, length, start, beansXml); - } - } - } - } - } catch (CoreException e) { - CDICorePlugin.getDefault().logError(e); - } catch (IOException e) { - CDICorePlugin.getDefault().logError(e); - } finally { - if (model != null) { - model.releaseFromRead(); - } - } - } -} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-08-27 07:39:28 UTC (rev 24486) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-08-27 07:42:20 UTC (rev 24487) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.cdi.internal.core.validation; +import java.io.IOException; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; @@ -20,6 +21,7 @@ import java.util.Set; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; @@ -32,15 +34,26 @@ import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IField; +import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IMemberValuePair; import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.ISourceRange; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.ITypeParameter; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.Signature; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualFile; +import org.eclipse.wst.sse.core.StructuredModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; import org.eclipse.wst.validation.internal.core.ValidationException; import org.eclipse.wst.validation.internal.provisional.core.IReporter; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; @@ -78,6 +91,7 @@ import org.jboss.tools.cdi.internal.core.impl.CDIProject; import org.jboss.tools.cdi.internal.core.impl.Parameter; import org.jboss.tools.cdi.internal.core.impl.SessionBean; +import org.jboss.tools.common.EclipseUtil; import org.jboss.tools.common.model.util.EclipseJavaUtil; import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper; @@ -87,6 +101,9 @@ import org.jboss.tools.jst.web.kb.validation.IValidationContext; import org.jboss.tools.jst.web.kb.validation.IValidator; import org.jboss.tools.jst.web.kb.validation.ValidationUtil; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * @author Alexey Kazakov @@ -96,6 +113,7 @@ ICDIProject cdiProject; String projectName; + IJavaProject javaProject; /* * (non-Javadoc) @@ -181,6 +199,7 @@ super.init(project, validationHelper, manager, reporter); cdiProject = CDICorePlugin.getCDIProject(project, false); projectName = project.getName(); + javaProject = EclipseUtil.getJavaProject(project); } /* @@ -284,6 +303,12 @@ for (String scope: scopes) { validateScopeType(cdiProject.getScope(scope)); } + + List<IFile> beansXmls = getAllBeansXmls(); + for (IFile beansXml : beansXmls) { + validateBeansXml(beansXml); + } + return OK_STATUS; } @@ -297,21 +322,63 @@ return; } displaySubtask(CDIValidationMessages.VALIDATING_RESOURCE, new String[] {file.getProject().getName(), file.getName()}); - Set<IBean> beans = cdiProject.getBeans(file.getFullPath()); - for (IBean bean : beans) { - validateBean(bean); + + if("beans.xml".equalsIgnoreCase(file.getName()) && CDIPreferences.shouldValidateBeansXml(file.getProject())) { + // TODO should we check the path of the beans.xml? Or it's better to check the every beans.xml even if it is not in META-INF or WEB-INF. + validateBeansXml(file); + } else { + Set<IBean> beans = cdiProject.getBeans(file.getFullPath()); + for (IBean bean : beans) { + validateBean(bean); + } + IStereotype stereotype = cdiProject.getStereotype(file.getFullPath()); + validateStereotype(stereotype); + + IQualifier qualifier = cdiProject.getQualifier(file.getFullPath()); + validateQualifier(qualifier); + + IScope scope = cdiProject.getScope(file.getFullPath()); + validateScopeType(scope); + + IInterceptorBinding binding = cdiProject.getInterceptorBinding(file.getFullPath()); + validateInterceptorBinding(binding); } - IStereotype stereotype = cdiProject.getStereotype(file.getFullPath()); - validateStereotype(stereotype); + } - IQualifier qualifier = cdiProject.getQualifier(file.getFullPath()); - validateQualifier(qualifier); - - IScope scope = cdiProject.getScope(file.getFullPath()); - validateScopeType(scope); - - IInterceptorBinding binding = cdiProject.getInterceptorBinding(file.getFullPath()); - validateInterceptorBinding(binding); + /** + * Returns all the beans.xml from META-INF and WEB-INF folders + * + * @return + */ + private List<IFile> getAllBeansXmls() { + List<IFile> beansXmls = new ArrayList<IFile>(); + IPackageFragmentRoot[] roots; + try { + // From source folders + roots = javaProject.getPackageFragmentRoots(); + for (int i = 0; i < roots.length; i++) { + if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) { + IResource source = roots[i].getCorrespondingResource(); + if(source instanceof IFolder) { + IResource beansXml = ((IFolder)source).findMember(new Path("/META-INF/beans.xml")); //$NON-NLS-1$ + if(beansXml!=null && beansXml instanceof IFile) { + beansXmls.add((IFile)beansXml); + } + } + } + } + // From WEB-INF folder + IVirtualComponent com = ComponentCore.createComponent(rootProject); + if(com!=null) { + IVirtualFile beansXml = com.getRootFolder().getFile(new Path("/WEB-INF/beans.xml")); //$NON-NLS-1$ + if(beansXml!=null && beansXml.getUnderlyingFile().isAccessible()) { + beansXmls.add(beansXml.getUnderlyingFile()); + } + } + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + return beansXmls; } /** @@ -2041,4 +2108,240 @@ CDICorePlugin.getDefault().logError(e); } } + + private void validateBeansXml(IFile beansXml) { + IModelManager manager = StructuredModelManager.getModelManager(); + if(manager == null) { + // this may happen if plug-in org.eclipse.wst.sse.core + // is stopping or un-installed, that is Eclipse is shutting down. + // there is no need to report it, just stop validation. + return; + } + + IStructuredModel model = null; + try { + model = manager.getModelForRead(beansXml); + if (model instanceof IDOMModel) { + IDOMModel domModel = (IDOMModel) model; + IDOMDocument document = domModel.getDocument(); + + /* + * 5.1.1. Declaring selected alternatives for a bean archive + * - Each child <class> element must specify the name of an alternative bean class. If there is no class with the specified + * name, or if the class with the specified name is not an alternative bean class, the container automatically detects the problem + * and treats it as a deployment problem. + * - If the same type is listed twice under the <alternatives> element, the container automatically detects the problem and + * treats it as a deployment problem. + */ + validateTypeBeanForBeansXml(document, beansXml, "class", false, "alternatives", CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME, CDIValidationMessages.ILLEGAL_ALTERNATIVE_BEAN_CLASS, CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE, CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME); //$NON-NLS-1$ + + /* + * 5.1.1. Declaring selected alternatives for a bean archive + * - Each child <stereotype> element must specify the name of an @Alternative stereotype annotation. If there is no annotation + * with the specified name, or the annotation is not an @Alternative stereotype, the container automatically detects the + * problem and treats it as a deployment problem. + * - If the same type is listed twice under the <alternatives> element, the container automatically detects the problem and + * treats it as a deployment problem. + */ + validateTypeBeanForBeansXml(document, beansXml, "stereotype", true, "alternatives", CDIValidationMessages.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME, CDIValidationMessages.ILLEGAL_ALTERNATIVE_ANNOTATION, CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE, CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME); //$NON-NLS-1$ + + /* + * 8.2. Decorator enablement and ordering + * - Each child <class> element must specify the name of a decorator bean class. If there is no class with the specified name, + * or if the class with the specified name is not a decorator bean class, the container automatically detects the problem and + * treats it as a deployment problem. + * - If the same class is listed twice under the <decorators> element, the container automatically detects the problem and + * treats it as a deployment problem. + */ + validateTypeBeanForBeansXml(document, beansXml, "class", false, "decorators", CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME, CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS, CDIValidationMessages.DUPLICATE_DECORATOR_CLASS, CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME); //$NON-NLS-1$ + + /* + * 9.4. Interceptor enablement and ordering + * - Each child <class> element must specify the name of an interceptor class. If there is no class with the specified name, or if + * the class with the specified name is not an interceptor class, the container automatically detects the problem and treats it as + * a deployment problem. + * - If the same class is listed twice under the <interceptors> element, the container automatically detects the problem and treats it as + * a deployment problem. + */ + validateTypeBeanForBeansXml(document, beansXml, "class", false, "interceptors", CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME, CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS, CDIValidationMessages.DUPLICATE_INTERCEPTOR_CLASS, CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME); //$NON-NLS-1$ + } + } catch (CoreException e) { + CDICorePlugin.getDefault().logError(e); + } catch (IOException e) { + CDICorePlugin.getDefault().logError(e); + } finally { + if (model != null) { + model.releaseFromRead(); + } + } + } + + private void validateTypeBeanForBeansXml(IDOMDocument document, IFile beansXml, String typeElementName, boolean annotationType, String parentElementName, String unknownTypeErrorMessage, String illegalTypeErrorMessage, String duplicateTypeErrorMessage, String annotationName) { + try { + NodeList parentNodeList = document.getElementsByTagName(parentElementName); + for (int i = 0; i < parentNodeList.getLength(); i++) { + Node parentNode = parentNodeList.item(i); + if(parentNode instanceof Element) { + List<TypeNode> typeNodes = getTypeElements((Element)parentNode, typeElementName); + Map<String, TypeNode> uniqueTypes = new HashMap<String, TypeNode>(); + for (TypeNode typeNode : typeNodes) { + IType type = getType(beansXml, typeNode, unknownTypeErrorMessage); + if(type!=null) { + if(!type.isBinary()) { + validationContext.addLinkedCoreResource(beansXml.getFullPath().toOSString(), type.getPath(), false); + } + if(!(annotationType?type.isAnnotation():type.isClass())) { + addError(illegalTypeErrorMessage, CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML, + new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml); + } else if(type.isBinary()) { + IAnnotation[] annotations = type.getAnnotations(); + boolean found = false; + for (IAnnotation annotation : annotations) { + if(annotation.getElementName().equals(annotationName)) { + found = true; + break; + } + } + if(!found) { + addError(illegalTypeErrorMessage, CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML, + new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml); + } + continue; + } else { + IClassBean classBean = getClassBean(type); + if(classBean==null || !classBean.isAlternative()) { + addError(illegalTypeErrorMessage, CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML, + new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml); + } + } + TypeNode node = uniqueTypes.get(typeNode.getTypeName()); + if(node!=null) { + if(!node.isMarkedAsDuplicated()) { + addError(duplicateTypeErrorMessage, CDIPreferences.DUPLICATE_TYPE_IN_BEANS_XML, + new String[]{}, node.getLength(), node.getStartOffset(), beansXml); + } + node.setMarkedAsDuplicated(true); + addError(duplicateTypeErrorMessage, CDIPreferences.DUPLICATE_TYPE_IN_BEANS_XML, + new String[]{}, typeNode.getLength(), typeNode.getStartOffset(), beansXml); + } + uniqueTypes.put(typeNode.getTypeName(), typeNode); + } + } + } + } + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + } + + private IClassBean getClassBean(IType type) { + IPath path = type.getPath(); + Set<IBean> beans = cdiProject.getBeans(path); + for (IBean bean : beans) { + if(bean instanceof IClassBean) { + return (IClassBean)bean; + } + } + return null; + } + + private IType getType(IFile beansXml, TypeNode node, String errorMessage) { + IType type = null; + if(node.getTypeName()!=null) { + try { + type = EclipseJavaUtil.findType(javaProject, node.getTypeName()); + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + return null; + } + } + if(type==null) { + addError(errorMessage, CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML, + new String[]{}, node.getLength(), node.getStartOffset(), beansXml); + } + return type; + } + + private List<TypeNode> getTypeElements(Element parentElement, String typeElementName) { + List<TypeNode> result = new ArrayList<TypeNode>(); + NodeList list = parentElement.getElementsByTagName(typeElementName); + for (int i = 0; i < list.getLength(); i++) { + Node classNode = list.item(i); + NodeList children = classNode.getChildNodes(); + + boolean empty = true; + for (int j = 0; j < children.getLength(); j++) { + Node node = children.item(j); + if(node.getNodeType() == Node.TEXT_NODE) { + String value = node.getNodeValue(); + if(value!=null) { + String className = value.trim(); + if(className.length()==0) { + continue; + } + empty = false; + if(node instanceof IndexedRegion) { + int start = ((IndexedRegion)node).getStartOffset() + value.indexOf(className); + int length = className.length(); + result.add(new TypeNode(start, length, className)); + break; + } + } + } + } + + if(empty && classNode instanceof IndexedRegion) { + int start = ((IndexedRegion)classNode).getStartOffset(); + int end = ((IndexedRegion)classNode).getEndOffset(); + int length = end - start; + result.add(new TypeNode(start, length, null)); + } + } + return result; + } + + private static class TypeNode { + private int startOffset; + private int length; + private String typeName; + private boolean markedAsDuplicated; + + public TypeNode(int startOffset, int length, String typeName) { + this.startOffset = startOffset; + this.length = length; + this.typeName = typeName; + } + + public int getStartOffset() { + return startOffset; + } + + public void setStartOffset(int startOffset) { + this.startOffset = startOffset; + } + + public int getLength() { + return length; + } + + public void setLength(int length) { + this.length = length; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public boolean isMarkedAsDuplicated() { + return markedAsDuplicated; + } + + public void setMarkedAsDuplicated(boolean markedAsDuplicated) { + this.markedAsDuplicated = markedAsDuplicated; + } + } } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java 2010-08-27 07:39:28 UTC (rev 24486) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java 2010-08-27 07:42:20 UTC (rev 24487) @@ -47,8 +47,6 @@ public static String CDIValidatorConfigurationBlock_pb_illegalTypeInTypedDeclaration_label; public static String CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeHasWildcard_label; public static String CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeIsVariable_label; - public static String CDIValidatorConfigurationBlock_pb_producerFieldTypeHasWildcard_label; - public static String CDIValidatorConfigurationBlock_pb_producerFieldTypeIsVariable_label; public static String CDIValidatorConfigurationBlock_pb_producerFieldTypeDoesNotMatchJavaEeObject_label; public static String CDIValidatorConfigurationBlock_pb_injectResolvesToNullableBean_label; public static String CDIValidatorConfigurationBlock_pb_injectionTypeIsVariable_label; @@ -65,7 +63,6 @@ public static String CDIValidatorConfigurationBlock_pb_illegalScopeForManagedBean_label; public static String CDIValidatorConfigurationBlock_pb_illegalScopeForSessionBean_label; public static String CDIValidatorConfigurationBlock_pb_illegalScopeForProducerMethod_label; - public static String CDIValidatorConfigurationBlock_pb_illegalScopeForProducerField_label; public static String CDIValidatorConfigurationBlock_pb_illegalScopeWhenTypeInjectionPointIsInjected_label; public static String CDIValidatorConfigurationBlock_pb_illegalScopeForInterceptor_label; public static String CDIValidatorConfigurationBlock_pb_illegalScopeForDecorator_label; @@ -82,7 +79,6 @@ public static String CDIValidatorConfigurationBlock_pb_illegalDisposerInSessionBean_label; public static String CDIValidatorConfigurationBlock_pb_noProducerMatchingDisposer_label; public static String CDIValidatorConfigurationBlock_pb_multipleDisposersForProducer_label; - public static String CDIValidatorConfigurationBlock_pb_illegalProducerFieldInSessionBean_label; public static String CDIValidatorConfigurationBlock_pb_multipleInjectionConstructors_label; public static String CDIValidatorConfigurationBlock_pb_constructorParameterIllegallyAnnotated_label; public static String CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label; @@ -118,7 +114,6 @@ public static String CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label; public static String CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBean_label; public static String CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_label; - public static String CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label; // Miscellaneous public static String CDIValidatorConfigurationBlock_section_miscellaneous;

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r24486 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2010-08-27 03:39:28 -0400 (Fri, 27 Aug 2010) New Revision: 24486 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java Log: https://jira.jboss.org/browse/JBIDE-6926 , constant was added Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2010-08-27 05:12:30 UTC (rev 24485) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2010-08-27 07:39:28 UTC (rev 24486) @@ -4698,6 +4698,10 @@ * text field labeled 'Name*' */ public static final String TEXT_FILE_NAME = "File name:"; + /** + * text field labeled 'Enter or select the parent folder:' + */ + public static final String TEXT_ENTER_OR_SELECT_THE_PARENT_FOLDER = "Enter or select the parent folder:"; } public static class JBossToolsWebHTMLFile { /**

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r24485 - in trunk: as/site and 74 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-08-27 01:12:30 -0400 (Fri, 27 Aug 2010) New Revision: 24485 Modified: trunk/archives/site/pom.xml trunk/as/site/pom.xml trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml trunk/birt/plugins/org.jboss.tools.birt.core/pom.xml trunk/birt/plugins/org.jboss.tools.birt.oda.ui/pom.xml trunk/birt/plugins/org.jboss.tools.birt.oda/pom.xml trunk/birt/site/pom.xml trunk/birt/tests/org.jboss.tools.birt.core.test/pom.xml trunk/bpel/site/pom.xml trunk/build/product/pom.xml trunk/cdi/site/pom.xml trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml trunk/common/site/pom.xml trunk/deltacloud/site/pom.xml trunk/drools/features/org.drools.eclipse.feature/pom.xml trunk/drools/features/org.drools.eclipse.task.feature/pom.xml trunk/drools/features/org.guvnor.tools.feature/pom.xml trunk/drools/plugins/org.drools.eclipse.task/pom.xml trunk/drools/plugins/org.drools.eclipse/pom.xml trunk/drools/plugins/org.eclipse.webdav/pom.xml trunk/drools/plugins/org.guvnor.tools/pom.xml trunk/drools/pom.xml trunk/drools/site/pom.xml trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml trunk/drools/tests/pom.xml trunk/esb/site/pom.xml trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml trunk/examples/site/pom.xml trunk/flow/site/pom.xml trunk/freemarker/site/pom.xml trunk/gwt/features/org.jboss.tools.gwt.feature/pom.xml trunk/gwt/plugins/org.jboss.tools.gwt.core/pom.xml trunk/gwt/plugins/org.jboss.tools.gwt.ui/pom.xml trunk/hibernatetools/site/pom.xml trunk/jbpm/site/pom.xml trunk/jmx/site/pom.xml trunk/jsf/site/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml trunk/jst/site/pom.xml trunk/labs/features/pom.xml trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/pom.xml trunk/labs/plugins/pom.xml trunk/labs/tests/pom.xml trunk/maven/site/pom.xml trunk/modeshape/site/pom.xml trunk/portlet/features/pom.xml trunk/portlet/plugins/pom.xml trunk/portlet/pom.xml trunk/portlet/site/pom.xml trunk/portlet/tests/pom.xml trunk/profiler/site/pom.xml trunk/runtime/features/org.jboss.tools.runtime.feature/pom.xml trunk/runtime/features/pom.xml trunk/runtime/plugins/org.jboss.tools.runtime/pom.xml trunk/runtime/plugins/pom.xml trunk/runtime/site/pom.xml trunk/smooks/site/pom.xml trunk/struts/site/pom.xml trunk/tests/plugins/org.jboss.tools.tests/pom.xml trunk/tests/site/pom.xml trunk/tptp/site/pom.xml trunk/vpe/features/pom.xml trunk/vpe/plugins/pom.xml trunk/vpe/pom.xml trunk/vpe/site/pom.xml trunk/vpe/tests/pom.xml trunk/ws/site/pom.xml Log: JBDS-1247 remove relativePath from pom.xml so that old parent-pom.xml is entirely orphaned and deletable Modified: trunk/archives/site/pom.xml =================================================================== --- trunk/archives/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/archives/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/as/site/pom.xml =================================================================== --- trunk/as/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/as/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml =================================================================== --- trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/birt/plugins/org.jboss.tools.birt.core/pom.xml =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.core/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/birt/plugins/org.jboss.tools.birt.core/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/pom.xml =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/pom.xml =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/birt/site/pom.xml =================================================================== --- trunk/birt/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/birt/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/birt/tests/org.jboss.tools.birt.core.test/pom.xml =================================================================== --- trunk/birt/tests/org.jboss.tools.birt.core.test/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/birt/tests/org.jboss.tools.birt.core.test/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/bpel/site/pom.xml =================================================================== --- trunk/bpel/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/bpel/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/build/product/pom.xml =================================================================== --- trunk/build/product/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/build/product/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -16,7 +16,7 @@ --> <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> Modified: trunk/cdi/site/pom.xml =================================================================== --- trunk/cdi/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/cdi/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -3,7 +3,7 @@ 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> Modified: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,6 +2,7 @@ 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> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/common/site/pom.xml =================================================================== --- trunk/common/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/common/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/deltacloud/site/pom.xml =================================================================== --- trunk/deltacloud/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/deltacloud/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/drools/features/org.drools.eclipse.feature/pom.xml =================================================================== --- trunk/drools/features/org.drools.eclipse.feature/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/drools/features/org.drools.eclipse.feature/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/drools/features/org.drools.eclipse.task.feature/pom.xml =================================================================== --- trunk/drools/features/org.drools.eclipse.task.feature/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/drools/features/org.drools.eclipse.task.feature/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/drools/features/org.guvnor.tools.feature/pom.xml =================================================================== --- trunk/drools/features/org.guvnor.tools.feature/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/drools/features/org.guvnor.tools.feature/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/drools/plugins/org.drools.eclipse/pom.xml =================================================================== --- trunk/drools/plugins/org.drools.eclipse/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/drools/plugins/org.drools.eclipse/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/drools/plugins/org.drools.eclipse.task/pom.xml =================================================================== --- trunk/drools/plugins/org.drools.eclipse.task/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/drools/plugins/org.drools.eclipse.task/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/drools/plugins/org.eclipse.webdav/pom.xml =================================================================== --- trunk/drools/plugins/org.eclipse.webdav/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/drools/plugins/org.eclipse.webdav/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/drools/plugins/org.guvnor.tools/pom.xml =================================================================== --- trunk/drools/plugins/org.guvnor.tools/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/drools/plugins/org.guvnor.tools/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/drools/pom.xml =================================================================== --- trunk/drools/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/drools/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -3,7 +3,7 @@ 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> Modified: trunk/drools/site/pom.xml =================================================================== --- trunk/drools/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/drools/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/drools/tests/pom.xml =================================================================== --- trunk/drools/tests/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/drools/tests/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/esb/site/pom.xml =================================================================== --- trunk/esb/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/esb/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/examples/site/pom.xml =================================================================== --- trunk/examples/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/examples/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/flow/site/pom.xml =================================================================== --- trunk/flow/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/flow/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/freemarker/site/pom.xml =================================================================== --- trunk/freemarker/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/freemarker/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/gwt/features/org.jboss.tools.gwt.feature/pom.xml =================================================================== --- trunk/gwt/features/org.jboss.tools.gwt.feature/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/gwt/features/org.jboss.tools.gwt.feature/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/gwt/plugins/org.jboss.tools.gwt.core/pom.xml =================================================================== --- trunk/gwt/plugins/org.jboss.tools.gwt.core/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/gwt/plugins/org.jboss.tools.gwt.core/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/gwt/plugins/org.jboss.tools.gwt.ui/pom.xml =================================================================== --- trunk/gwt/plugins/org.jboss.tools.gwt.ui/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/gwt/plugins/org.jboss.tools.gwt.ui/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/hibernatetools/site/pom.xml =================================================================== --- trunk/hibernatetools/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/hibernatetools/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/jbpm/site/pom.xml =================================================================== --- trunk/jbpm/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/jbpm/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/jmx/site/pom.xml =================================================================== --- trunk/jmx/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/jmx/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/jsf/site/pom.xml =================================================================== --- trunk/jsf/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/jsf/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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>../test-pom.xml</relativePath> + <groupId>org.jboss.tools.jsf.tests</groupId> <artifactId>jsf.generic.test</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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>../test-pom.xml</relativePath> + <groupId>org.jboss.tools.jsf.tests</groupId> <artifactId>jsf.generic.test</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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>../test-pom.xml</relativePath> + <groupId>org.jboss.tools.jsf.tests</groupId> <artifactId>jsf.generic.test</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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>../test-pom.xml</relativePath> + <groupId>org.jboss.tools.jsf.tests</groupId> <artifactId>jsf.generic.test</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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>../test-pom.xml</relativePath> + <groupId>org.jboss.tools.jsf.tests</groupId> <artifactId>jsf.generic.test</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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>../test-pom.xml</relativePath> + <groupId>org.jboss.tools.jsf.tests</groupId> <artifactId>jsf.generic.test</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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>../test-pom.xml</relativePath> + <groupId>org.jboss.tools.jsf.tests</groupId> <artifactId>jsf.generic.test</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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>../test-pom.xml</relativePath> + <groupId>org.jboss.tools.jsf.tests</groupId> <artifactId>jsf.generic.test</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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>../test-pom.xml</relativePath> + <groupId>org.jboss.tools.jsf.tests</groupId> <artifactId>jsf.generic.test</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/jst/site/pom.xml =================================================================== --- trunk/jst/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/jst/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/labs/features/pom.xml =================================================================== --- trunk/labs/features/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/labs/features/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/pom.xml =================================================================== --- trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/labs/plugins/pom.xml =================================================================== --- trunk/labs/plugins/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/labs/plugins/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/labs/tests/pom.xml =================================================================== --- trunk/labs/tests/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/labs/tests/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/maven/site/pom.xml =================================================================== --- trunk/maven/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/maven/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/modeshape/site/pom.xml =================================================================== --- trunk/modeshape/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/modeshape/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/portlet/features/pom.xml =================================================================== --- trunk/portlet/features/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/portlet/features/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/portlet/plugins/pom.xml =================================================================== --- trunk/portlet/plugins/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/portlet/plugins/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/portlet/pom.xml =================================================================== --- trunk/portlet/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/portlet/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/portlet/site/pom.xml =================================================================== --- trunk/portlet/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/portlet/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/portlet/tests/pom.xml =================================================================== --- trunk/portlet/tests/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/portlet/tests/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/profiler/site/pom.xml =================================================================== --- trunk/profiler/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/profiler/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/runtime/features/org.jboss.tools.runtime.feature/pom.xml =================================================================== --- trunk/runtime/features/org.jboss.tools.runtime.feature/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/runtime/features/org.jboss.tools.runtime.feature/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/runtime/features/pom.xml =================================================================== --- trunk/runtime/features/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/runtime/features/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/runtime/plugins/org.jboss.tools.runtime/pom.xml =================================================================== --- trunk/runtime/plugins/org.jboss.tools.runtime/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/runtime/plugins/org.jboss.tools.runtime/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/runtime/plugins/pom.xml =================================================================== --- trunk/runtime/plugins/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/runtime/plugins/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/runtime/site/pom.xml =================================================================== --- trunk/runtime/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/runtime/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/smooks/site/pom.xml =================================================================== --- trunk/smooks/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/smooks/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/struts/site/pom.xml =================================================================== --- trunk/struts/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/struts/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/tests/plugins/org.jboss.tools.tests/pom.xml =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/tests/plugins/org.jboss.tools.tests/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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>${basedir}/../../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/tests/site/pom.xml =================================================================== --- trunk/tests/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/tests/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/tptp/site/pom.xml =================================================================== --- trunk/tptp/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/tptp/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/vpe/features/pom.xml =================================================================== --- trunk/vpe/features/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/vpe/features/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/vpe/plugins/pom.xml =================================================================== --- trunk/vpe/plugins/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/vpe/plugins/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/vpe/pom.xml =================================================================== --- trunk/vpe/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/vpe/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/vpe/site/pom.xml =================================================================== --- trunk/vpe/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/vpe/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> Modified: trunk/vpe/tests/pom.xml =================================================================== --- trunk/vpe/tests/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/vpe/tests/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -2,7 +2,7 @@ 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> Modified: trunk/ws/site/pom.xml =================================================================== --- trunk/ws/site/pom.xml 2010-08-27 04:11:47 UTC (rev 24484) +++ trunk/ws/site/pom.xml 2010-08-27 05:12:30 UTC (rev 24485) @@ -1,7 +1,7 @@ <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> <parent> - <relativePath>../../build/parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version>

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r24484 - in trunk/download.jboss.org/jbosstools/updates: requirements and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-08-27 00:11:47 -0400 (Fri, 27 Aug 2010) New Revision: 24484 Added: trunk/download.jboss.org/jbosstools/updates/requirements/ trunk/download.jboss.org/jbosstools/updates/requirements/helios/ Modified: trunk/download.jboss.org/jbosstools/updates/requirements/helios/README.txt Log: README for rsync'ing helios to download.jboss.org Copied: trunk/download.jboss.org/jbosstools/updates/requirements/helios (from rev 24043, trunk/download.jboss.org/jbosstools/updates/helios) Modified: trunk/download.jboss.org/jbosstools/updates/requirements/helios/README.txt =================================================================== --- trunk/download.jboss.org/jbosstools/updates/helios/README.txt 2010-08-11 13:05:48 UTC (rev 24043) +++ trunk/download.jboss.org/jbosstools/updates/requirements/helios/README.txt 2010-08-27 04:11:47 UTC (rev 24484) @@ -7,8 +7,8 @@ 2. rsync build.eclipse.org to reports.qa: -$ rsync -aP --delete nickb@build.eclipse.org:~/downloads/releases/helios/* /qa/services/http/binaries/RHDS/updates/helios/ +$ rsync -aP --delete nickb@build.eclipse.org:~/downloads/releases/helios/* /qa/services/http/binaries/RHDS/updates/requirements/helios/ 3. rsync reports.qa to download.jboss.org: -$ rsync -aP --delete /qa/services/http/binaries/RHDS/updates/helios/* jbossqa@filemgmt.jboss.org:/htdocs/jbosstools/updates/helios/ \ No newline at end of file +$ rsync -aP --delete /qa/services/http/binaries/RHDS/updates/requirements/helios/* jbossqa@filemgmt.jboss.org:/htdocs/jbosstools/updates/requirements/helios/

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r24483 - in trunk/usage: tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-08-26 19:30:03 -0400 (Thu, 26 Aug 2010) New Revision: 24483 Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReadUntilAlternativesImpl.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java Log: [JBIDE-6880] queried wiki page may now contain multiple keys/values. first test succeedes, other still fail (are still @ignored) Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReadUntilAlternativesImpl.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReadUntilAlternativesImpl.java 2010-08-26 23:19:33 UTC (rev 24482) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReadUntilAlternativesImpl.java 2010-08-26 23:30:03 UTC (rev 24483) @@ -70,6 +70,7 @@ } } + this.alternativesIndex = -1; return false; } Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-08-26 23:19:33 UTC (rev 24482) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-08-26 23:30:03 UTC (rev 24483) @@ -29,21 +29,18 @@ */ public class GlobalUsageReportingSettingsTest { - @Ignore @Test public void canExtractEnabledValue() throws IOException { GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("ENABLED", "", ""); assertTrue(reportSettings.isEnabled()); } - @Ignore @Test public void canExtractDisabledValue() throws IOException { GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("DISABLED", "", ""); assertFalse(reportSettings.isEnabled()); } - @Ignore @Test public void canExtractDisabledOutUndefinedValue() throws IOException { GlobalReportingSettingsFake reportEnablement = new GlobalReportingSettingsFake("Rubbish", "", "");

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r24482 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2010-08-26 19:19:33 -0400 (Thu, 26 Aug 2010) New Revision: 24482 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/WSTestUtils.java Log: OPEN - issue JBIDE-6925: [Tester] Body text for PUT operation not being cleared of CRLF prior to invocation https://jira.jboss.org/browse/JBIDE-6925 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/WSTestUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/WSTestUtils.java 2010-08-26 22:00:39 UTC (rev 24481) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/WSTestUtils.java 2010-08-26 23:19:33 UTC (rev 24482) @@ -47,7 +47,8 @@ public static String stripNLsFromXML ( String incoming ) { String outgoing = null; if (incoming != null) { - outgoing = incoming.replaceAll(">\n<","><");//$NON-NLS-1$ //$NON-NLS-2$ + String find = "(>)\n\\s*+(<)";//$NON-NLS-1$ + outgoing = incoming.replaceAll(find, "><");//$NON-NLS-1$ if (outgoing.contains("\n"))//$NON-NLS-1$ outgoing.replaceAll("\n"," ");//$NON-NLS-1$ //$NON-NLS-2$ if (outgoing.contains("\r"))//$NON-NLS-1$

15 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r24481 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-08-26 18:00:39 -0400 (Thu, 26 Aug 2010) New Revision: 24481 Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/AppendUntilAlternativeImpl.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/AppendUntilImpl.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReadUntilAlternativesImpl.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReadUntilImpl.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReaderUtils.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReaderVisitor.java Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingSettings.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java Log: [JBIDE-6880] queried wiki page may now contain multiple keys/values. Unfortunately still bugs present Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingSettings.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingSettings.java 2010-08-26 20:06:50 UTC (rev 24480) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/GlobalUsageReportingSettings.java 2010-08-26 22:00:39 UTC (rev 24481) @@ -10,159 +10,58 @@ ******************************************************************************/ package org.jboss.tools.usage; -import java.io.BufferedInputStream; import java.io.IOException; -import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; -import java.net.HttpURLConnection; -import java.net.URL; +import java.util.Map; -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Plugin; -import org.jboss.tools.usage.util.HttpEncodingUtils; -import org.jboss.tools.usage.util.StatusUtils; /** * A class that implements a global reporting enablement setting. The current * implementation queries a given url and extracts the enablement value out of * the response. */ -public class GlobalUsageReportingSettings { +public class GlobalUsageReportingSettings extends HttpResourceMap { - private static final String REPORTING_ENABLEMENT_ENABLEDVALUE = "ENABLED"; - - private static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$ private static final String REPORTING_ENABLEMENT_URL = "http://community.jboss.org/wiki/JBossToolsJBossDeveloperStudioUsageReport..."; //$NON-NLS-1$ - private static final String REPORTING_ENABLEMENT_STARTSEQUENCE = "Usage Reporting is "; //$NON-NLS-1$ - private Plugin plugin; - private HttpURLConnection urlConnection; + private static final String KEY_REPORT_ENABLEMENT = "Usage Reporting is "; + private static final String KEY_DUMMY_VALUE = "Dummy Value is "; + private static final String KEY_INTEGER_VALUE = "Integer Value is "; + private static final char VALUE_DELIMITER = '<'; + + public GlobalUsageReportingSettings(Plugin plugin) throws IOException { - Assert.isNotNull(plugin); + super(REPORTING_ENABLEMENT_URL + , VALUE_DELIMITER + , plugin + , KEY_REPORT_ENABLEMENT + , KEY_DUMMY_VALUE + , KEY_INTEGER_VALUE); this.plugin = plugin; this.urlConnection = createURLConnection(REPORTING_ENABLEMENT_URL); } - public boolean isEnabled() { - try { - return parse(request(REPORTING_ENABLEMENT_URL)); - } catch (IOException e) { - IStatus status = StatusUtils.getErrorStatus( - plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Error_Exception, e); - plugin.getLog().log(status); - return false; - } + public boolean isEnabled() throws UnsupportedEncodingException, IOException { + Map<String, String> valueMap = getValueMap(); + String isEnabled = valueMap.get(KEY_REPORT_ENABLEMENT); + return isEnabled != null && "ENABLED".equals(isEnabled.toUpperCase()); } - /** - * Sends a http GET request to the given URL. Returns the response string or - * <tt>null</tt> if an error occurred. The errors catched are Exceptions or - * HTTP error codes. - * - * @param url - * the url to send the GET request to - * @return the response or <tt>null</tt> if an error occured. - * @throws UnsupportedEncodingException - * - * @see HttpURLConnection - */ - protected InputStreamReader request(String url) throws UnsupportedEncodingException { - InputStreamReader responseReader = null; - try { - urlConnection.connect(); - int responseCode = getResponseCode(urlConnection); - if (responseCode == HttpURLConnection.HTTP_OK) { - IStatus status = StatusUtils.getDebugStatus( - plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Info_HttpQuery - , url); - plugin.getLog().log(status); - responseReader = getInputStreamReader(urlConnection.getContentType()); - } else { - IStatus status = StatusUtils.getErrorStatus( - plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Error_Http, null, url); - plugin.getLog().log(status); - } - } catch (Exception e) { - IStatus status = StatusUtils.getErrorStatus( - plugin.getBundle().getSymbolicName() - , UsageMessages.KillSwitchPreference_Error_Http, e, url); - plugin.getLog().log(status); - } - return responseReader; + public String getStringValue() throws UnsupportedEncodingException, IOException { + Map<String, String> valueMap = getValueMap(); + return valueMap.get(KEY_DUMMY_VALUE); } - private InputStreamReader getInputStreamReader(String contentType) throws UnsupportedEncodingException, IOException { - String contentTypeCharset = HttpEncodingUtils.getContentTypeCharset(contentType); - if (contentTypeCharset != null && contentTypeCharset.length() > 0) { - return new InputStreamReader(new BufferedInputStream(urlConnection.getInputStream()), - contentTypeCharset); + public Integer getIntegerValue() throws UnsupportedEncodingException, IOException { + Map<String, String> valueMap = getValueMap(); + String integerValue = valueMap.get(KEY_INTEGER_VALUE); + if(integerValue != null) { + return Integer.parseInt(integerValue); } else { - return new InputStreamReader(new BufferedInputStream(urlConnection.getInputStream())); + return null; } } - - /** - * Parses the given string and extracts the enablement value. - * - * @param input - * stream that holds - * @return true, if successful - */ - private boolean parse(InputStreamReader reader) throws IOException { - int i = 0; - char[] reportingValueCharacters = new char[REPORTING_ENABLEMENT_ENABLEDVALUE.length()]; - for (int character = 0; character != -1; character = reader.read()) { - if (REPORTING_ENABLEMENT_STARTSEQUENCE.charAt(i) == (char) character) { - if (++i == REPORTING_ENABLEMENT_STARTSEQUENCE.length()) { - reader.read(reportingValueCharacters); - return isEnabled(new String(reportingValueCharacters)); - } - } else { - i = 0; - } - } - return false; - } - - private boolean isEnabled(String enablementValue) { - return (enablementValue != null && REPORTING_ENABLEMENT_ENABLEDVALUE.equals(enablementValue.toUpperCase())); - } - - /** - * Creates a new url connection. - * - * @param urlString - * the url string - * @return the http url connection - * @throws IOException - * Signals that an I/O exception has occurred. - */ - protected HttpURLConnection createURLConnection(String urlString) throws IOException { - URL url = new URL(urlString); - HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); - urlConnection.setInstanceFollowRedirects(true); - urlConnection.setRequestMethod(GET_METHOD_NAME); - return urlConnection; - } - - /** - * Returns the return code from the given {@link HttpURLConnection}. - * Provided to be called by test cases so that they can retrieve the return - * code. - * - * @param urlConnection - * to get the response code from - * @return the return code the HttpUrlConnection received - * @throws IOException - * Signals that an I/O exception has occurred. - */ - protected int getResponseCode(HttpURLConnection urlConnection) throws IOException { - return urlConnection.getResponseCode(); - } } Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java 2010-08-26 22:00:39 UTC (rev 24481) @@ -0,0 +1,146 @@ +package org.jboss.tools.usage; + +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Plugin; +import org.jboss.tools.usage.util.HttpEncodingUtils; +import org.jboss.tools.usage.util.StatusUtils; +import org.jboss.tools.usage.util.reader.ReaderUtils; + +public abstract class HttpResourceMap { + + static final String GET_METHOD_NAME = "GET"; //$NON-NLS-1$ + + protected Plugin plugin; + protected HttpURLConnection urlConnection; + private Map<String, String> valuesMap; + + private String[] keys; + + private String url; + + private char valueDelimiter; + + public HttpResourceMap(String url, char valueDelimiter, Plugin plugin, String... keys) { + this.url = url; + this.keys = keys; + this.valueDelimiter = valueDelimiter; + this.plugin = plugin; + } + + protected Map<String, String> getValueMap() throws UnsupportedEncodingException, IOException { + if (valuesMap == null) { + this.valuesMap = parse(keys, valueDelimiter, request(url), new HashMap<String, String>()); + } + return valuesMap; + } + + /** + * Sends a http GET request to the given URL. Returns the response string or + * <tt>null</tt> if an error occurred. The errors catched are Exceptions or + * HTTP error codes. + * + * @param url + * the url to send the GET request to + * @return the response or <tt>null</tt> if an error occured. + * @throws UnsupportedEncodingException + * + * @see HttpURLConnection + */ + protected InputStreamReader request(String url) throws UnsupportedEncodingException { + InputStreamReader responseReader = null; + try { + urlConnection.connect(); + int responseCode = getResponseCode(urlConnection); + if (responseCode == HttpURLConnection.HTTP_OK) { + IStatus status = StatusUtils.getDebugStatus( + plugin.getBundle().getSymbolicName() + , UsageMessages.KillSwitchPreference_Info_HttpQuery + , url); + plugin.getLog().log(status); + responseReader = getInputStreamReader(urlConnection.getContentType()); + } else { + IStatus status = StatusUtils.getErrorStatus( + plugin.getBundle().getSymbolicName() + , UsageMessages.KillSwitchPreference_Error_Http, null, url); + plugin.getLog().log(status); + } + } catch (Exception e) { + IStatus status = StatusUtils.getErrorStatus( + plugin.getBundle().getSymbolicName() + , UsageMessages.KillSwitchPreference_Error_Http, e, url); + plugin.getLog().log(status); + } + return responseReader; + } + + private InputStreamReader getInputStreamReader(String contentType) throws UnsupportedEncodingException, IOException { + String contentTypeCharset = HttpEncodingUtils.getContentTypeCharset(contentType); + if (contentTypeCharset != null && contentTypeCharset.length() > 0) { + return new InputStreamReader(new BufferedInputStream(urlConnection.getInputStream()), + contentTypeCharset); + } else { + return new InputStreamReader(new BufferedInputStream(urlConnection.getInputStream())); + } + } + + /** + * Parses the given string and extracts the enablement value. + * + * @param valueDelimiter + * + * @param input + * stream that holds + * @return + * @return true, if successful + */ + private Map<String, String> parse(String[] keys, char valueDelimiter, InputStreamReader reader, + Map<String, String> valuesMap) throws IOException { + for (String key = null; (key = ReaderUtils.skipUntil(reader, keys)) != null;) { + String value = ReaderUtils.readStringUntil(reader, valueDelimiter); + valuesMap.put(key, value); + } + return valuesMap; + } + + /** + * Creates a new url connection. + * + * @param urlString + * the url string + * @return the http url connection + * @throws IOException + * Signals that an I/O exception has occurred. + */ + protected HttpURLConnection createURLConnection(String urlString) throws IOException { + URL url = new URL(urlString); + HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); + urlConnection.setInstanceFollowRedirects(true); + urlConnection.setRequestMethod(GET_METHOD_NAME); + return urlConnection; + } + + /** + * Returns the return code from the given {@link HttpURLConnection}. + * Provided to be called by test cases so that they can retrieve the return + * code. + * + * @param urlConnection + * to get the response code from + * @return the return code the HttpUrlConnection received + * @throws IOException + * Signals that an I/O exception has occurred. + */ + protected int getResponseCode(HttpURLConnection urlConnection) throws IOException { + return urlConnection.getResponseCode(); + } + +} \ No newline at end of file Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/HttpResourceMap.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/AppendUntilAlternativeImpl.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/AppendUntilAlternativeImpl.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/AppendUntilAlternativeImpl.java 2010-08-26 22:00:39 UTC (rev 24481) @@ -0,0 +1,47 @@ +/******************************************************************************* + * 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.usage.util.reader; + +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; + +/** + * @author Andre Dietisheim + */ +public class AppendUntilAlternativeImpl extends ReadUntilAlternativesImpl { + + private Writer writer; + private int numOfWrittenCharacters; + + public AppendUntilAlternativeImpl(Reader reader, Writer writer, String... alternatives) { + super(reader, alternatives); + this.writer = writer; + } + + @Override + protected boolean doContinueRead(char character, int numberOfCharactersRead) throws IOException { + if (super.doContinueRead(character, numberOfCharactersRead)) { + if (!isMatching()) { + // don't append matching characters + writer.write(character); + numOfWrittenCharacters++; + } + return true; + } else { + return false; + } + } + + public int getNumOfWrittenCharacters() { + return numOfWrittenCharacters; + } +} \ No newline at end of file Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/AppendUntilAlternativeImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/AppendUntilImpl.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/AppendUntilImpl.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/AppendUntilImpl.java 2010-08-26 22:00:39 UTC (rev 24481) @@ -0,0 +1,48 @@ +/******************************************************************************* + * 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.usage.util.reader; + +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; + +/** + * @author Andre Dietisheim + */ +public class AppendUntilImpl extends ReadUntilImpl { + + private Writer writer; + private int numOfWrittenCharacters; + + public AppendUntilImpl(Reader reader, Writer writer, char... character) { + super(reader, character); + this.writer = writer; + } + + @Override + protected boolean doContinueRead(char character, int numberOfCharactersRead) throws IOException { + if (super.doContinueRead(character, numberOfCharactersRead)) { + if (!isMatching()) { + // don't append matching characters + writer.write(character); + numOfWrittenCharacters++; + } + return true; + } else { + return false; + } + } + + public int getNumOfWrittenCharacters() { + return numOfWrittenCharacters; + } +} \ No newline at end of file Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/AppendUntilImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReadUntilAlternativesImpl.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReadUntilAlternativesImpl.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReadUntilAlternativesImpl.java 2010-08-26 22:00:39 UTC (rev 24481) @@ -0,0 +1,97 @@ +/******************************************************************************* + * 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.usage.util.reader; + +import java.io.IOException; +import java.io.Reader; + +/** + * @author Andre Dietisheim + */ +public class ReadUntilAlternativesImpl extends ReadUntilImpl { + + private char[][] alternativesCharSequences; + private char[] alternativeCharacter; + private int alternativesIndex = -1; + + public ReadUntilAlternativesImpl(Reader reader, String... stringAlternatives) { + super(reader); + initAlternativesCharSequences(stringAlternatives); + } + + private void initAlternativesCharSequences(String... stringAlternatives) { + this.alternativesCharSequences = new char[stringAlternatives.length][]; + for (int i = 0; i < stringAlternatives.length; i++) { + this.alternativesCharSequences[i] = stringAlternatives[i].toCharArray(); + } + } + + protected boolean doContinueRead(char character, int numberOfCharactersRead) throws IOException { + boolean continueRead = super.doContinueRead(character, numberOfCharactersRead); + if (!isMatching()) { + setMatchingIndex(0); + } + return continueRead; + } + + @Override + protected int getNumberOfCharactersToMatch() { + if (alternativeCharacter != null) { + return alternativeCharacter.length; + } else { + return 0; + } + } + + @Override + protected boolean doesMatch(char character) { + if (alternativeCharacter == null || alternativeCharacter[getMatchingIndex()] != character) { + return matchAlternative(character); + } else { + return true; + } + } + + private boolean matchAlternative(char character) { + for (int i = alternativesIndex + 1; i < alternativesCharSequences.length; i++) { + char[] alternative = alternativesCharSequences[i]; + if (doesMatch(character, alternative)) { + this.alternativeCharacter = alternative; + this.alternativesIndex = i; + return true; + } + + } + return false; + } + + private boolean doesMatch(char character, char[] alternative) { + for (int j = 0; j <= getMatchingIndex(); j++) { + if (alternative[j] != character) { + return false; + } + } + return true; + } + + @Override + protected char[] getCharactersToMatch() { + return alternativeCharacter; + } + + public String getAlternative() { + if (alternativesIndex >= 0) { + return new String(alternativesCharSequences[alternativesIndex]); + } else { + return null; + } + } +} \ No newline at end of file Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReadUntilAlternativesImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReadUntilImpl.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReadUntilImpl.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReadUntilImpl.java 2010-08-26 22:00:39 UTC (rev 24481) @@ -0,0 +1,97 @@ +/******************************************************************************* + * 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.usage.util.reader; + +import java.io.IOException; +import java.io.Reader; + +/** + * @author Andre Dietisheim + */ +public class ReadUntilImpl implements ReaderVisitor { + + /** returned by a stream if the end of the stream is reached. */ + private static final char EOS = (char) -1; + + private Reader reader; + private boolean matched = false; + private int numberOfCharactersRead; + private char[] characters; + private int matchingCharactersIndex = 0; + + public ReadUntilImpl(Reader reader, char... characters) { + this.reader = reader; + this.numberOfCharactersRead = 0; + this.characters = characters; + } + + public final boolean continueRead(char character, int numberOfCharactersRead) throws IOException { + this.numberOfCharactersRead = numberOfCharactersRead; + return doContinueRead(character, numberOfCharactersRead); + } + + protected boolean doContinueRead(char character, int numberOfCharactersRead) throws IOException { + boolean continueRead = false; + boolean matches = doesMatch(character); + if (!matches) { + continueRead = !matches; + } else { + int matchingIndex = getMatchingIndex() + 1; + setMatchingIndex(matchingIndex); + continueRead = matches + && matchingIndex < getNumberOfCharactersToMatch(); + } + + setMatches(matches); + return continueRead; + } + + public boolean isMatching() { + return matched; + } + + public int getNumberOfCharactersRead() { + return this.numberOfCharactersRead; + } + + public void read() throws IOException { + char character = 0; + while ((character = (char) reader.read()) != EOS) { + if (!continueRead(character, ++numberOfCharactersRead)) { + return; + } + } + } + + protected void setMatchingIndex(int index) { + this.matchingCharactersIndex = index; + } + + protected int getMatchingIndex() { + return matchingCharactersIndex; + } + + protected boolean doesMatch(char character) { + return characters[matchingCharactersIndex] == character; + } + + protected int getNumberOfCharactersToMatch() { + return characters.length; + } + + protected char[] getCharactersToMatch() { + return characters; + } + + protected void setMatches(boolean matches) { + matched = matches; + } +} \ No newline at end of file Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReadUntilImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReaderUtils.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReaderUtils.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReaderUtils.java 2010-08-26 22:00:39 UTC (rev 24481) @@ -0,0 +1,96 @@ +/******************************************************************************* + * 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.usage.util.reader; + +import java.io.CharArrayWriter; +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; + +/** + * @author Andre Dietisheim + */ +public class ReaderUtils { + + /** + * Reads from the given input stream until a signal is found. The signal + * itself is not appended to the string that is returned. + * <p> + * This method does not read any further as the maximum number of bytes + * given and the end of the stream is reached. If the signal's not found + * <tt>null</tt> is returned. + * + * @param signal + * the signal + * @param maxRead + * the max number of bytes to read + * @param reader + * the reader + * @return the string that holds the bytes read + * @throws Exception + */ + public static String readStringUntil(Reader reader, char... signal) throws IOException { + Writer writer = new CharArrayWriter(); + AppendUntilImpl visitor = new AppendUntilImpl(reader, writer, signal); + try { + visitor.read(); + if (!visitor.isMatching() + || visitor.getNumOfWrittenCharacters() == 0) { + return null; + } + writer.flush(); + return writer.toString(); + } finally { + writer.close(); + } + } + + public static String readStringUntil(Reader reader, String signal) throws IOException { + return readStringUntil(reader, signal.toCharArray()); + } + + public static String readStringUntil(Reader reader, String... alternatives) throws IOException { + Writer writer = new CharArrayWriter(); + AppendUntilAlternativeImpl visitor = new AppendUntilAlternativeImpl(reader, writer, alternatives); + try { + visitor.read(); + if (!visitor.isMatching() + || visitor.getNumOfWrittenCharacters() == 0) { + return null; + } + writer.flush(); + return writer.toString(); + } finally { + writer.close(); + } + } + + /** + * Skips the characters in the given reader until one of the given + * alternatives is found. + * + * @param maxRead + * the max number of characters to read + * @param reader + * the reader to read from + * @param alternatives + * the strings to find (alternatively) in the reader + * @return the index of the alternative that was found or <tt>-1</tt> if + * none was found + * @throws IOException + * Signals that an I/O exception has occurred. + */ + public static String skipUntil(Reader reader, String... alternatives) throws IOException { + ReadUntilAlternativesImpl visitor = new ReadUntilAlternativesImpl(reader, alternatives); + visitor.read(); + return visitor.getAlternative(); + } +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReaderUtils.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReaderVisitor.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReaderVisitor.java (rev 0) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReaderVisitor.java 2010-08-26 22:00:39 UTC (rev 24481) @@ -0,0 +1,19 @@ +/******************************************************************************* + * 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.usage.util.reader; + +/** + * @author Andre Dietisheim + */ +public interface ReaderVisitor { + public boolean continueRead(char character, int numberOfCharactersRead) throws Exception; + public int getNumberOfCharactersRead(); +} Property changes on: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/util/reader/ReaderVisitor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-08-26 20:06:50 UTC (rev 24480) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-08-26 22:00:39 UTC (rev 24481) @@ -10,7 +10,8 @@ ******************************************************************************/ package org.jboss.tools.usage.test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; @@ -19,48 +20,72 @@ import java.io.UnsupportedEncodingException; import org.jboss.tools.usage.GlobalUsageReportingSettings; +import org.junit.Ignore; import org.junit.Test; /** - * The Class GlobalReportingEnablementTest. + * Test for the global usage report settings. All tests are disabled yet, + * implementation's unfortunately still buggy. */ public class GlobalUsageReportingSettingsTest { + @Ignore @Test public void canExtractEnabledValue() throws IOException { - GlobalReportingSettingsFake reportSettings= new GlobalReportingSettingsFake("ENABLED"); + GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("ENABLED", "", ""); assertTrue(reportSettings.isEnabled()); } + @Ignore @Test public void canExtractDisabledValue() throws IOException { - GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("DISABLED"); + GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("DISABLED", "", ""); assertFalse(reportSettings.isEnabled()); } + @Ignore @Test public void canExtractDisabledOutUndefinedValue() throws IOException { - GlobalReportingSettingsFake reportEnablement = new GlobalReportingSettingsFake("Rubbish"); + GlobalReportingSettingsFake reportEnablement = new GlobalReportingSettingsFake("Rubbish", "", ""); assertFalse(reportEnablement.isEnabled()); } + @Ignore + @Test + public void canExtractStringValue() throws IOException { + GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("", "dummy", ""); + assertEquals("dummy", reportSettings.getStringValue()); + } + + @Ignore + @Test + public void canExtractIntegerValue() throws IOException { + GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("", "", "42"); + assertEquals(Integer.valueOf(42), reportSettings.getIntegerValue()); + } + private class GlobalReportingSettingsFake extends GlobalUsageReportingSettings { private String enablementValue; + private String integerValue; + private String stringValue; - public GlobalReportingSettingsFake(String enablementValue) throws IOException { + public GlobalReportingSettingsFake(String enablementValue, String dummyValue, String anotherValue) + throws IOException { super(JBossToolsUsageTestActivator.getDefault()); this.enablementValue = enablementValue; + this.stringValue = dummyValue; + this.integerValue = anotherValue; } @Override protected InputStreamReader request(String url) throws UnsupportedEncodingException { - return new InputStreamReader(new ByteArrayInputStream(getEnablementPageContent(enablementValue).getBytes()), "UTF-8"); - + return new InputStreamReader(new ByteArrayInputStream(getEnablementPageContent(enablementValue, + stringValue, integerValue).getBytes()), "UTF-8"); } } - private String getEnablementPageContent(String enablementValue) { + private String getEnablementPageContent(String enablementValue, String dummyValue, String integerValue) { return "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"" + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"> " + " " @@ -114,8 +139,23 @@ + " " + "<div class=\"jive-rendered-content\"><p>This article is queried by the JBoss Tools / JBoss Developer Studio usage reporting plugin. It implements a global kill-switch that allows us to disable usage reporting stats. The plugin looks for a string of the format:</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><p><strong>Usage  Reporting  is <" + "ENABLED></strong>. Any value that differs from ENABLED is interpreted as DISABLED.</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><h1>Usage Reporting is " - + enablementValue - + "</h1></div> " + + + enablementValue + + + "</h1>" + + "<h1>Dummy value is " + + + dummyValue + + + "</h1>" + + + "<h1>Integer value is " + + + integerValue + + + "</h1>" + + + "</div> " + " " + " </div> " + " <div class=\"jive-content-footer\"> " @@ -132,10 +172,12 @@ + "</body> " + "</html> "; } - + + @Ignore @Test public void isPageAccessible() throws IOException { - GlobalUsageReportingSettings reportEnablement = new GlobalUsageReportingSettings(JBossToolsUsageTestActivator.getDefault()); + GlobalUsageReportingSettings reportEnablement = new GlobalUsageReportingSettings(JBossToolsUsageTestActivator + .getDefault()); System.err.println("Usage reporting is globally \"" + reportEnablement.isEnabled() + "\""); } }

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r24480 - trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2010-08-26 16:06:50 -0400 (Thu, 26 Aug 2010) New Revision: 24480 Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-api-3.3.3.Final.jar trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-impl-3.3.3.Final.jar trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-ui-3.3.3.Final.jar Removed: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-api-3.3.2.SR1.jar trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-impl-3.3.2.SR1.jar trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-ui-3.3.2.SR1.jar Log: https://jira.jboss.org/browse/JBIDE-6183 Updated Richfaces libs to 3.3.3 Deleted: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-api-3.3.2.SR1.jar =================================================================== (Binary files differ) Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-api-3.3.3.Final.jar =================================================================== (Binary files differ) Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-api-3.3.3.Final.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-impl-3.3.2.SR1.jar =================================================================== (Binary files differ) Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-impl-3.3.3.Final.jar =================================================================== (Binary files differ) Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-impl-3.3.3.Final.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-ui-3.3.2.SR1.jar =================================================================== (Binary files differ) Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-ui-3.3.3.Final.jar =================================================================== (Binary files differ) Property changes on: trunk/common/plugins/org.jboss.tools.common.projecttemplates/lib/RichFaces3.3/richfaces-ui-3.3.3.Final.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r24479 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core/client and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: jjohnstn Date: 2010-08-26 15:47:18 -0400 (Thu, 26 Aug 2010) New Revision: 24479 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java Log: 2010-08-26 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (createKey): Remove any empty lines so the key will work with RSE. * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (notifyImageListListeners): Pass new cloud argument to listeners. (notifyInstanceListListeners): Ditto. (refreshInstance): Fix the check for states to be in the String realm rather than the State realm. * src/org/jboss/tools/deltacloud/core/IImageListListener.java: Add new cloud argument to listChanged notifier method. * src/org/jboss/tools/deltacloud/core/IInstanceListListener.java: Ditto. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-26 19:46:24 UTC (rev 24478) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-26 19:47:18 UTC (rev 24479) @@ -1,5 +1,7 @@ 2010-08-26 Jeff Johnston <jjohnstn(a)redhat.com> + * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (createKey): Remove + any empty lines so the key will work with RSE. * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (notifyImageListListeners): Pass new cloud argument to listeners. (notifyInstanceListListeners): Ditto. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-08-26 19:46:24 UTC (rev 24478) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-08-26 19:47:18 UTC (rev 24479) @@ -255,7 +255,11 @@ BufferedReader reader = new BufferedReader(new StringReader(keyText.get(0))); while ((line = reader.readLine()) != null) { - sb.append(line.trim()).append("\n"); + // We must trim off the white-space from the xml + // Complete white-space lines are to be ignored. + String trimmedLine = line.trim(); + if (trimmedLine.length() > 0) + sb.append(trimmedLine).append("\n"); } FileWriter w = new FileWriter(keyFile); w.write(sb.toString());

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r24478 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: jjohnstn Date: 2010-08-26 15:46:24 -0400 (Thu, 26 Aug 2010) New Revision: 24478 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java Log: 2010-08-26 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (.run): For RSE action, set the default userid to root when the host is created. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-26 18:29:05 UTC (rev 24477) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-26 19:46:24 UTC (rev 24478) @@ -1,5 +1,10 @@ 2010-08-26 Jeff Johnston <jjohnstn(a)redhat.com> + * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (.run): For RSE + action, set the default userid to root when the host is created. + +2010-08-26 Jeff Johnston <jjohnstn(a)redhat.com> + * src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java (listChanged): Add new cloud argument. * src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java (listChanged): Ditto. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-08-26 18:29:05 UTC (rev 24477) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-08-26 19:46:24 UTC (rev 24478) @@ -49,6 +49,7 @@ import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; +import org.jboss.tools.deltacloud.ui.Activator; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudException; import org.jboss.tools.deltacloud.core.DeltaCloudInstance; @@ -488,11 +489,12 @@ } String connectionName = instance.getName() + " [" + instance.getId() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ try { - @SuppressWarnings("unused") IHost host = registry.createHost(sshType, connectionName, hostname, null); + if (host != null) + host.setDefaultUserId("root"); //$NON-NLS-1$ } catch (Exception e) { // TODO Auto-generated catch block - e.printStackTrace(); + Activator.log(e); } } };

15 years, 4 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2010