July 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r32530 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-07-01 16:27:35 -0400 (Fri, 01 Jul 2011) New Revision: 32530 Added: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java Log: JBIDE-5046 https://issues.jboss.org/browse/JBIDE-5046 Added: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java 2011-07-01 20:27:35 UTC (rev 32530) @@ -0,0 +1,92 @@ +/******************************************************************************* + * Copyright (c) 2009-2011 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.common.java.impl; + +import org.eclipse.core.resources.IResource; +import org.eclipse.jdt.core.IAnnotation; +import org.eclipse.jdt.core.IMember; +import org.eclipse.jdt.core.IMemberValuePair; +import org.eclipse.jdt.core.IType; +import org.jboss.tools.common.java.IAnnotationDeclaration; +import org.jboss.tools.common.java.IAnnotationType; +import org.jboss.tools.common.java.IJavaAnnotation; +import org.jboss.tools.common.java.impl.JavaAnnotation; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class AnnotationDeclaration implements IAnnotationDeclaration { + protected IJavaAnnotation annotation; + + public AnnotationDeclaration() {} + + public void setDeclaration(IJavaAnnotation annotation) { + this.annotation = annotation; + } + + public IJavaAnnotation getDeclaration() { + return annotation; + } + + public IResource getResource() { + return annotation.getResource(); + } + + public IMemberValuePair[] getMemberValuePairs() { + return annotation.getMemberValuePairs(); + } + + public Object getMemberValue(String name) { + if(name == null) name = "value"; + IMemberValuePair[] pairs = getMemberValuePairs(); + if(pairs != null) { + for (IMemberValuePair pair: pairs) { + if(name.equals(pair.getMemberName())) { + return pair.getValue(); + } + } + } + return null; + } + + public IMember getParentMember() { + return annotation.getParentMember(); + } + + public String getTypeName() { + return annotation.getTypeName(); + } + + public IType getType() { + return annotation.getType(); + } + + public int getLength() { + return annotation.getLength(); + } + + public int getStartPosition() { + return annotation.getStartPosition(); + } + + public IAnnotationType getAnnotation() { + return null; + } + + public IAnnotation getJavaAnnotation() { + if(annotation instanceof JavaAnnotation) { + return ((JavaAnnotation) annotation).getAnnotation(); + } + return null; + } +} \ No newline at end of file Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java ___________________________________________________________________ Added: svn:mime-type + text/plain

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r32528 - workspace/adietish.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-07-01 08:35:47 -0400 (Fri, 01 Jul 2011) New Revision: 32528 Removed: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.detyped/ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/ Log: removed old sandbox projects

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r32527 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.core: META-INF and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2011-07-01 08:35:10 -0400 (Fri, 01 Jul 2011) New Revision: 32527 Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/images/ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/images/ca/ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/images/ca/icons_CDI_Message.gif trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/build.properties trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/plugin.xml trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/CDISeamCorePlugin.java Log: JBIDE-9087 Support of Bundles bean in CDI projects with Seam International module. Messages EL Resolver for Seam 3 International Module is added Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/META-INF/MANIFEST.MF 2011-07-01 12:29:38 UTC (rev 32526) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/META-INF/MANIFEST.MF 2011-07-01 12:35:10 UTC (rev 32527) @@ -8,6 +8,12 @@ Bundle-Vendor: JBoss by Red Hat Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", - org.jboss.tools.common + org.jboss.tools.common, + org.jboss.tools.common.el.core;bundle-version="3.3.0", + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.jface.text;bundle-version="3.7.0", + org.jboss.tools.common.model;bundle-version="3.3.0", + org.jboss.tools.jst.web.kb;bundle-version="3.3.0", + org.jboss.tools.cdi.core;bundle-version="1.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/build.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/build.properties 2011-07-01 12:29:38 UTC (rev 32526) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/build.properties 2011-07-01 12:35:10 UTC (rev 32527) @@ -1,4 +1,12 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + images/,\ + plugin.xml +src.includes = .settings/,\ + META-INF/,\ + build.properties,\ + plugin.xml,\ + images/,\ + src/ Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/images/ca/icons_CDI_Message.gif =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/images/ca/icons_CDI_Message.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/plugin.xml 2011-07-01 12:29:38 UTC (rev 32526) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/plugin.xml 2011-07-01 12:35:10 UTC (rev 32527) @@ -2,4 +2,12 @@ <?eclipse version="3.2"?> <plugin> + <extension + point="org.jboss.tools.common.el.core.elResolver"> + <el-resolver id="cdiInternationalMessagesELResolver"> + <project-nature id="org.jboss.tools.cdi.core.cdinature" + resolver-class="org.jboss.tools.cdi.seam.core.international.el.CDIInternationalMessagesELResolver"/> + </el-resolver> + </extension> + </plugin> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/CDISeamCorePlugin.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/CDISeamCorePlugin.java 2011-07-01 12:29:38 UTC (rev 32526) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/CDISeamCorePlugin.java 2011-07-01 12:35:10 UTC (rev 32527) @@ -23,6 +23,11 @@ // The plug-in ID public static final String PLUGIN_ID = "org.jboss.tools.cdi.seam.core"; //$NON-NLS-1$ + public static final String CA_CDI_MESSAGE_IMAGE_PATH = "images/ca/icons_CDI_Message.gif"; + + // Seam 3 International Module Runtime Extension ID + public static final String CDI_INTERNATIONAL_RUNTIME_EXTENTION = "org.jboss.seam.international.status.TypedStatusMessageBundleExtension"; + // The shared instance private static CDISeamCorePlugin plugin; Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java 2011-07-01 12:35:10 UTC (rev 32527) @@ -0,0 +1,813 @@ +/******************************************************************************* + * Copyright (c) 2011 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.seam.core.international.el; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.seam.core.CDISeamCorePlugin; +import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine; +import org.jboss.tools.common.el.core.model.ELArgumentInvocation; +import org.jboss.tools.common.el.core.model.ELExpression; +import org.jboss.tools.common.el.core.model.ELInstance; +import org.jboss.tools.common.el.core.model.ELInvocationExpression; +import org.jboss.tools.common.el.core.model.ELModel; +import org.jboss.tools.common.el.core.model.ELObjectType; +import org.jboss.tools.common.el.core.model.ELPropertyInvocation; +import org.jboss.tools.common.el.core.parser.ELParser; +import org.jboss.tools.common.el.core.parser.ELParserFactory; +import org.jboss.tools.common.el.core.parser.ELParserUtil; +import org.jboss.tools.common.el.core.resolver.ELContext; +import org.jboss.tools.common.el.core.resolver.ELResolution; +import org.jboss.tools.common.el.core.resolver.ELResolutionImpl; +import org.jboss.tools.common.el.core.resolver.ELSegmentImpl; +import org.jboss.tools.common.el.core.resolver.IRelevanceCheck; +import org.jboss.tools.common.el.core.resolver.IVariable; +import org.jboss.tools.common.el.core.resolver.MessagePropertyELSegmentImpl; +import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo; +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.filesystems.FileSystemsHelper; +import org.jboss.tools.common.model.project.IModelNature; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.common.text.TextProposal; +import org.jboss.tools.common.util.FileUtil; +import org.jboss.tools.jst.web.kb.IPageContext; +import org.jboss.tools.jst.web.kb.IResourceBundle; +import org.jboss.tools.jst.web.kb.internal.ResourceBundle; + +/** + * + * @author Victor V. Rubezhny + * + */ +public class CDIInternationalMessagesELResolver extends AbstractELCompletionEngine<IVariable> { + private static final Image CDI_INTERNATIONAL_MESSAGE_PROPOSAL_IMAGE = + CDISeamCorePlugin.getDefault().getImage(CDISeamCorePlugin.CA_CDI_MESSAGE_IMAGE_PATH); + + static final CDIOpenKeyHelper keyHelper = new CDIOpenKeyHelper(); + + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImage() + */ + public Image getELProposalImage() { + return CDI_INTERNATIONAL_MESSAGE_PROPOSAL_IMAGE; + } + + private static ELParserFactory factory = ELParserUtil.getDefaultFactory(); + + public CDIInternationalMessagesELResolver() {} + + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolver#getParserFactory() + */ + public ELParserFactory getParserFactory() { + return factory; + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#log(java.lang.Exception) + */ + protected void log(Exception e) { + CDISeamCorePlugin.getDefault().logError(e); + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolver2#getProposals(org.jboss.tools.common.el.core.resolver.ELContext, java.lang.String) + */ + public List<TextProposal> getProposals(ELContext context, String el, int offset) { + return getCompletions(el, false, 0, context); + } + + public List<TextProposal> getCompletions(String elString, + boolean returnEqualedVariablesOnly, int position, ELContext context) { + + IProject project = context == null ? null : + context.getResource() == null ? null : + context.getResource().getProject(); + if (project == null) + return null; + + if (!CDICorePlugin.getCDI(project, true).getExtensionManager().isCDIExtensionAvailable(CDISeamCorePlugin.CDI_INTERNATIONAL_RUNTIME_EXTENTION)) + return null; + + XModelObject modelObject = EclipseResourceUtil.createObjectForResource(project); + if (modelObject == null) + return null; + XModel model = modelObject.getModel(); + + IResourceBundle[] bundles = keyHelper.findResourceBundles(model); + + IDocument document = null; + + if (bundles == null) + bundles = new IResourceBundle[0]; + + List<TextProposal> proposals = null; + try { + proposals = getCompletions(context.getResource(), document, elString.subSequence(0, elString.length()), position, returnEqualedVariablesOnly, bundles); + } catch (StringIndexOutOfBoundsException e) { + log(e); + } catch (BadLocationException e) { + log(e); + } + return proposals; + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.resolver.ELResolver2#resolve(org.jboss.tools.common.el.core.resolver.ELContext, org.jboss.tools.common.el.core.model.ELExpression) + */ + public ELResolution resolve(ELContext context, ELExpression operand, int offset) { + ELResolutionImpl resolution = resolveELOperand(operand, context, true); + if(resolution != null) + resolution.setContext(context); + return resolution; + } + + public ELResolutionImpl resolveELOperand(ELExpression operand, + ELContext context, boolean returnEqualedVariablesOnly) { + IResourceBundle[] bundles = new IResourceBundle[0]; + if(context instanceof IPageContext) { + IPageContext pageContext = (IPageContext)context; + bundles = pageContext.getResourceBundles(); + } + try { + return resolveELOperand(context.getResource(), operand, returnEqualedVariablesOnly, bundles); + } catch (StringIndexOutOfBoundsException e) { + log(e); + } catch (BadLocationException e) { + log(e); + } + return null; + } + + public List<TextProposal> getCompletions(IFile file, IDocument document, CharSequence prefix, + int position, boolean returnEqualedVariablesOnly, IResourceBundle[] bundles) throws BadLocationException, StringIndexOutOfBoundsException { + List<TextProposal> completions = new ArrayList<TextProposal>(); + + ELResolutionImpl status = resolveELOperand(file, parseOperand("" + prefix), returnEqualedVariablesOnly, bundles); //$NON-NLS-1$ + if(status!=null) { + completions.addAll(status.getProposals()); + } + + return completions; + } + + public ELExpression parseOperand(String operand) { + if(operand == null) return null; + String el = (operand.indexOf("#{") < 0 && operand.indexOf("${") < 0) ? "#{" + operand + "}" : operand; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + ELParser p = getParserFactory().createParser(); + ELModel model = p.parse(el); + List<ELInstance> is = model.getInstances(); + if(is.isEmpty()) return null; + return is.get(0).getExpression(); + } + + public ELResolutionImpl resolveELOperand(IFile file, + ELExpression operand, boolean returnEqualedVariablesOnly, IResourceBundle[] bundles) + throws BadLocationException, StringIndexOutOfBoundsException { + if(!(operand instanceof ELInvocationExpression) || file == null) { + return null; + } + + ELInvocationExpression expr = (ELInvocationExpression)operand; + boolean isIncomplete = expr.getType() == ELObjectType.EL_PROPERTY_INVOCATION + && ((ELPropertyInvocation)expr).getName() == null; + boolean isArgument = expr.getType() == ELObjectType.EL_ARGUMENT_INVOCATION; + + ELResolutionImpl resolution = new ELResolutionImpl(expr); + ELInvocationExpression left = expr; + + List<Variable> resolvedVariables = new ArrayList<Variable>(); + + if (expr.getLeft() != null && isArgument) { + left = expr.getLeft(); + resolvedVariables = resolveVariables(file, left, bundles, false, + true); // is Final and equal names are because of + // we have no more to resolve the parts of expression, + // but we have to resolve arguments of probably a message component + if (resolvedVariables != null && !resolvedVariables.isEmpty()) { + resolution.setLastResolvedToken(left); + + ELSegmentImpl segment = new MessagePropertyELSegmentImpl(left.getFirstToken()); + processMessageBundleSegment(expr, (MessagePropertyELSegmentImpl)segment, resolvedVariables); + + segment.setResolved(true); + for (Variable variable : resolvedVariables) { + segment.getVariables().add(variable); + } + resolution.addSegment(segment); + } + } else if (expr.getLeft() == null && isIncomplete) { + resolvedVariables = resolveVariables(file, expr, bundles, true, + returnEqualedVariablesOnly); + } else { + while(left != null) { + List<Variable>resolvedVars = new ArrayList<Variable>(); + resolvedVars = resolveVariables(file, + left, bundles, left == expr, + returnEqualedVariablesOnly); + if (resolvedVars != null && !resolvedVars.isEmpty()) { + resolvedVariables = resolvedVars; + resolution.setLastResolvedToken(left); + + ELSegmentImpl segment = new MessagePropertyELSegmentImpl(left.getFirstToken()); + processMessageBundleSegment(expr, (MessagePropertyELSegmentImpl)segment, resolvedVariables); + + segment.setResolved(true); + for (Variable variable : resolvedVars) { + segment.getVariables().add(variable); + } + resolution.addSegment(segment); + + break; + } + left = (ELInvocationExpression)left.getLeft(); + } + } + + if (resolution.getLastResolvedToken() == null && + !returnEqualedVariablesOnly && + expr != null && + isIncomplete) { + // no vars are resolved + // the tokens are the part of var name ended with a separator (.) + resolvedVariables = resolveVariables(file, expr, bundles, true, returnEqualedVariablesOnly); + Set<TextProposal> proposals = new TreeSet<TextProposal>(TextProposal.KB_PROPOSAL_ORDER); + + if (left != null) { + ELSegmentImpl segment = new MessagePropertyELSegmentImpl(left.getFirstToken()); + processMessageBundleSegment(expr, (MessagePropertyELSegmentImpl)segment, resolvedVariables); + + segment.setResolved(false); + resolution.addSegment(segment); + + for (Variable var : resolvedVariables) { + String varName = var.getName(); + if(varName.startsWith(operand.getText())) { + TextProposal proposal = new TextProposal(); + proposal.setReplacementString(varName.substring(operand.getLength())); + setImage(proposal); + proposals.add(proposal); + } + } + resolution.setProposals(proposals); + segment.setResolved(!proposals.isEmpty()); + } + return resolution; + } + + // Here we have a list of vars for some part of expression + // OK. we'll proceed with members of these vars + if (resolution.getLastResolvedToken() == operand) { + // First segment is the last one + Set<TextProposal> proposals = new TreeSet<TextProposal>(TextProposal.KB_PROPOSAL_ORDER); + ELSegmentImpl segment = new ELSegmentImpl(operand.getFirstToken()); + segment.setResolved(true); + resolution.addSegment(segment); + + for (Variable var : resolvedVariables) { + String varName = var.getName(); + if(operand.getLength()<=varName.length()) { + TextProposal proposal = new TextProposal(); + proposal.setReplacementString(varName.substring(operand.getLength())); + proposal.setLabel(varName); + setImage(proposal); + proposals.add(proposal); + } else if(returnEqualedVariablesOnly) { + TextProposal proposal = new TextProposal(); + proposal.setReplacementString(varName); + proposal.setLabel(varName); + setImage(proposal); + proposals.add(proposal); + } + segment.getVariables().add(var); + } + resolution.setLastResolvedToken(expr); + resolution.setProposals(proposals); + return resolution; + } + + //process segments one by one + if(left != null) { + while(left != expr) { + left = (ELInvocationExpression)left.getParent(); + if (left != expr) { // inside expression + ELSegmentImpl segment = new ELSegmentImpl(left.getLastToken()); + segment.setResolved(true); + resolution.addSegment(segment); + resolution.setLastResolvedToken(left); + return resolution; + } else { // Last segment + resolveLastSegment((ELInvocationExpression)operand, resolvedVariables, resolution, returnEqualedVariablesOnly); + break; + } + } + } else { + ELSegmentImpl segment = new ELSegmentImpl(expr.getFirstToken()); + resolution.addSegment(segment); + } + + return resolution; + } + + public List<Variable> resolveVariables(IFile file, ELInvocationExpression expr, IResourceBundle[] bundles, boolean isFinal, boolean onlyEqualNames) { + List<Variable> result = new ArrayList<Variable>(); + String varName = expr.toString(); + for (IResourceBundle b: bundles) { + String name = b.getVar(); + if(!isFinal || onlyEqualNames) { + if(!name.equals(varName)) continue; + } + if(!name.startsWith(varName)) continue; + Variable v = new Variable(name, b.getBasename(), file); + result.add(v); + } + + return result; + } + + protected void setImage(TextProposal kbProposal) { + kbProposal.setImage(getELProposalImage()); + } + + protected void resolveLastSegment(ELInvocationExpression expr, + List<Variable> members, + ELResolutionImpl resolution, + boolean returnEqualedVariablesOnly) { + Set<TextProposal> kbProposals = new TreeSet<TextProposal>(TextProposal.KB_PROPOSAL_ORDER); + + ELSegmentImpl segment = new ELSegmentImpl(expr.getFirstToken()); + resolution.setProposals(kbProposals); + if(expr instanceof ELPropertyInvocation) { + segment = new MessagePropertyELSegmentImpl(((ELPropertyInvocation)expr).getName()); + processMessagePropertySegment(expr, (MessagePropertyELSegmentImpl)segment, members); + } else if (expr instanceof ELArgumentInvocation) { + segment = new MessagePropertyELSegmentImpl(((ELArgumentInvocation)expr).getArgument().getOpenArgumentToken().getNextToken()); + processMessagePropertySegment(expr, (MessagePropertyELSegmentImpl)segment, members); + } + + if(segment.getToken()!=null) { + resolution.addSegment(segment); + } + + if (expr.getType() == ELObjectType.EL_PROPERTY_INVOCATION && ((ELPropertyInvocation)expr).getName() == null) { + // return all the methods + properties + for (Variable mbr : members) { + processSingularMember(mbr, kbProposals); + } + } else + if(expr.getType() != ELObjectType.EL_ARGUMENT_INVOCATION) { + Set<String> proposalsToFilter = new TreeSet<String>(); + for (Variable mbr : members) { + filterSingularMember(mbr, proposalsToFilter); + } + for (String proposal : proposalsToFilter) { + // We do expect nothing but name for method tokens (No round brackets) + String filter = expr.getMemberName(); + if(filter == null) filter = ""; //$NON-NLS-1$ + if(returnEqualedVariablesOnly) { + // This is used for validation. + if (proposal.equals(filter)) { + TextProposal kbProposal = new TextProposal(); + kbProposal.setReplacementString(proposal); + kbProposal.setLabel(proposal); + setImage(kbProposal); + + kbProposals.add(kbProposal); + + break; + } + } else if (proposal.startsWith(filter)) { + // This is used for CA. + TextProposal kbProposal = new TextProposal(); + kbProposal.setReplacementString(proposal.substring(filter.length())); + kbProposal.setLabel(proposal); + kbProposal.setImage(getELProposalImage()); + + kbProposals.add(kbProposal); + } + } + } else if(expr.getType() == ELObjectType.EL_ARGUMENT_INVOCATION) { + Set<String> proposalsToFilter = new TreeSet<String>(); + boolean isMessages = false; + for (Variable mbr : members) { + isMessages = true; + filterSingularMember(mbr, proposalsToFilter); + } + + String filter = expr.getMemberName(); + boolean bSurroundWithQuotes = false; + if(filter == null) { + filter = ""; //$NON-NLS-1$ + bSurroundWithQuotes = true; + } else { + boolean b = filter.startsWith("'") || filter.startsWith("\""); //$NON-NLS-1$ //$NON-NLS-2$ + boolean e = filter.endsWith("'") || filter.endsWith("\""); //$NON-NLS-1$ //$NON-NLS-2$ + if((b) && (e)) { + filter = filter.length() == 1 ? "" : filter.substring(1, filter.length() - 1); //$NON-NLS-1$ + } else if(b && !returnEqualedVariablesOnly) { + filter = filter.substring(1); + } else { + //Value is set as expression itself, we cannot compute it + if(isMessages) { + resolution.setMapOrCollectionOrBundleAmoungTheTokens(true); + } + return; + } + } + + for (String proposal : proposalsToFilter) { + if(returnEqualedVariablesOnly) { + // This is used for validation. + if (proposal.equals(filter)) { + TextProposal kbProposal = new TextProposal(); + kbProposal.setReplacementString(proposal); + kbProposal.setLabel(proposal); + setImage(kbProposal); + + kbProposals.add(kbProposal); + + break; + } + } else if (proposal.startsWith(filter)) { + // This is used for CA. + TextProposal kbProposal = new TextProposal(); + + String replacementString = proposal.substring(filter.length()); + if (bSurroundWithQuotes) { + replacementString = "'" + replacementString + "']"; //$NON-NLS-1$ //$NON-NLS-2$ + } + + kbProposal.setReplacementString(replacementString); + kbProposal.setLabel(proposal); + kbProposal.setImage(getELProposalImage()); + + kbProposals.add(kbProposal); + } + } + } + segment.setResolved(!kbProposals.isEmpty()); + if (resolution.isResolved()){ + resolution.setLastResolvedToken(expr); + } + } + + private void processMessageBundleSegment(ELInvocationExpression expr, MessagePropertyELSegmentImpl segment, List<Variable> variables) { + if(segment.getToken() == null) + return; + for(Variable variable : variables){ + if(expr.getFirstToken().getText().equals(variable.name)){ + IModelNature n = EclipseResourceUtil.getModelNature(variable.f.getProject()); + + XModel model = n == null ? null : n.getModel(); + if(model == null) + return; + + XModelObject[] properties = keyHelper.findBundles(model, variable.basename, null); + if(properties == null) + return; + + segment.setBaseName(variable.basename); + segment.setBundleOnlySegment(true); + } + } + } + + private void processMessagePropertySegment(ELInvocationExpression expr, MessagePropertyELSegmentImpl segment, List<Variable> variables){ + if(segment.getToken() == null) + return; + for(Variable variable : variables){ + if(expr.getFirstToken().getText().equals(variable.name)){ + + IModelNature n = EclipseResourceUtil.getModelNature(variable.f.getProject()); + if(n == null) + return; + XModel model = n.getModel(); + if(model == null) + return; + + XModelObject[] properties = keyHelper.findBundles(model, variable.basename, null); + if(properties == null) + return; + + for (XModelObject p : properties) { + IFile propFile = (IFile)p.getAdapter(IFile.class); + if(propFile == null) + continue; + segment.setMessageBundleResource(propFile); + XModelObject property = p.getChildByPath(trimQuotes(segment.getToken().getText())); + if(property != null){ + try { + String content = FileUtil.readStream(propFile); + if(findPropertyLocation(property, content, segment)){ + segment.setBaseName(variable.basename); + } + } catch (CoreException e) { + log(e); + } + } + } + } + } + } + + private String trimQuotes(String value) { + if(value == null) + return null; + + if(value.startsWith("'") || value.startsWith("\"")) { //$NON-NLS-1$ //$NON-NLS-2$ + value = value.substring(1); + } + + if(value.endsWith("'") || value.endsWith("\"")) { //$NON-NLS-1$ //$NON-NLS-2$ + value = value.substring(0, value.length() - 1); + } + return value; + } + + public boolean findPropertyLocation(XModelObject property, String content, MessagePropertyELSegmentImpl segment) { + String name = property.getAttributeValue("name"); //$NON-NLS-1$ + String nvs = property.getAttributeValue("name-value-separator"); //$NON-NLS-1$ + int i = content.indexOf(name + nvs); + if(i < 0) return false; + segment.setMessagePropertySourceReference(i, name.length()); + return true; + } + + protected void processSingularMember(Variable mbr, Set<TextProposal> kbProposals) { + // Surround the "long" keys containing the dots with [' '] + TreeSet<String> keys = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER); + keys.addAll(mbr.getKeys()); + Iterator<String> sortedKeys = keys.iterator(); + while(sortedKeys.hasNext()) { + String key = sortedKeys.next(); + if (key == null || key.length() == 0) + continue; + if (key.indexOf('.') != -1) { + TextProposal proposal = new TextProposal(); + proposal.setReplacementString("['" + key + "']"); //$NON-NLS-1$ //$NON-NLS-2$ + proposal.setLabel("['" + key + "']"); + setImage(proposal); + + kbProposals.add(proposal); + } else { + TextProposal proposal = new TextProposal(); + proposal.setReplacementString(key); + proposal.setLabel(key); + setImage(proposal); + + kbProposals.add(proposal); + } + } + } + + protected void filterSingularMember(Variable mbr, Set<String> proposalsToFilter) { + Collection<String> keys = mbr.getKeys(); + for (String key : keys) { + proposalsToFilter.add(key); + } + } + + static class Variable implements IVariable { + IFile f; + String name; + String basename; + + public Variable(String name, String basename, IFile f) { + this.name = name; + this.basename = basename; + this.f = f; + } + + public String getName() { + return name; + } + + public String getBasename() { + return basename; + } + + public Collection<String> getKeys() { + TreeSet<String> result = new TreeSet<String>(); + IModelNature n = EclipseResourceUtil.getModelNature(f.getProject()); + if(n == null) return result; + XModel model = n.getModel(); + + List<Object> l = keyHelper.getBundleProperties(model, basename); + if (l == null) return result; + + for (Object o : l) { + result.add(o.toString()); + } + return result; + } + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getMemberInfoByVariable(org.jboss.tools.common.el.core.resolver.IVariable, boolean) + */ + @Override + protected MemberInfo getMemberInfoByVariable(IVariable var, + boolean onlyEqualNames, int offset) { + return null; + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#resolveVariables(org.eclipse.core.resources.IFile, org.jboss.tools.common.el.core.model.ELInvocationExpression, boolean, boolean) + */ + @Override + public List<IVariable> resolveVariables(IFile file, + ELInvocationExpression expr, boolean isFinal, boolean onlyEqualNames, int offset) { + return null; + } + + @Override + protected boolean isStaticMethodsCollectingEnabled() { + return false; + } + + public IRelevanceCheck createRelevanceCheck(IJavaElement element) { + return new IRelevanceCheck() { + public boolean isRelevant(String content) { + return false; + } + }; + } + + static class CDIOpenKeyHelper { + static List<Object> EMPTY_LIST = Collections.unmodifiableList(new ArrayList<Object>()); + + IResourceBundle[] findResourceBundles (XModel model) { + XModelObject[] fs = FileSystemsHelper.getFileSystems(model).getChildren(); + if (fs == null) + return null; + + Collection<XModelObject> bundles = new HashSet<XModelObject>(); + for (XModelObject f : fs) { + String name = f.getAttributeValue("name"); + if (name == null) + continue; + if (name.equals("src") || name.endsWith("lib") || + name.startsWith("src-") || name.startsWith("lib-")) { + bundles.addAll(collectXModelBundleObjects(f)); + } + } + + if (bundles.isEmpty()) + return null; + + Map<String, IResourceBundle> result = new HashMap<String, IResourceBundle>(); + for (XModelObject b : bundles) { + String path = b.getPath(); + IPath p = new Path(path); + IPath containerPath = p.removeLastSegments(p.segmentCount() - 2); + IPath varPath = p.removeFirstSegments(2); + + String var = varPath.toString(); + + var = var.substring(0, var.lastIndexOf('.')); + if (var.indexOf('_') != -1) + var = var.substring(0, var.indexOf('_')); + + String basename = containerPath.append(new Path(var)).toString(); + var = "bundles." + var.replace('/', '.'); + + if (!result.containsKey(var)) { + IResourceBundle resourceBundle = new ResourceBundle(basename, var); + result.put(var, resourceBundle); + } + } + + return result.values().toArray(new IResourceBundle[0]); + } + + public XModelObject[] findBundles(XModel model, String bundle, String locale) { + ArrayList<XModelObject> l = new ArrayList<XModelObject>(); + if(locale == null || locale.length() == 0) locale = getDeafultLocale(model); + while(locale != null && locale.length() > 0) { + String path = bundle.replace('.', '/') + "_" + locale + ".properties"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + XModelObject o = model.getByPath(path); + if(o != null) l.add(o); + int i = locale.lastIndexOf('_'); + if(i < 0) break; + locale = locale.substring(0, i); + } + String path = bundle.replace('.', '/') + ".properties"; //$NON-NLS-1$ //$NON-NLS-2$ + XModelObject o = model.getByPath(path); + if(o != null) l.add(o); + return l.toArray(new XModelObject[0]); + } + + public List<Object> getBundleProperties(XModel model, String bundle) { + if(bundle == null || bundle.length() == 0) return EMPTY_LIST; + + XModelObject[] bundleObjects = findBundles(model, bundle, null); + if (bundleObjects == null) + return EMPTY_LIST; + Set<String> properties = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER); + for (XModelObject b : bundleObjects) { + if(b == null) continue; + XModelObject[] os = b.getChildren(); + for (int i = 0; i < os.length; i++) { + properties.add(os[i].getAttributeValue("name")); + } + } + List<Object> list = new ArrayList<Object>(); + list.addAll(properties); + + return list; + } + + public String getDeafultLocale(XModel model) { + String facesConfigLocale = getDeafultLocaleFromFacesConfig(model); + if (facesConfigLocale.length() == 0) { + Locale locale = Locale.getDefault(); + facesConfigLocale = locale == null || locale.toString().length() == 0 ? null : locale.toString(); + } + return facesConfigLocale; + } + + /** + * Gets the default locale from faces config file. + * + * TODO: Need Get the Default Locale (From Web Project Root?) + * + * @param model XModel + * @return locale string or empty string if no locale was found + */ + public String getDeafultLocaleFromFacesConfig(XModel model) { + String facesConfigLocale = ""; //$NON-NLS-1$ + /* + JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model); + WebProjectNode conf = root == null ? null : (WebProjectNode)root.getChildByPath(JSFProjectTreeConstants.CONFIGURATION); + XModelObject[] fs = conf == null ? new XModelObject[0] : conf.getTreeChildren(); + for (int i = 0; i < fs.length; i++) { + XModelObject o = fs[i].getChildByPath("application/Locale Config"); //$NON-NLS-1$ + String res = (o == null) ? "" : o.getAttributeValue("default-locale"); //$NON-NLS-1$ //$NON-NLS-2$ + if(res != null && res.length() > 0) { + facesConfigLocale = res; + } + } + */ + return facesConfigLocale; + } + + private Collection<XModelObject> collectXModelBundleObjects(XModelObject o) { + Set<XModelObject> objects = new HashSet<XModelObject>(); + if (o == null) return objects; + + String path = o.getPath(); + if (path == null || "META-INF".equalsIgnoreCase(o.getAttributeValue("name"))) + return objects; + + if (path.endsWith(".properties")) { + objects.add(o); + } + + if (o.hasChildren()) { + XModelObject[] children = o.getChildren(); + if (children != null) { + for (XModelObject c : children) { + objects.addAll(collectXModelBundleObjects(c)); + } + } + } + return objects; + } + } +} \ No newline at end of file Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java ___________________________________________________________________ Added: svn:mime-type + text/plain

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r32526 - in trunk/as: plugins/org.jboss.ide.eclipse.as.ui/META-INF and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-07-01 08:29:38 -0400 (Fri, 01 Jul 2011) New Revision: 32526 Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/perspective/ trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/perspective/test/ASPerspectiveTest.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AsUiAllTests.java Log: Removal of AS Perspective Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2011-07-01 09:27:19 UTC (rev 32525) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2011-07-01 12:29:38 UTC (rev 32526) @@ -57,7 +57,6 @@ org.jboss.ide.eclipse.as.ui.dialogs, org.jboss.ide.eclipse.as.ui.editor, org.jboss.ide.eclipse.as.ui.launch, - org.jboss.ide.eclipse.as.ui.perspective, org.jboss.ide.eclipse.as.ui.views, org.jboss.ide.eclipse.as.ui.views.server.extensions, org.jboss.ide.eclipse.as.ui.wizards, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-07-01 09:27:19 UTC (rev 32525) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-07-01 12:29:38 UTC (rev 32526) @@ -115,17 +115,6 @@ markerType="org.eclipse.wst.common.project.facet.core.validation.marker"/> </extension> - <extension point="org.eclipse.wst.server.ui.initialSelectionProvider"> <selectionProvider Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/perspective/test/ASPerspectiveTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/perspective/test/ASPerspectiveTest.java 2011-07-01 09:27:19 UTC (rev 32525) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/perspective/test/ASPerspectiveTest.java 2011-07-01 12:29:38 UTC (rev 32526) @@ -1,32 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.perspective.test; - -import junit.framework.TestCase; - -import org.eclipse.ui.IPerspectiveDescriptor; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.jboss.ide.eclipse.as.ui.perspective.ASPerspective; -import org.jboss.ide.eclipse.as.ui.views.ServerLogView; - -@Deprecated -public class ASPerspectiveTest extends TestCase { - - @Override - protected void setUp() throws Exception { - PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage().setPerspective( - PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId(ASPerspective.ID)); - } - - public void testASPerspective() { - IPerspectiveDescriptor perspective = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage().getPerspective(); - assertEquals(perspective.getLabel(),"JBoss AS"); - } - - public void testServerLogView() throws PartInitException { - PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getActivePage().showView(ServerLogView.VIEW_ID); - } - -} Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AsUiAllTests.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AsUiAllTests.java 2011-07-01 09:27:19 UTC (rev 32525) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AsUiAllTests.java 2011-07-01 12:29:38 UTC (rev 32526) @@ -10,7 +10,6 @@ public static Test suite() { TestSuite suite = new TestSuite(AsUiAllTests.class.getName()); suite.addTestSuite(NewServerWizardTest.class); -// suite.addTestSuite(ASPerspectiveTest.class); return suite; }

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r32525 - trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-07-01 05:27:19 -0400 (Fri, 01 Jul 2011) New Revision: 32525 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java Log: [JBIDE-9173] changed handling when connection was closed by the server (because it shuts down) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-07-01 09:20:17 UTC (rev 32524) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/AS7Manager.java 2011-07-01 09:27:19 UTC (rev 32525) @@ -204,21 +204,10 @@ } } - public void quietlyExecuteAsync(ModelNode node) throws JBoss7ManangerException { - try { - client.executeAsync(node, null); - } catch (Exception e) { - if (!isConnectionCloseException(e)) { - throw new JBoss7ManangerException(e); - } - } - } - private boolean isConnectionCloseException(Exception e) { return e instanceof IOException - && e.getCause() instanceof ExecutionException - && e.getCause().getCause() instanceof EOFException - && e.getCause().getCause().getMessage().indexOf("Connection closed") > -1; + && e.getMessage() != null + && e.getMessage().indexOf("Channel closed") > -1; } private IJBoss7DeploymentResult execute(DeploymentPlanBuilder builder) throws JBoss7ManangerException {

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r32524 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-07-01 05:20:17 -0400 (Fri, 01 Jul 2011) New Revision: 32524 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java Log: https://issues.jboss.org/browse/JBIDE-9284 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java 2011-07-01 09:18:13 UTC (rev 32523) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java 2011-07-01 09:20:17 UTC (rev 32524) @@ -123,14 +123,14 @@ try { String startCommand = RSELaunchConfigUtils.getStartupCommand(configuration); - startText.setText(startCommand); + startText.setText(startCommand == null ? "" : startCommand); boolean detectStartCommand = RSELaunchConfigUtils.isDetectStartupCommand(configuration, true); autoStartArgs.setSelection(detectStartCommand); startText.setEditable(!detectStartCommand); startText.setEnabled(!detectStartCommand); String stopCommand = RSELaunchConfigUtils.getShutdownCommand(configuration); - stopText.setText(stopCommand); + stopText.setText(stopCommand == null ? "" : stopCommand); boolean detectStopCommand = RSELaunchConfigUtils.isDetectShutdownCommand(configuration, true); autoStopArgs.setSelection(detectStopCommand); stopText.setEditable(!detectStopCommand);

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r32523 - in trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7: META-INF and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-07-01 05:18:13 -0400 (Fri, 01 Jul 2011) New Revision: 32523 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-controller-client-7.0.0.CR1.jar trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-protocol-7.0.0.CR1.jar Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/.classpath trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/build.properties Log: [JBIDE-9173] updated jars to latest as7 build Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/.classpath =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/.classpath 2011-07-01 09:05:31 UTC (rev 32522) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/.classpath 2011-07-01 09:18:13 UTC (rev 32523) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.0.0.Beta4-SNAPSHOT.jar"/> - <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.0.0.Beta4-SNAPSHOT.jar"/> + <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.0.0.CR1.jar"/> + <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.0.0.CR1.jar"/> <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta6.jar"/> <classpathentry exported="true" kind="lib" path="jboss-logging-3.0.0.Beta5.jar"/> <classpathentry exported="true" kind="lib" path="jboss-marshalling-1.3.0.CR8.jar"/> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-07-01 09:05:31 UTC (rev 32522) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/META-INF/MANIFEST.MF 2011-07-01 09:18:13 UTC (rev 32523) @@ -9,8 +9,8 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., - jboss-as-controller-client-7.0.0.Beta4-SNAPSHOT.jar, - jboss-as-protocol-7.0.0.Beta4-SNAPSHOT.jar, + jboss-as-controller-client-7.0.0.CR1.jar, + jboss-as-protocol-7.0.0.CR1.jar, jboss-dmr-1.0.0.Beta6.jar, jboss-logging-3.0.0.Beta5.jar, jboss-marshalling-1.3.0.CR8.jar, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/build.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/build.properties 2011-07-01 09:05:31 UTC (rev 32522) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/build.properties 2011-07-01 09:18:13 UTC (rev 32523) @@ -7,13 +7,13 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ - jboss-remoting-3.2.0.Beta2.jar,\ - jboss-sasl-1.0.0.Beta1.jar,\ - jboss-as-controller-client-7.0.0.Beta4-SNAPSHOT.jar,\ - jboss-as-protocol-7.0.0.Beta4-SNAPSHOT.jar,\ + jboss-as-controller-client-7.0.0.CR1.jar,\ + jboss-as-protocol-7.0.0.CR1.jar,\ jboss-dmr-1.0.0.Beta6.jar,\ jboss-logging-3.0.0.Beta5.jar,\ jboss-marshalling-1.3.0.CR8.jar,\ + jboss-remoting-3.2.0.Beta2.jar,\ + jboss-sasl-1.0.0.Beta1.jar,\ jboss-threads-2.0.0.CR8.jar,\ xnio-api-3.0.0.Beta3.jar,\ xnio-nio-3.0.0.Beta3.jar Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-controller-client-7.0.0.CR1.jar =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-controller-client-7.0.0.CR1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-protocol-7.0.0.CR1.jar =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/jboss-as-protocol-7.0.0.CR1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r32522 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-07-01 05:05:31 -0400 (Fri, 01 Jul 2011) New Revision: 32522 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java Log: reverting commit 32435, it broke StopLaunchConfiguration Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2011-07-01 01:23:57 UTC (rev 32521) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2011-07-01 09:05:31 UTC (rev 32522) @@ -16,13 +16,11 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; -import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationType; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchManager; @@ -44,7 +42,7 @@ import org.jboss.ide.eclipse.as.core.util.ServerUtil; -public class StopLaunchConfiguration { +public class StopLaunchConfiguration extends AbstractJBossLaunchConfigType { public static final String STOP_LAUNCH_TYPE = "org.jboss.ide.eclipse.as.core.server.stopLaunchConfiguration"; //$NON-NLS-1$ public static final String STOP_MAIN_TYPE = IJBossRuntimeConstants.SHUTDOWN_MAIN_TYPE;

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r32521 - workspace/dgolovin/new-releng.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-06-30 21:23:57 -0400 (Thu, 30 Jun 2011) New Revision: 32521 Modified: workspace/dgolovin/new-releng/pom.xml Log: fixed pom error Modified: workspace/dgolovin/new-releng/pom.xml =================================================================== --- workspace/dgolovin/new-releng/pom.xml 2011-07-01 01:17:41 UTC (rev 32520) +++ workspace/dgolovin/new-releng/pom.xml 2011-07-01 01:23:57 UTC (rev 32521) @@ -7,7 +7,8 @@ <name>JBoss Tools Release Engineering Module</name> <version>0.0.1</version> <packaging>pom</packaging> - - <module>target-platform</module> + <modules> + <module>target-platform</module> + </modules> </project>

13 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r32520 - in workspace/dgolovin/new-releng: parent and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-06-30 21:17:41 -0400 (Thu, 30 Jun 2011) New Revision: 32520 Added: workspace/dgolovin/new-releng/.project workspace/dgolovin/new-releng/parent/pom.xml workspace/dgolovin/new-releng/pom.xml Modified: workspace/dgolovin/new-releng/target-platform/ Log: Added: workspace/dgolovin/new-releng/.project =================================================================== --- workspace/dgolovin/new-releng/.project (rev 0) +++ workspace/dgolovin/new-releng/.project 2011-07-01 01:17:41 UTC (rev 32520) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>releng</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> Property changes on: workspace/dgolovin/new-releng/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: workspace/dgolovin/new-releng/parent/pom.xml =================================================================== --- workspace/dgolovin/new-releng/parent/pom.xml (rev 0) +++ workspace/dgolovin/new-releng/parent/pom.xml 2011-07-01 01:17:41 UTC (rev 32520) @@ -0,0 +1,375 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>com.jboss.tools.releng</groupId> + <artifactId>parent</artifactId> + <version>0.0.1-SNAPSHOT</version> + <name>JBoss Tools Parent</name> + <packaging>pom</packaging> + + <properties> + <tychoVersion>0.10.0</tychoVersion> + <eclipse.update.url>http://mirrors.xmission.com/eclipse/releases/indigo/201105200900</eclipse.update.url> + </properties> + + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + </plugin> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-packaging-plugin</artifactId> + <version>${tychoVersion}</version> + <configuration> + <format>'v'yyyyMMddHHmm</format> + <archiveSite>true</archiveSite> + <environments> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86_64</arch> + </environment> + </environments> + </configuration> + </plugin> + + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tychoVersion}</version> + <extensions>true</extensions> + </plugin> + + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tychoVersion}</version> + <configuration> + <resolver>p2</resolver> + <ignoreTychoRepositories>true</ignoreTychoRepositories> + <environments> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86</arch> + </environment> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86_64</arch> + </environment> + </environments> + </configuration> + </plugin> + +  + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <version>${tychoVersion}</version> + <configuration> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> +  +  + <product>org.eclipse.platform.ide</product> + <application>org.eclipse.ui.ide.workbench</application> + <dependencies> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.platform.ide</artifactId> + <version>0.0.0</version> + </dependency> + </dependencies> + <includes> + <include>**/*TestSuite*.class</include> + </includes> + <parallel>true</parallel> + </configuration> + </plugin> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-compiler-plugin</artifactId> + <version>${tychoVersion}</version> + <configuration> + <encoding>UTF-8</encoding> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> +  + </plugins> + </build> + + <profiles> + <profile> + <id>coverage</id> + <activation> + <property> + <name>coverage</name> + </property> + </activation> + <properties> + <emma.session.out.file>${project.build.directory}/emma/coverage.es</emma.session.out.file> + <emma.filter /> + <emma.instrument.bundles /> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <file></file> + <groupId></groupId> + <artifactId></artifactId> + <version></version> + <packaging></packaging> + </configuration> + </plugin> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <version>${tychoVersion}</version> + <configuration> + <systemProperties combine.children="append"> + <emma.session.out.file>${emma.session.out.file} + </emma.session.out.file> + <emma.filter>${emma.filter}</emma.filter> + <eclemma.instrument.bundles>${emma.instrument.bundles} + </eclemma.instrument.bundles> + </systemProperties> + <frameworkExtensions> + <frameworkExtension> + <groupId>org.eclemma.runtime.equinox</groupId> + <artifactId>org.eclemma.runtime.equinox</artifactId> + <version>1.1.0.200908261008</version> + </frameworkExtension> + </frameworkExtensions> + <application>org.eclipse.ui.ide.workbench</application> + <dependencies> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.sdk.ide</artifactId> + <version>0.0.0</version> + </dependency> + </dependencies> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>${maven.antrun.plugin.version}</version> + <dependencies> + <dependency> + <groupId>emma</groupId> + <artifactId>emma_ant</artifactId> + <version>2.0.5312</version> + </dependency> + <dependency> + <groupId>emma</groupId> + <artifactId>emma</artifactId> + <version>2.0.5312</version> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b3</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <executions> + <execution> + <id>emma-report</id> + <phase>post-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <taskdef resource="emma_ant.properties" /> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> + <if> + <available file="${project.build.directory}/emma" + type="dir" /> + <then> + <echo>Process emma report...</echo> +  + <emma enabled="true"> + <report> + <infileset dir="${project.build.directory}/emma" + includes="*.es,*.em" /> + <txt outfile="${project.build.directory}/emma/coverage.txt" /> + <xml outfile="${project.build.directory}/emma/coverage.xml" /> + <html outfile="${project.build.directory}/emma/coverage.html" /> + </report> + </emma> + <loadfile property="emma.txt" + srcFile="${project.build.directory}/emma/coverage.txt" + failonerror="false" /> + <echo>${emma.txt}</echo> + </then> + </if> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + + <repositories> + <repository> + <id>eclipse</id> +  + <url>http://mirrors.xmission.com/eclipse/releases/indigo</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>eclipse.gef</id> + <url>http://download.eclipse.org/tools/gef/updates/releases/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> +  + <repository> + <id>eclipse.swtbot</id> + <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>eclipse.xulrunner</id> + <url>http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.2</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>eclipse.wtp</id> + <url>http://download.eclipse.org/webtools/downloads/drops/R3.3.0/R-3.3.0-20110...</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>eclipse.birt</id> + <url>http://download.eclipse.org/birt/update-site/3.7</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>eclipse.m2e</id> + <url>https://repository.sonatype.org/content/sites/forge-sites/m2e/1.0.0/N/LAT...</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>eclipse.m2e-wtp</id> + <url>https://repository.sonatype.org/content/sites/forge-sites/m2eclipse-wtp/0...</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> +</project> Property changes on: workspace/dgolovin/new-releng/parent/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: workspace/dgolovin/new-releng/pom.xml =================================================================== --- workspace/dgolovin/new-releng/pom.xml (rev 0) +++ workspace/dgolovin/new-releng/pom.xml 2011-07-01 01:17:41 UTC (rev 32520) @@ -0,0 +1,13 @@ +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>com.jboss.tools</groupId> + <artifactId>releng</artifactId> + <name>JBoss Tools Release Engineering Module</name> + <version>0.0.1</version> + <packaging>pom</packaging> + + <module>target-platform</module> +</project> + Property changes on: workspace/dgolovin/new-releng/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Property changes on: workspace/dgolovin/new-releng/target-platform ___________________________________________________________________ Added: svn:ignore + target .repository

13 years, 6 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 July 2011