JBoss Tools SVN: r6282 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-12 14:42:39 -0500 (Tue, 12 Feb 2008)
New Revision: 6282
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss50ServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer50.java
Log:
JBIDE-1774
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss50ServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss50ServerRuntime.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss50ServerRuntime.java 2008-02-12 19:42:39 UTC (rev 6282)
@@ -0,0 +1,9 @@
+package org.jboss.ide.eclipse.as.core.server.internal;
+
+public class JBoss50ServerRuntime extends AbstractJBossServerRuntime {
+ public JBoss50ServerRuntime() {
+ }
+ public String getId() {
+ return "5.0";
+ }
+}
\ No newline at end of file
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer50.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer50.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer50.java 2008-02-12 19:42:39 UTC (rev 6282)
@@ -0,0 +1,39 @@
+/**
+ * JBoss, a Division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+* This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.as.core.server.internal;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
+import org.jboss.ide.eclipse.as.core.extensions.polling.TimeoutPoller;
+import org.jboss.ide.eclipse.as.core.server.IServerPollingAttributes;
+
+/**
+ * @author rob.stryker <rob.stryker(a)redhat.com>
+ *
+ */
+public class JBossServer50 extends JBossServer {
+ public void setDefaults(IProgressMonitor monitor) {
+ ServerWorkingCopy wc = (ServerWorkingCopy)getServerWorkingCopy();
+ wc.setAttribute(IServerPollingAttributes.STARTUP_POLLER_KEY, TimeoutPoller.POLLER_ID);
+ wc.setAttribute(IServerPollingAttributes.START_TIMEOUT, 60000);
+ }
+}
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r6281 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-12 14:31:47 -0500 (Tue, 12 Feb 2008)
New Revision: 6281
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
Log:
generics fixed
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-02-12 18:08:02 UTC (rev 6280)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-02-12 19:31:47 UTC (rev 6281)
@@ -129,7 +129,7 @@
private IModule[] doGetParentModules(IModule module) {
IModule[] ears = ServerUtil.getModules("jst.ear"); //$NON-NLS-1$
- ArrayList list = new ArrayList();
+ ArrayList<IModule> list = new ArrayList<IModule>();
for (int i = 0; i < ears.length; i++) {
IEnterpriseApplication ear = (IEnterpriseApplication)ears[i].loadAdapter(IEnterpriseApplication.class,null);
IModule[] childs = ear.getModules();
@@ -138,7 +138,7 @@
list.add(ears[i]);
}
}
- return (IModule[])list.toArray(new IModule[list.size()]);
+ return list.toArray(new IModule[list.size()]);
}
public ServerPort[] getServerPorts() {
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r6280 - in trunk/seam/plugins: org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-02-12 13:08:02 -0500 (Tue, 12 Feb 2008)
New Revision: 6280
Added:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ElVarSearcher.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELTokenizer.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamPromptingProvider.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
Log:
Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ElVarSearcher.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ElVarSearcher.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ElVarSearcher.java 2008-02-12 18:08:02 UTC (rev 6280)
@@ -0,0 +1,128 @@
+ /*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.internal.core.el;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * This class helps to find var/value attributes in DOM tree.
+ * @author Alexey Kazakov
+ */
+public class ElVarSearcher {
+
+ private final static String VAR_ATTRIBUTE_NAME = "var";
+ private final static String VALUE_ATTRIBUTE_NAME = "value";
+
+ /**
+ * @param node
+ * @return All var/value that can be used in node and null if can't find anyone.
+ */
+ public static List<Var> findAllVars(Node node) {
+ ArrayList<Var> vars = null;
+ Node parentNode = node.getParentNode();
+ while(parentNode!=null) {
+ Var var = findVar(parentNode);
+ if(var!=null) {
+ if(vars == null) {
+ vars = new ArrayList<Var>();
+ }
+ vars.add(var);
+ }
+ parentNode = parentNode.getParentNode();
+ }
+ return vars;
+ }
+
+ /**
+ * Finds var/value attribute in node
+ * @param node
+ * @param vars
+ * @return found var/value or null
+ */
+ public static Var findVar(Node node) {
+ if(node!=null && Node.ELEMENT_NODE == node.getNodeType()) {
+ Element element = (Element)node;
+ String var = element.getAttribute(VAR_ATTRIBUTE_NAME);
+ if(var!=null) {
+ var = var.trim();
+ if(!"".equals(var)) {
+ String value = element.getAttribute(VALUE_ATTRIBUTE_NAME);
+ if(value!=null) {
+ value = value.trim();
+ Var newVar = new Var(var, value);
+ if(newVar.getElToken()!=null) {
+ return newVar;
+ }
+ }
+ }
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Represents "var"/"value" attributes.
+ * @author Alexey Kazakov
+ */
+ public static class Var {
+ private String name;
+ private String value;
+ private ELToken elToken;
+
+ /**
+ * Constructor
+ * @param name - value of "var" attribute.
+ * @param value - value of "value" attribute.
+ */
+ public Var(String name, String value) {
+ super();
+ this.name = name;
+ this.value = value;
+ if(value.length()>3 && value.startsWith("#{") && value.endsWith("}")) {
+ String elBody = value.substring(0, value.length()-1).substring(2);
+ SeamELTokenizer elTokenizer = new SeamELTokenizer(elBody);
+ List<ELToken> tokens = elTokenizer.getTokens();
+ for (ELToken token : tokens) {
+ if(token.getType()==ELToken.EL_VARIABLE_TOKEN) {
+ elToken = token;
+ break;
+ }
+ }
+ }
+ }
+
+ /**
+ * @return parsed EL from "value" attribute. Returns null if EL is not valid.
+ */
+ public ELToken getElToken() {
+ return elToken;
+ }
+
+ /**
+ * @return name of variable.
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return value of variable. It's EL.
+ */
+ public String getValue() {
+ return value;
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-02-12 18:03:38 UTC (rev 6279)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-02-12 18:08:02 UTC (rev 6280)
@@ -30,6 +30,7 @@
import org.jboss.tools.seam.core.ISeamContextVariable;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.ScopeType;
+import org.jboss.tools.seam.internal.core.el.ElVarSearcher.Var;
/**
* Utility class used to find Seam Project content assist proposals
@@ -37,12 +38,11 @@
* @author Jeremy
*/
public final class SeamELCompletionEngine {
-
+
/**
* Constructs SeamELCompletionEngine object
*/
public SeamELCompletionEngine() {
-
}
/**
@@ -52,52 +52,29 @@
* @param file File
* @param document
* @param prefix the prefix to search for
- * @param position Offset of the prefix
+ * @param position Offset of the prefix
+ * @param vars - 'var' attributes which can be used in this EL
* @return the list of all possible suggestions
* @throws BadLocationException if accessing the current document fails
*/
public List<String> getCompletions(ISeamProject project, IFile file, IDocument document, CharSequence prefix,
- int position) throws BadLocationException, StringIndexOutOfBoundsException {
+ int position, List<Var> vars) throws BadLocationException, StringIndexOutOfBoundsException {
String documentContent = null;
if(document!=null) {
documentContent = document.get();
}
- return getCompletions(project, file, documentContent, prefix, position);
+ return getCompletions(project, file, documentContent, prefix, position, false, vars);
}
/**
* Create the array of suggestions.
- *
* @param project Seam project
* @param file File
- * @param documentContent
+ * @param documentContent
* @param prefix the prefix to search for
* @param position Offset of the prefix
- * @return the list of all possible suggestions
- * @throws BadLocationException if accessing the current document fails
- */
- public List<String> getCompletions(ISeamProject project, IFile file, String documentContent, CharSequence prefix,
- int position) throws BadLocationException, StringIndexOutOfBoundsException {
- List<String> completions = new ArrayList<String>();
- SeamELOperandResolveStatus status = resolveSeamELOperand(project, file, documentContent, prefix, position, false);
- if (status.isOK()) {
- completions.addAll(status.getProposals());
- }
- return completions;
-
-// return getCompletions(project, file, documentContent, prefix, position, false, null, null);
- }
- /**
- * Create the array of suggestions.
- * @param project Seam project
- * @param file File
- * @param document
- * @param prefix the prefix to search for
- * @param position Offset of the prefix
- * @return the list of all possible suggestions
- * @param usedVariables - Set of variables which are used in this Expression. It's useful in incremental validation.
- * @param unpairedGettersOrSetters - map of unpaired getters or setters of property which is used in last segment of Expression. 'key' is property name.
- * @param returnCompletedVariablesOnly - if 'true' then returns only variables that equals prefix. It's useful for validation.
+ * @param vars - 'var' attributes which can be used in this EL. Can be null.
+ * @param returnEqualedVariablesOnly 'false' if we get proposals for mask
* for example:
* we have 'variableName.variableProperty', 'variableName.variableProperty1', 'variableName.variableProperty2'
* prefix is 'variableName.variableProperty'
@@ -107,204 +84,44 @@
* we have 'variableName.variableProperty', 'variableName.variableProperty1', 'variableName.variableProperty2'
* prefix is 'variableName.variableProperty'
* Result is {'1','2'}
+ * @return the list of all possible suggestions
+ * @throws BadLocationException if accessing the current document fails
+ * @throws StringIndexOutOfBoundsException
*/
public List<String> getCompletions(ISeamProject project, IFile file, String documentContent, CharSequence prefix,
- int position, boolean returnEqualedVariablesOnly, Set<ISeamContextVariable> usedVariables, Map<String, TypeInfoCollector.MethodInfo> unpairedGettersOrSetters) throws BadLocationException, StringIndexOutOfBoundsException {
-
- List<String> res= new ArrayList<String>();
- SeamELOperandTokenizer tokenizer = new SeamELOperandTokenizer(documentContent, position + prefix.length());
- List<ELOperandToken> tokens = tokenizer.getTokens();
-
- List<ELOperandToken> resolvedExpressionPart = new ArrayList<ELOperandToken>();
- List<ISeamContextVariable> resolvedVariables = new ArrayList<ISeamContextVariable>();
- ScopeType scope = getScope(project, file);
- List<List<ELOperandToken>> variations = getPossibleVarsFromPrefix(tokens);
-
- if (variations.isEmpty()) {
- resolvedVariables = resolveVariables(project, scope, tokens, tokens, returnEqualedVariablesOnly);
- } else {
- for (List<ELOperandToken> variation : variations) {
- List<ISeamContextVariable>resolvedVars = new ArrayList<ISeamContextVariable>();
- resolvedVars = resolveVariables(project, scope, variation, tokens, returnEqualedVariablesOnly);
- if (resolvedVars != null && !resolvedVars.isEmpty()) {
- resolvedVariables = resolvedVars;
- resolvedExpressionPart = variation;
- break;
- }
- }
+ int position, boolean returnEqualedVariablesOnly, List<Var> vars) throws BadLocationException, StringIndexOutOfBoundsException {
+ List<String> completions = new ArrayList<String>();
+ SeamELOperandResolveStatus status = resolveSeamELOperand(project, file, documentContent, prefix, position, returnEqualedVariablesOnly, vars);
+ if (status.isOK()) {
+ completions.addAll(status.getProposals());
}
-
- // Save all resolved variables. It's useful for incremental validation.
- if(resolvedVariables!=null && resolvedVariables.size()>0 && usedVariables!=null) {
- usedVariables.addAll(resolvedVariables);
- }
-
- if (resolvedExpressionPart.isEmpty() &&
- !returnEqualedVariablesOnly &&
- tokens.size() > 0 &&
- tokens.get(tokens.size() - 1).getType() == ELOperandToken.EL_SEPARATOR_TOKEN) {
- // no vars are resolved
- // the tokens are the part of var name ended with a separator (.)
- resolvedVariables = resolveVariables(project, scope, tokens, tokens, returnEqualedVariablesOnly);
- String prefixString = prefix.toString();
- for (ISeamContextVariable var : resolvedVariables) {
- String varName = var.getName();
- if(varName.startsWith(prefixString)) {
- res.add(varName.substring(prefixString.length()));
- }
- }
- return res;
- }
-
-
- // Here we have a list of vars for some part of expression
- // OK. we'll proceed with members of these vars
- if (areEqualExpressions(resolvedExpressionPart, tokens)) {
- // First segment is the last one
- for (ISeamContextVariable var : resolvedVariables) {
- String varName = var.getName();
- String prefixString = prefix.toString();
- if(prefixString.length()<=varName.length()) {
- res.add(varName.substring(prefixString.length()));
- } else if(returnEqualedVariablesOnly) {
- res.add(varName);
- }
- }
- return res;
- }
-
- // First segment is found - proceed with next tokens
- int startTokenIndex = (resolvedExpressionPart == null ? 0 : resolvedExpressionPart.size());
- List<TypeInfoCollector.MemberInfo> members = new ArrayList<TypeInfoCollector.MemberInfo>();
- for (ISeamContextVariable var : resolvedVariables) {
- TypeInfoCollector.MemberInfo member = SeamExpressionResolver.getMemberInfoByVariable(var, returnEqualedVariablesOnly);
- if (member != null && !members.contains(member))
- members.add(member);
- }
- for (int i = startTokenIndex;
- tokens != null && i < tokens.size() &&
- members != null && members.size() > 0;
- i++) {
- ELOperandToken token = tokens.get(i);
-
- if (i < tokens.size() - 1) { // inside expression
- if (token.getType() == ELOperandToken.EL_SEPARATOR_TOKEN)
- // proceed with next token
- continue;
-
- if (token.isNameToken()) {
- // Find properties for the token
- String name = token.getText();
- List<TypeInfoCollector.MemberInfo> newMembers = new ArrayList<TypeInfoCollector.MemberInfo>();
- for (TypeInfoCollector.MemberInfo mbr : members) {
- TypeInfoCollector infos = SeamExpressionResolver.collectTypeInfo(mbr.getMemberType());
- List<TypeInfoCollector.MemberInfo> properties = infos.getProperties();
- for (TypeInfoCollector.MemberInfo property : properties) {
- StringBuffer propertyName = new StringBuffer(property.getName());
- if (property instanceof TypeInfoCollector.MethodInfo) { // Setter or getter
- propertyName.delete(0, (propertyName.charAt(0) == 'i' ? 2 : 3));
- propertyName.setCharAt(0, Character.toLowerCase(propertyName.charAt(0)));
- }
- if (name.equals(propertyName.toString())) {
- newMembers.add(property);
- }
- }
- }
- members = newMembers;
- }
- if (token.getType() == ELOperandToken.EL_METHOD_TOKEN) {
- // Find methods for the token
- String name = token.getText();
- if (name.indexOf('(') != -1) {
- name = name.substring(0, name.indexOf('('));
- }
- List<TypeInfoCollector.MemberInfo> newMembers = new ArrayList<TypeInfoCollector.MemberInfo>();
- for (TypeInfoCollector.MemberInfo mbr : members) {
- TypeInfoCollector infos = SeamExpressionResolver.collectTypeInfo(mbr.getMemberType());
- List<TypeInfoCollector.MemberInfo> methods = infos.getMethods();
- for (TypeInfoCollector.MemberInfo method : methods) {
- if (name.equals(method.getName())) {
- newMembers.add(method);
- }
- }
- }
- members = newMembers;
- }
- } else { // Last segment
- Set<String> proposals = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
- if (token.getType() == ELOperandToken.EL_SEPARATOR_TOKEN) {
- // return all the methods + properties
- for (TypeInfoCollector.MemberInfo mbr : members) {
- TypeInfoCollector infos = SeamExpressionResolver.collectTypeInfo(mbr.getMemberType());
- proposals.addAll(infos.getMethodPresentations());
- proposals.addAll(infos.getPropertyPresentations(unpairedGettersOrSetters));
- }
- } else if (token.getType() == ELOperandToken.EL_VARIABLE_NAME_TOKEN ||
- token.getType() == ELOperandToken.EL_PROPERTY_NAME_TOKEN ||
- token.getType() == ELOperandToken.EL_METHOD_TOKEN) {
- // return filtered methods + properties
- Set<String> proposalsToFilter = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
- for (TypeInfoCollector.MemberInfo mbr : members) {
- TypeInfoCollector infos = SeamExpressionResolver.collectTypeInfo(mbr.getMemberType());
- proposalsToFilter.addAll(infos.getMethodPresentations());
- proposalsToFilter.addAll(infos.getPropertyPresentations(unpairedGettersOrSetters));
- }
- for (String proposal : proposalsToFilter) {
- // We do expect nothing but name for method tokens (No round brackets)
- String filter = token.getText();
- if(returnEqualedVariablesOnly) {
- // This is used for validation.
- if (proposal.equals(filter)) {
- proposals.add(proposal);
- if(unpairedGettersOrSetters!=null) {
- TypeInfoCollector.MethodInfo unpirMethod = unpairedGettersOrSetters.get(filter);
- unpairedGettersOrSetters.clear();
- if(unpirMethod!=null) {
- unpairedGettersOrSetters.put(filter, unpirMethod);
- }
- }
- break;
- }
- } else {
- // This is used for CA.
- if (proposal.startsWith(filter)) {
- proposals.add(proposal.substring(filter.length()));
- }
- }
- }
- }
- res.addAll(proposals);
- }
- }
-
- if(res.isEmpty() && unpairedGettersOrSetters!=null) {
- unpairedGettersOrSetters.clear();
- }
- return res;
+ return completions;
}
-
+
+ /**
+ * Status of EL resolving.
+ * @author Jeremy
+ */
public static class SeamELOperandResolveStatus {
private List<ELOperandToken> tokens;
public List<ISeamContextVariable> usedVariables;
Map<String, TypeInfoCollector.MethodInfo> unpairedGettersOrSetters;
Set<String> proposals;
private ELOperandToken lastResolvedToken;
- private boolean isMapOrBundleAmoungTheTokens;
+ private boolean isMapOrBundleAmoungTheTokens = false;
public SeamELOperandResolveStatus(List<ELOperandToken> tokens) {
this.tokens = tokens;
- this.lastResolvedToken = null;
- this.isMapOrBundleAmoungTheTokens = false;
}
-
+
public boolean isMapOrBundleAmoungTheTokens() {
return this.isMapOrBundleAmoungTheTokens;
}
-
+
public void setMapOrBundleAmoungTheTokens() {
this.isMapOrBundleAmoungTheTokens = true;
}
-
+
public boolean isOK() {
return !getProposals().isEmpty() || isMapOrBundleAmoungTheTokens();
}
@@ -312,7 +129,7 @@
public boolean isError() {
return !isOK();
}
-
+
public List<ELOperandToken> getResolvedTokens() {
List<ELOperandToken> resolvedTokens = new ArrayList<ELOperandToken>();
int index = tokens.indexOf(lastResolvedToken); // index == -1 means that no tokens are resolved
@@ -373,20 +190,100 @@
public void clearUnpairedGettersOrSetters() {
getUnpairedGettersOrSetters().clear();
}
-
}
-
+
public SeamELOperandResolveStatus resolveSeamELOperand(ISeamProject project, IFile file, String documentContent, CharSequence prefix,
+ int position, boolean returnEqualedVariablesOnly, List<Var> vars) throws BadLocationException, StringIndexOutOfBoundsException {
+ String oldEl = prefix.toString();
+ Var var = findVarForEl(oldEl, vars);
+ String newEl = replacePrefixByVar(oldEl, var);
+ String newDocumentContent = documentContent;
+ boolean prefixWasChanged = newEl!=oldEl;
+ if(prefixWasChanged) {
+ newDocumentContent = documentContent.substring(0, position) + newEl;
+ }
+
+ SeamELOperandResolveStatus status = resolveSeamELOperand(project, file, newDocumentContent, newEl, position, returnEqualedVariablesOnly);
+
+ if(prefixWasChanged) {
+ // Replace new EL by original one in result status.
+ ELOperandToken newLastResolvedToken = status.getLastResolvedToken();
+ SeamELOperandTokenizer tokenizer = new SeamELOperandTokenizer(documentContent, position + prefix.length());
+ List<ELOperandToken> oldTokens = tokenizer.getTokens();
+ status.setTokens(oldTokens);
+ if(newLastResolvedToken != null) {
+ if(newLastResolvedToken.getStart() < var.getElToken().getLength()) {
+ // Last resolved token is token from "var". Set first token of original EL as last resolved one.
+ status.setLastResolvedToken(oldTokens.get(0));
+ } else {
+ // Last resolved token is token outside "var" prefix. Correct last resolved token.
+ int oldLastResolvedTokenStart = newLastResolvedToken.getStart() - var.getElToken().getText().length() + var.getName().length();
+ for (ELOperandToken oldToken : oldTokens) {
+ if(oldToken.getStart() == oldLastResolvedTokenStart) {
+ status.setLastResolvedToken(oldToken);
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ return status;
+ }
+
+ private Var findVarForEl(String el, List<Var> vars) {
+ if(vars!=null) {
+ for (Var var : vars) {
+ ELToken token = var.getElToken();
+ if(token!=null && !token.getText().endsWith(".")) {
+ String varName = var.getName();
+ if(el.equals(varName) || el.startsWith(varName + ".")) {
+ return var;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Replace all el variables by variables from found "var" attributes.
+ * @param el
+ * @param vars
+ * @return
+ */
+ private String replacePrefixByVar(String el, Var var) {
+ if(var!=null) {
+ ELToken token = var.getElToken();
+ if(token!=null) {
+ return token.getText() + el.substring(var.getName().length());
+ }
+ }
+ return el;
+ }
+
+ /**
+ * Resolves Seam EL
+ * @param project
+ * @param file
+ * @param documentContent
+ * @param prefix
+ * @param position
+ * @param returnEqualedVariablesOnly
+ * @return
+ * @throws BadLocationException
+ * @throws StringIndexOutOfBoundsException
+ */
+ public SeamELOperandResolveStatus resolveSeamELOperand(ISeamProject project, IFile file, String documentContent, String prefix,
int position, boolean returnEqualedVariablesOnly) throws BadLocationException, StringIndexOutOfBoundsException {
-
SeamELOperandTokenizer tokenizer = new SeamELOperandTokenizer(documentContent, position + prefix.length());
- SeamELOperandResolveStatus status= new SeamELOperandResolveStatus(tokenizer.getTokens());
+ SeamELOperandResolveStatus status = new SeamELOperandResolveStatus(tokenizer.getTokens());
List<ISeamContextVariable> resolvedVariables = new ArrayList<ISeamContextVariable>();
ScopeType scope = getScope(project, file);
List<List<ELOperandToken>> variations = getPossibleVarsFromPrefix(status.getTokens());
-
+
if (variations.isEmpty()) {
resolvedVariables = resolveVariables(project, scope,
status.getTokens(), status.getTokens(),
@@ -409,7 +306,7 @@
if(resolvedVariables!=null && resolvedVariables.size()>0) {
status.setUsedVariables(resolvedVariables);
}
-
+
if (status.getResolvedTokens().isEmpty() &&
!returnEqualedVariablesOnly &&
status.getTokens().size() > 0 &&
@@ -417,18 +314,16 @@
// no vars are resolved
// the tokens are the part of var name ended with a separator (.)
resolvedVariables = resolveVariables(project, scope, status.getTokens(), status.getTokens(), returnEqualedVariablesOnly);
- String prefixString = prefix.toString();
Set<String> proposals = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
for (ISeamContextVariable var : resolvedVariables) {
String varName = var.getName();
- if(varName.startsWith(prefixString)) {
- proposals.add(varName.substring(prefixString.length()));
+ if(varName.startsWith(prefix)) {
+ proposals.add(varName.substring(prefix.length()));
}
}
status.setProposals(proposals);
return status;
}
-
// Here we have a list of vars for some part of expression
// OK. we'll proceed with members of these vars
@@ -437,9 +332,8 @@
Set<String> proposals = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
for (ISeamContextVariable var : resolvedVariables) {
String varName = var.getName();
- String prefixString = prefix.toString();
- if(prefixString.length()<=varName.length()) {
- proposals.add(varName.substring(prefixString.length()));
+ if(prefix.length()<=varName.length()) {
+ proposals.add(varName.substring(prefix.length()));
} else if(returnEqualedVariablesOnly) {
proposals.add(varName);
}
@@ -580,9 +474,8 @@
status.clearUnpairedGettersOrSetters();
}
return status;
-
}
-
+
private String computeVariableName(List<ELOperandToken> tokens){
if (tokens == null)
tokens = new ArrayList<ELOperandToken>();
@@ -597,7 +490,7 @@
}
return sb.toString();
}
-
+
/*
* Compares to tokenized expressions.
*
@@ -608,17 +501,17 @@
private boolean areEqualExpressions(List<ELOperandToken>first, List<ELOperandToken>second) {
if (first == null || second == null)
return (first == second);
-
+
if (first.size() != second.size())
return false;
-
+
for (int i = 0; i < first.size(); i++) {
if (!first.get(i).equals(second.get(i)))
return false;
}
return true;
}
-
+
/* Returns scope for the resource
*
* @param project
@@ -673,7 +566,7 @@
}
return new ArrayList<ISeamContextVariable>();
}
-
+
/*
* Creates and returns list of possible variable name combinations from expression starting from the longest name
*
@@ -695,7 +588,7 @@
}
return result;
}
-
+
/**
* Removes duplicates of completion strings
*
@@ -708,7 +601,7 @@
if (suggestions == null)
return unique;
-
+
for (String item : suggestions) {
if (!present.contains(item)) {
present.add(item);
@@ -765,13 +658,13 @@
if (tokens == null || tokens.size() == 0)
return null;
-
+
List<List<ELOperandToken>> vars = getPossibleVarsFromPrefix(tokens);
if (vars == null)
return null;
-
+
String prefixPart = documentContent.substring(tokens.get(0).start, offset);
-
+
// Search from the shortest variation to the longest one
for (int i = vars.size() - 1; i >= 0; i--) {
List<ELOperandToken>var = vars.get(i);
@@ -782,7 +675,7 @@
}
return null;
}
-
+
/**
* Create the array of suggestions.
* @param project Seam project
@@ -791,20 +684,19 @@
* @param prefix the prefix to search for
* @param position Offset of the prefix
*/
-
public List<IJavaElement> getJavaElementsForExpression(ISeamProject project, IFile file, String expression) throws BadLocationException, StringIndexOutOfBoundsException {
List<IJavaElement> res= new ArrayList<IJavaElement>();
SeamELOperandTokenizer tokenizer = new SeamELOperandTokenizer(expression, expression.length());
List<ELOperandToken> tokens = tokenizer.getTokens();
-
+
if (tokens == null || tokens.size() == 0 || tokens.get(tokens.size() - 1).getType() == ELOperandToken.EL_SEPARATOR_TOKEN)
return res;
-
+
List<ELOperandToken> resolvedExpressionPart = new ArrayList<ELOperandToken>();
List<ISeamContextVariable> resolvedVariables = new ArrayList<ISeamContextVariable>();
ScopeType scope = getScope(project, file);
List<List<ELOperandToken>> variations = getPossibleVarsFromPrefix(tokens);
-
+
if (variations.isEmpty()) {
resolvedVariables = resolveVariables(project, scope, tokens, tokens, true);
} else {
@@ -824,12 +716,6 @@
if (areEqualExpressions(resolvedExpressionPart, tokens)) {
// First segment is the last one
for (ISeamContextVariable var : resolvedVariables) {
-// String varName = var.getName();
-// if(expression.length()<varName.length()) {
-// res.add(varName.substring(prefixString.length()));
-// } else if(returnEqualedVariablesOnly) {
-// res.add(varName);
-// }
IMember member = SeamExpressionResolver.getMemberByVariable(var, true);
if (member instanceof IJavaElement){
res.add((IJavaElement)member);
@@ -851,7 +737,7 @@
members != null && members.size() > 0;
i++) {
ELOperandToken token = tokens.get(i);
-
+
if (i < tokens.size() - 1) { // inside expression
if (token.getType() == ELOperandToken.EL_SEPARATOR_TOKEN)
// proceed with next token
@@ -908,7 +794,7 @@
javaElementInfosToFilter.addAll(infos.getMethods());
javaElementInfosToFilter.addAll(infos.getProperties());
}
-
+
for (TypeInfoCollector.MemberInfo info : javaElementInfosToFilter) {
// We do expect nothing but name for method tokens (No round brackets)
String filter = token.getText();
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELTokenizer.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELTokenizer.java 2008-02-12 18:03:38 UTC (rev 6279)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELTokenizer.java 2008-02-12 18:08:02 UTC (rev 6280)
@@ -44,7 +44,7 @@
/**
* Constructs SeamELTokenizer object.
* Parse an expression.
- * For example: expression is '#{var1.pr != var2.pr}'
+ * For example: expression is "var1.pr != var2.pr"
* then tokens are ["var1.pr"," ", "!=", " ", "var2.pr"]
* @param expression
*/
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamPromptingProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamPromptingProvider.java 2008-02-12 18:03:38 UTC (rev 6279)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamPromptingProvider.java 2008-02-12 18:08:02 UTC (rev 6280)
@@ -8,7 +8,6 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-
package org.jboss.tools.seam.internal.core.el;
import java.util.ArrayList;
@@ -29,9 +28,9 @@
static String IS_SEAM_PROJECT = "seam.is_seam_project"; //$NON-NLS-1$
public static String VARIABLES = "seam.variables"; //$NON-NLS-1$
public static String MEMBERS = "seam.members"; //$NON-NLS-1$
-
+
SeamELCompletionEngine engine= new SeamELCompletionEngine();
-
+
public SeamPromptingProvider() {}
public List getList(XModel model, String id, String prefix,
@@ -59,12 +58,11 @@
} else if(MEMBERS.equals(id)) {
try {
String prefix2 = SeamELCompletionEngine.getPrefix(prefix, prefix.length());
- List<String> suggestions = engine.getCompletions(p, f, prefix, prefix2, 2, true, null, null);
+ List<String> suggestions = engine.getCompletions(p, f, prefix, prefix2, 2, true, null);
return suggestions;
} catch (BadLocationException e) {
return EMPTY_LIST;
}
-
}
return null;
}
@@ -72,5 +70,4 @@
public boolean isSupporting(String id) {
return id != null && id.startsWith("seam."); //$NON-NLS-1$
}
-
-}
+}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2008-02-12 18:03:38 UTC (rev 6279)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2008-02-12 18:08:02 UTC (rev 6280)
@@ -254,16 +254,9 @@
// return type is void
String factoryName = factory.getName();
if(factoryName==null) {
- String methodName = method.getElementName();
- if(methodName.startsWith("get") && methodName.length()>3) { //$NON-NLS-1$
- // This is getter
- factoryName = methodName.substring(3);
- } else {
- // Unknown factory name
- SeamCorePlugin.getDefault().logError(NLS.bind(SeamCoreMessages.SEAM_CORE_VALIDATOR_FACTORY_METHOD_MUST_HAVE_NAME,factory.getResource()));
- //factoryName = methodName;
- return;
- }
+ // Unknown factory name
+ SeamCorePlugin.getDefault().logError(NLS.bind(SeamCoreMessages.SEAM_CORE_VALIDATOR_FACTORY_METHOD_MUST_HAVE_NAME,factory.getResource()));
+ return;
}
validateFactoryName(factory, factoryName, markedDuplicateFactoryNames, true);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2008-02-12 18:03:38 UTC (rev 6279)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2008-02-12 18:08:02 UTC (rev 6280)
@@ -11,6 +11,7 @@
package org.jboss.tools.seam.internal.core.validation;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -30,13 +31,14 @@
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.text.IStructuredDocument;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
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.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.seam.core.ISeamContextVariable;
@@ -47,10 +49,14 @@
import org.jboss.tools.seam.internal.core.el.ELOperandToken;
import org.jboss.tools.seam.internal.core.el.ELStringToken;
import org.jboss.tools.seam.internal.core.el.ELToken;
+import org.jboss.tools.seam.internal.core.el.ElVarSearcher;
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
import org.jboss.tools.seam.internal.core.el.SeamELStringTokenizer;
import org.jboss.tools.seam.internal.core.el.SeamELTokenizer;
import org.jboss.tools.seam.internal.core.el.TypeInfoCollector;
+import org.jboss.tools.seam.internal.core.el.ElVarSearcher.Var;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* EL Validator
@@ -64,7 +70,8 @@
protected static final String VALIDATING_EL_FILE_MESSAGE_ID = "VALIDATING_EL_FILE";
- private SeamELCompletionEngine engine= new SeamELCompletionEngine();
+ private SeamELCompletionEngine engine = new SeamELCompletionEngine();
+ private List<Var> varListForCurentValidatedNode = new ArrayList<Var>();
public SeamELValidator(SeamValidatorManager validatorManager,
SeamValidationHelper coreHelper, IReporter reporter,
@@ -166,6 +173,7 @@
}
private void validateDom(IFile file, String content) {
+ varListForCurentValidatedNode.clear();
IModelManager manager = StructuredModelManager.getModelManager();
if(manager == null) {
// this can happen if plugin org.eclipse.wst.sse.core
@@ -178,17 +186,8 @@
model = manager.getModelForRead(file);
if (model instanceof IDOMModel) {
IDOMModel domModel = (IDOMModel) model;
- IStructuredDocument structuredDoc = domModel.getStructuredDocument();
- IStructuredDocumentRegion curNode = structuredDoc.getFirstStructuredDocumentRegion();
- while (curNode !=null && !reporter.isCancelled()) {
- if (curNode.getFirstRegion().getType() == DOMRegionContext.XML_TAG_OPEN) {
- validateNodeContent(file, curNode, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE);
- }
- if (curNode.getFirstRegion().getType() == DOMRegionContext.XML_CONTENT) {
- validateNodeContent(file, curNode, DOMRegionContext.XML_CONTENT);
- }
- curNode = curNode.getNext();
- }
+ IDOMDocument document = domModel.getDocument();
+ validateChildNodes(file, document);
}
} catch (CoreException e) {
SeamCorePlugin.getDefault().logError(SeamCoreMessages.SEAM_EL_VALIDATOR_ERROR_VALIDATING_SEAM_EL, e);
@@ -199,10 +198,29 @@
model.releaseFromRead();
}
}
-
return;
}
+ private void validateChildNodes(IFile file, Node parent) {
+ Var var = ElVarSearcher.findVar(parent);
+ if(var!=null) {
+ varListForCurentValidatedNode.add(var);
+ }
+ NodeList children = parent.getChildNodes();
+ for(int i=0; i<children.getLength() && !reporter.isCancelled(); i++) {
+ Node curentValidatedNode = children.item(i);
+ if(Node.ELEMENT_NODE == curentValidatedNode.getNodeType()) {
+ validateNodeContent(file, ((IDOMNode)curentValidatedNode).getFirstStructuredDocumentRegion(), DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE);
+ } else if(Node.TEXT_NODE == curentValidatedNode.getNodeType()) {
+ validateNodeContent(file, ((IDOMNode)curentValidatedNode).getFirstStructuredDocumentRegion(), DOMRegionContext.XML_CONTENT);
+ }
+ validateChildNodes(file, curentValidatedNode);
+ }
+ if(var!=null) {
+ varListForCurentValidatedNode.remove(var);
+ }
+ }
+
private void validateNodeContent(IFile file, IStructuredDocumentRegion node, String regionType) {
ITextRegionList regions = node.getRegions();
for(int i=0; i<regions.size(); i++) {
@@ -264,7 +282,7 @@
}
SeamELCompletionEngine.SeamELOperandResolveStatus status =
- engine.resolveSeamELOperand(project, file, operand, prefix, position, true);
+ engine.resolveSeamELOperand(project, file, operand, prefix, position, true, varListForCurentValidatedNode);
if(status.getUsedVariables().size()==0 && status.isError()) {
// Save resources with unknown variables names
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-02-12 18:03:38 UTC (rev 6279)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-02-12 18:08:02 UTC (rev 6280)
@@ -284,7 +284,7 @@
}
}
- List<String> suggestions = fEngine.getCompletions(seamProject, file, documentContent, prefix, offset + proposalPrefix.length() - prefix.length());
+ List<String> suggestions = fEngine.getCompletions(seamProject, file, documentContent, prefix, offset + proposalPrefix.length() - prefix.length(), false, null);
List<String> uniqueSuggestions = fEngine.makeUnique(suggestions);
List<ICompletionProposal> result= new ArrayList<ICompletionProposal>();
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r6279 - in trunk/seam/tests/org.jboss.tools.seam.core.test: projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/entity and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-02-12 13:03:38 -0500 (Tue, 12 Feb 2008)
New Revision: 6279
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/entity/TestComponentForVarAttributes.java
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-999 Added JUnit Test.
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml 2008-02-12 18:03:38 UTC (rev 6279)
@@ -0,0 +1,20 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich"
+ template="layout/template.xhtml">
+
+<ui:define name="body">
+
+ <h:dataTable var="entry" value="#{testComponentForVars.list}">
+ <h:column>
+ <h:outputText value="#{entry.name}" />
+ </h:column>
+ </h:dataTable>
+
+</ui:define>
+</ui:composition>
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/entity/TestComponentForVarAttributes.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/entity/TestComponentForVarAttributes.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/entity/TestComponentForVarAttributes.java 2008-02-12 18:03:38 UTC (rev 6279)
@@ -0,0 +1,23 @@
+package org.domain.SeamWebWarTestProject.entity;
+
+import java.io.Serializable;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import java.util.List;
+
+(a)Scope(ScopeType.EVENT)
+@Name("testComponentForVars")
+public class TestComponentForVarAttributes implements Serializable {
+ static final long serialVersionUID = 1001;
+
+ public static class Value {
+ public String getName() {
+ return null;
+ }
+ }
+
+ public List<Value> getList() {
+ return null;
+ }
+}
\ No newline at end of file
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-02-12 17:54:12 UTC (rev 6278)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-02-12 18:03:38 UTC (rev 6279)
@@ -76,6 +76,13 @@
return seamProject;
}
+ public void testVarAttributes() throws CoreException {
+ // Test for http://jira.jboss.com/jira/browse/JBIDE-999
+ IFile file = project.getFile("WebContent/varAttributes.xhtml");
+ int number = getMarkersNumber(file);
+ assertTrue("Problem marker was found in varAttributes.xhtml file. Validator did not recognize 'var' attribute.", number == 0);
+ }
+
public void testJiraJbide1631() throws CoreException {
// Test for http://jira.jboss.com/jira/browse/JBIDE-1631
IFile jbide1631XHTMLFile = project.getFile("WebContent/JBIDE-1631.xhtml");
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r6278 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-02-12 12:54:12 -0500 (Tue, 12 Feb 2008)
New Revision: 6278
Removed:
trunk/trunk/
Log:
Removed as wrong submition
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r6277 - in trunk: trunk and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-02-12 12:53:10 -0500 (Tue, 12 Feb 2008)
New Revision: 6277
Added:
trunk/struts/tests/org.jboss.tools.struts.text.ext.test/
Removed:
trunk/trunk/org.jboss.tools.struts.text.ext.test/
Log:
Struts Text Extensions Test plugin
JUnit TestCase for JBIDE-1762
Copied: trunk/struts/tests/org.jboss.tools.struts.text.ext.test (from rev 6276, trunk/trunk/org.jboss.tools.struts.text.ext.test)
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r6276 - in trunk/trunk/org.jboss.tools.struts.text.ext.test: META-INF and 13 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-02-12 12:49:59 -0500 (Tue, 12 Feb 2008)
New Revision: 6276
Added:
trunk/trunk/org.jboss.tools.struts.text.ext.test/.classpath
trunk/trunk/org.jboss.tools.struts.text.ext.test/.project
trunk/trunk/org.jboss.tools.struts.text.ext.test/META-INF/
trunk/trunk/org.jboss.tools.struts.text.ext.test/META-INF/MANIFEST.MF
trunk/trunk/org.jboss.tools.struts.text.ext.test/build.properties
trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/
trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/
trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.classpath
trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.project
trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/
trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.jdt.core.prefs
trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.jst.common.project.facet.core.prefs
trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.wst.common.component
trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.jboss.tools.jst.web.xml
trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/WebContent/
trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/WebContent/WEB-INF/
trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/WebContent/WEB-INF/web.xml
trunk/trunk/org.jboss.tools.struts.text.ext.test/src/
trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/
trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/
trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/
trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/struts/
trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/struts/text/
trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/struts/text/tests/
trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/struts/text/tests/StrutsTextExtAllTests.java
trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/struts/text/tests/hyperlink/
trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/struts/text/tests/hyperlink/StrutsJbide1762Test.java
Log:
Share project 'org.jboss.tools.struts.text.ext.test' into 'https://svn.jboss.org/repos/jbosstools/trunk'
JUnit TestCase for JBIDE-1762
Added: trunk/trunk/org.jboss.tools.struts.text.ext.test/.classpath
===================================================================
--- trunk/trunk/org.jboss.tools.struts.text.ext.test/.classpath (rev 0)
+++ trunk/trunk/org.jboss.tools.struts.text.ext.test/.classpath 2008-02-12 17:49:59 UTC (rev 6276)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/trunk/org.jboss.tools.struts.text.ext.test/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/trunk/org.jboss.tools.struts.text.ext.test/.project
===================================================================
--- trunk/trunk/org.jboss.tools.struts.text.ext.test/.project (rev 0)
+++ trunk/trunk/org.jboss.tools.struts.text.ext.test/.project 2008-02-12 17:49:59 UTC (rev 6276)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.struts.text.ext.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/trunk/org.jboss.tools.struts.text.ext.test/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/trunk/org.jboss.tools.struts.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/trunk/org.jboss.tools.struts.text.ext.test/META-INF/MANIFEST.MF (rev 0)
+++ trunk/trunk/org.jboss.tools.struts.text.ext.test/META-INF/MANIFEST.MF 2008-02-12 17:49:59 UTC (rev 6276)
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test
+Bundle-SymbolicName: org.jboss.tools.struts.text.ext.test
+Bundle-Version: 1.0.0
+Require-Bundle: org.junit,
+ org.jboss.tools.common.test,
+ org.jboss.tools.common.model.ui,
+ org.jboss.tools.tests,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.jface.text,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.wst.sse.core,
+ org.jboss.tools.common.text.ext,
+ org.jboss.tools.jst.jsp,
+ org.jboss.tools.jst.jsp.test,
+ org.jboss.tools.jst.web
+Export-Package: org.jboss.tools.struts.text.tests
+
Property changes on: trunk/trunk/org.jboss.tools.struts.text.ext.test/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/trunk/org.jboss.tools.struts.text.ext.test/build.properties
===================================================================
--- trunk/trunk/org.jboss.tools.struts.text.ext.test/build.properties (rev 0)
+++ trunk/trunk/org.jboss.tools.struts.text.ext.test/build.properties 2008-02-12 17:49:59 UTC (rev 6276)
@@ -0,0 +1,3 @@
+source.. = src/
+bin.includes = META-INF/,\
+ .
Property changes on: trunk/trunk/org.jboss.tools.struts.text.ext.test/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.classpath
===================================================================
--- trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.classpath (rev 0)
+++ trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.classpath 2008-02-12 17:49:59 UTC (rev 6276)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="JavaSource"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_07"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime"/>
+ <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
Property changes on: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.project
===================================================================
--- trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.project (rev 0)
+++ trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.project 2008-02-12 17:49:59 UTC (rev 6276)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>StrutsJbide1762Test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.common.verification.verifybuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.jboss.tools.struts.strutsnature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.jdt.core.prefs 2008-02-12 17:49:59 UTC (rev 6276)
@@ -0,0 +1,7 @@
+#Tue Feb 12 15:59:42 MSK 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0)
+++ trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-02-12 17:49:59 UTC (rev 6276)
@@ -0,0 +1,4 @@
+#Tue Feb 12 15:59:44 MSK 2008
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.5.0_07/owners=jst.java\:5.0
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget\:\:JBoss\ 4.2\ Runtime/owners=jst.web\:2.3
+eclipse.preferences.version=1
Property changes on: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.jst.common.project.facet.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.wst.common.component 2008-02-12 17:49:59 UTC (rev 6276)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+<wb-module deploy-name="StrutsJbide1762Test">
+<wb-resource deploy-path="/" source-path="/WebContent"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/>
+<property name="context-root" value="StrutsJbide1762Test"/>
+<property name="java-output-path" value="build/classes"/>
+</wb-module>
+</project-modules>
Added: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-02-12 17:49:59 UTC (rev 6276)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 4.2 Runtime"/>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.web"/>
+ <installed facet="jst.java" version="5.0"/>
+ <installed facet="jst.web" version="2.3"/>
+</faceted-project>
Property changes on: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.jboss.tools.jst.web.xml
===================================================================
--- trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.jboss.tools.jst.web.xml (rev 0)
+++ trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.jboss.tools.jst.web.xml 2008-02-12 17:49:59 UTC (rev 6276)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<file-systems VERSION="2.0.0" application-name="StrutsJbide1762Test"
+ model-entity="FileSystems" workspace-home="./WebContent/WEB-INF">
+ <file-system NAME="WEB-INF" location="%workspace.home%" model-entity="FileSystemFolder"/>
+ <file-system NAME="WEB-ROOT" info="Content-Type=Web"
+ location="%workspace.home%/.." model-entity="FileSystemFolder"/>
+ <file-system NAME="src" location="%workspace.home%/../../JavaSource" model-entity="FileSystemFolder"/>
+ <file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/>
+ <file-system NAME="build" location="%workspace.home%/../../ant" model-entity="FileSystemFolder"/>
+ <file-system NAME="lib-common-annotations.jar" info="hidden=yes"
+ location="%workspace.home%/lib/common-annotations.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-beanutils.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-beanutils.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-collections.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-collections.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-digester.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-digester.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-fileupload.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-fileupload.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-lang.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-lang.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-logging.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-logging.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-validator.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-validator.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jakarta-oro.jar" info="hidden=yes"
+ location="%workspace.home%/lib/jakarta-oro.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jstl.jar" info="hidden=yes"
+ location="%workspace.home%/lib/jstl.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-standard.jar" info="hidden=yes"
+ location="%workspace.home%/lib/standard.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-struts-legacy.jar" info="hidden=yes"
+ location="%workspace.home%/lib/struts-legacy.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-struts.jar" info="hidden=yes"
+ location="%workspace.home%/lib/struts.jar" model-entity="FileSystemJar"/>
+ <web SERVLET_VERSION="2.3" model-entity="JstWeb" model-path="/web.xml">
+ <module URI="/WEB-INF/struts-config.xml" model-entity="JstWebModule"
+ model-path="/struts-config.xml" src="src" web-root="WEB-ROOT"/>
+ </web>
+</file-systems>
Property changes on: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/.settings/org.jboss.tools.jst.web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/WebContent/WEB-INF/web.xml 2008-02-12 17:49:59 UTC (rev 6276)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <display-name>StrutsJbide1762Test</display-name>
+ <!-- Action Servlet Configuration -->
+ <servlet>
+ <servlet-name>action</servlet-name>
+ <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+ <init-param>
+ <param-name>config</param-name>
+ <param-value>/WEB-INF/struts-config.xml</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <!-- Action Servlet Mapping -->
+ <servlet-mapping>
+ <servlet-name>action</servlet-name>
+ <url-pattern>*.do</url-pattern>
+ </servlet-mapping>
+ <!-- The Usual Welcome File List -->
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+ <taglib>
+ <taglib-uri>/WEB-INF/struts-bean</taglib-uri>
+ <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
+ </taglib>
+ <taglib>
+ <taglib-uri>/WEB-INF/struts-logic</taglib-uri>
+ <taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
+ </taglib>
+ <taglib>
+ <taglib-uri>/WEB-INF/struts-html</taglib-uri>
+ <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
+ </taglib>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>
Property changes on: trunk/trunk/org.jboss.tools.struts.text.ext.test/projects/StrutsJbide1762Test/WebContent/WEB-INF/web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/struts/text/tests/StrutsTextExtAllTests.java
===================================================================
--- trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/struts/text/tests/StrutsTextExtAllTests.java (rev 0)
+++ trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/struts/text/tests/StrutsTextExtAllTests.java 2008-02-12 17:49:59 UTC (rev 6276)
@@ -0,0 +1,16 @@
+package org.jboss.tools.struts.text.tests;
+
+import org.jboss.tools.struts.text.tests.hyperlink.StrutsJbide1762Test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class StrutsTextExtAllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite(StrutsTextExtAllTests.class.getName());
+ suite.addTest(StrutsJbide1762Test.suite());
+ return suite;
+ }
+
+}
Property changes on: trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/struts/text/tests/StrutsTextExtAllTests.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/struts/text/tests/hyperlink/StrutsJbide1762Test.java
===================================================================
--- trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/struts/text/tests/hyperlink/StrutsJbide1762Test.java (rev 0)
+++ trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/struts/text/tests/hyperlink/StrutsJbide1762Test.java 2008-02-12 17:49:59 UTC (rev 6276)
@@ -0,0 +1,208 @@
+package org.jboss.tools.struts.text.tests.hyperlink;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.text.contentassist.IContentAssistant;
+import org.eclipse.jface.text.hyperlink.HyperlinkManager;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
+import org.eclipse.jface.text.hyperlink.IHyperlinkDetectorExtension2;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
+import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
+import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
+import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
+import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorComponent;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+import org.jboss.tools.jst.jsp.contentassist.RedHatCustomCompletionProposal;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor;
+import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.test.util.xpl.EditorTestHelper;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class StrutsJbide1762Test extends TestCase {
+ TestProjectProvider provider = null;
+ IProject project = null;
+ boolean makeCopy = false;
+ private static final String PROJECT_NAME = "StrutsJbide1762Test";
+ private static final String WEB_XML_NAME = "/WebContent/WEB-INF/web.xml";
+ private static final String NODE_TO_FIND = "taglib-location";
+
+ public static Test suite() {
+ return new TestSuite(StrutsJbide1762Test.class);
+ }
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.struts.text.ext.test", null, PROJECT_NAME, makeCopy);
+ project = provider.getProject();
+ Throwable exception = null;
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ } catch (Exception x) {
+ exception = x;
+ x.printStackTrace();
+ }
+ assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+
+ public void testStrutsJbide1762 () {
+ try {
+ EditorTestHelper.joinBackgroundActivities();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
+
+ IFile webXmlFile = project.getFile(WEB_XML_NAME);
+
+
+ assertTrue("The file \"" + WEB_XML_NAME + "\" is not found", (webXmlFile != null));
+ assertTrue("The file \"" + WEB_XML_NAME + "\" is not found", (webXmlFile.exists()));
+
+ FileEditorInput editorInput = new FileEditorInput(webXmlFile);
+ Throwable exception = null;
+ IEditorPart editorPart = null;
+ try {
+ editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(editorInput, "org.jboss.tools.common.model.ui.editor.EditorPartWrapper");
+ } catch (PartInitException ex) {
+ exception = ex;
+ ex.printStackTrace();
+ assertTrue("The XML Editor couldn't be initialized.", false);
+ }
+
+ EditorPartWrapper wrapperEditor = null;
+
+ if (editorPart instanceof EditorPartWrapper)
+ wrapperEditor = (EditorPartWrapper)editorPart;
+
+ // Delay for 3 seconds so that
+ // the Favorites view can be seen.
+ try {
+ EditorTestHelper.joinBackgroundActivities();
+ } catch (Exception e) {
+ e.printStackTrace();
+ assertTrue("Waiting for the jobs to complete has failed.", false);
+ }
+ TestUtil.delay(3000);
+
+// ITextEditor textEditor = TestUtil.getActiveTextEditor(wrapperEditor);
+ ITextEditor textEditor = getTextEditor(wrapperEditor);
+
+ XMLTextEditorComponent xmlTextEditor = null;
+
+ if (textEditor instanceof XMLTextEditorComponent) {
+ xmlTextEditor = (XMLTextEditorComponent)textEditor;
+ }
+
+// wrapperEditor.getJspEditor();
+ StructuredTextViewer viewer = xmlTextEditor.getTextViewer();
+ IDocument document = viewer.getDocument();
+ SourceViewerConfiguration config = TestUtil.getSourceViewerConfiguration(xmlTextEditor);
+ IHyperlinkDetector[] hyperlinkDetectors = (config == null ? null : config.getHyperlinkDetectors(viewer));
+
+ assertTrue("Cannot get the Hyperlink Detectors for the editor for page \"" + WEB_XML_NAME + "\"", (hyperlinkDetectors != null));
+
+ List<Region> regions = findTextRegions(document, NODE_TO_FIND);
+
+ assertTrue("Cannot get the regions to test for the editor for page \"" + WEB_XML_NAME + "\"", (regions != null && regions.size() > 0));
+
+ for (Region region : regions) {
+ IHyperlink hyperlink = null;
+ for (int i= 0; hyperlinkDetectors != null && i < hyperlinkDetectors.length; i++) {
+ IHyperlinkDetector detector= hyperlinkDetectors[i];
+ if (detector == null)
+ continue;
+
+ IHyperlink[] hyperlinks= detector.detectHyperlinks(viewer, region, false);
+ if (hyperlinks == null)
+ continue;
+
+ Assert.isLegal(hyperlinks.length > 0);
+
+ hyperlink = hyperlinks[0];
+ }
+
+ assertTrue("No Hyperlink found for the text region starting at offset" + region.getOffset() + ".", (hyperlink != null));
+ }
+
+ try {
+ EditorTestHelper.joinBackgroundActivities();
+ } catch (Exception e) {
+ e.printStackTrace();
+ assertTrue("Waiting for the jobs to complete has failed.", false);
+ }
+
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .closeEditor(editorPart, false);
+ }
+
+ protected ITextEditor getTextEditor(IEditorPart editor) {
+ ITextEditor textEditor = null;
+ if (editor instanceof ITextEditor)
+ textEditor = (ITextEditor) editor;
+ if (textEditor == null && editor != null)
+ textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
+ return textEditor;
+ }
+
+ List<Region> findTextRegions(IDocument document, String nodeName) {
+ List<Region> regions = new ArrayList<Region>();
+
+ String documentContent = document.get();
+
+ int index = 0;
+ while ((index = documentContent.indexOf("<" + nodeName, index)) != -1) {
+ int startNodeIndex = documentContent.indexOf(">", index);
+ if (startNodeIndex == -1) {
+ index = startNodeIndex;
+ continue;
+ }
+ startNodeIndex++;
+
+ int endNodeIndex = documentContent.indexOf("</" + nodeName, startNodeIndex);
+ if (endNodeIndex == -1) {
+ index = startNodeIndex;
+ continue;
+ }
+
+// System.out.println("Posting the Test Regions: " + documentContent.substring(startNodeIndex, endNodeIndex));
+ for (int j = startNodeIndex; j < endNodeIndex; j++) {
+ regions.add(new Region(j, 0));
+ }
+ index = documentContent.indexOf(">", endNodeIndex);
+ }
+
+ return regions;
+ }
+
+
+}
Property changes on: trunk/trunk/org.jboss.tools.struts.text.ext.test/src/org/jboss/tools/struts/text/tests/hyperlink/StrutsJbide1762Test.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r6275 - in trunk: trunk and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-02-12 12:46:28 -0500 (Tue, 12 Feb 2008)
New Revision: 6275
Added:
trunk/trunk/
trunk/trunk/org.jboss.tools.struts.text.ext.test/
Log:
Share project 'org.jboss.tools.struts.text.ext.test' into 'https://svn.jboss.org/repos/jbosstools/trunk'
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r6274 - trunk/tests/features/org.jboss.tools.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-02-12 12:17:48 -0500 (Tue, 12 Feb 2008)
New Revision: 6274
Modified:
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
Log:
vpe.jsp.test added to the test feature
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-02-12 17:12:28 UTC (rev 6273)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-02-12 17:17:48 UTC (rev 6274)
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.test_feature"
- label="Tools Tests"
- version="2.0.0">
-
- <description url="http://www.jboss.org/tools">
- JBossTools unit tests feature
- </description>
-
- <copyright>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.test_feature"
+ label="Tools Tests"
+ version="2.0.0">
+
+ <description url="http://www.jboss.org/tools">
+ JBossTools unit tests feature
+ </description>
+
+ <copyright>
Copyright (c) 2007 Exadel, Inc and 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:
-Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- </copyright>
-
- <license url="http://www.eclipse.org/legal/epl-v10.html">
+Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ </copyright>
+
+ <license url="http://www.eclipse.org/legal/epl-v10.html">
Eclipse Public License - v 1.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS
ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
@@ -214,147 +214,153 @@
No party to this Agreement will bring a legal action under this
Agreement more than one year after the cause of action arose.
Each party waives its rights to a jury trial in any resulting
-litigation.
- </license>
-
- <plugin
- id="org.jboss.tools.common.kb.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.model.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.verification.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.text.ext.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.verification.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.web.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.vpe.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jst.web.ui.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.seam.core.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.seam.ui.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.vpe.xulrunner.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.richfaces.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.ui.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.facelets.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.jsf.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.seam.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.jsf.vpe.html.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.struts.vpe.struts.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.jboss.tools.common.model.ui.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.jst.jsp.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
+litigation.
+ </license>
+
+ <plugin
+ id="org.jboss.tools.common.kb.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.model.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.verification.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.text.ext.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.verification.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.web.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jst.web.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.seam.core.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.seam.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.xulrunner.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.richfaces.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.facelets.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.jsf.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.seam.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.html.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.struts.vpe.struts.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.common.model.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jst.jsp.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jsf.vpe.jsp.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+</feature>
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r6273 - trunk/jbpm/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-02-12 12:12:28 -0500 (Tue, 12 Feb 2008)
New Revision: 6273
Modified:
trunk/jbpm/docs/reference/en/modules/Quick_Howto_Guide.xml
trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml
trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml
trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml
trunk/jbpm/docs/reference/en/modules/jboss_jbpm_runtime_installation.xml
trunk/jbpm/docs/reference/en/modules/the_views.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-155- adding "scale" attribute to the necessary images; putting fullstops and commas in proper positions.
Modified: trunk/jbpm/docs/reference/en/modules/Quick_Howto_Guide.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/Quick_Howto_Guide.xml 2008-02-12 17:09:45 UTC (rev 6272)
+++ trunk/jbpm/docs/reference/en/modules/Quick_Howto_Guide.xml 2008-02-12 17:12:28 UTC (rev 6273)
@@ -36,8 +36,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/Quick_Howto_Guide/quick_howto_guide_1.png"
- scalefit="1"/>
+ <imagedata fileref="images/Quick_Howto_Guide/quick_howto_guide_1.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -51,14 +50,14 @@
<para> You can add Tasks to Task nodes and then configure them in a similar manner as the
Action configuration mechanism. Let's consider the process definition similar
to the previous one that contains three nodes: Start state, Task node and End state. The
- Properties view for selected Task node includes several tabs. </para>
+ <property>Properties view</property> for selected Task node includes several tabs. </para>
<figure>
<title>The Properties View of the selected Task Node</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/Quick_Howto_Guide/quick_howto_guide_2.png"
- scalefit="1"/>
+ scale="75"/>
</imageobject>
</mediaobject>
</figure>
@@ -71,25 +70,25 @@
<mediaobject>
<imageobject>
<imagedata fileref="images/Quick_Howto_Guide/quick_howto_guide_3.png"
- scalefit="1"/>
+ scale="80"/>
</imageobject>
</mediaobject>
</figure>
<para>Every added Task has its own configuration possibilities. You can access them through
- the Properties view as well.</para>
+ the <property>Properties view</property> as well.</para>
<figure>
<title>The Task properties</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/Quick_Howto_Guide/quick_howto_guide_4.png"
- scalefit="1"/>
+ scale="80"/>
</imageobject>
</mediaobject>
</figure>
- <para>The <property>General</property> page is a place where you can specify the name of a
+ <para>The <property>General page</property> is a place where you can specify the name of a
Task and its description. For instance, let it be <emphasis>
<property>approve oder</property>
</emphasis> with appropriate description that you can see in the figure below.</para>
@@ -99,7 +98,7 @@
<mediaobject>
<imageobject>
<imagedata fileref="images/Quick_Howto_Guide/quick_howto_guide_5.png"
- scalefit="1"/>
+ scale="80"/>
</imageobject>
</mediaobject>
</figure>
@@ -120,7 +119,7 @@
<mediaobject>
<imageobject>
<imagedata fileref="images/Quick_Howto_Guide/quick_howto_guide_6.png"
- scalefit="1"/>
+ scale="80"/>
</imageobject>
</mediaobject>
</figure>
@@ -132,19 +131,19 @@
<property>Notify</property>
</emphasis> attributes. It means that the Task should be accomplished in 2 business days
and the assignee will be notified by email when the task is assigned. To specify how the
- Task should be assigned switch on to the <property>Assignment</property> page.</para>
+ Task should be assigned switch on to the <property>Assignment page</property>.</para>
<figure>
<title>The Task Assignment Page</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/Quick_Howto_Guide/quick_howto_guide_7.png"
- scalefit="1"/>
+ scale="80"/>
</imageobject>
</mediaobject>
</figure>
- <para>On the Reminder page you can specify whether the assignee will be reminded of the task
+ <para>On the <property>Reminder page</property> you can specify whether the assignee will be reminded of the task
that awaits him.</para>
<figure>
@@ -152,7 +151,7 @@
<mediaobject>
<imageobject>
<imagedata fileref="images/Quick_Howto_Guide/quick_howto_guide_8.png"
- scalefit="1"/>
+ scale="80"/>
</imageobject>
</mediaobject>
</figure>
@@ -165,7 +164,7 @@
<mediaobject>
<imageobject>
<imagedata fileref="images/Quick_Howto_Guide/quick_howto_guide_9.png"
- scalefit="1"/>
+ scale="80"/>
</imageobject>
</mediaobject>
</figure>
Modified: trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml 2008-02-12 17:09:45 UTC (rev 6272)
+++ trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml 2008-02-12 17:12:28 UTC (rev 6273)
@@ -27,7 +27,7 @@
Library container and the most important of them is the <emphasis>
<property>.jar</property>
</emphasis> file containing the core jBPM classes. While working on the project you could
- find them all in the Package Explorer.</para>
+ find them all in the <property>Package Explorer</property>.</para>
<figure>
<title>The jBPM Libraries</title>
@@ -99,7 +99,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_2b.png" scale="75"/>
+ <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_2b.png"/>
</imageobject>
</mediaobject>
</figure>
Modified: trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml 2008-02-12 17:09:45 UTC (rev 6272)
+++ trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml 2008-02-12 17:12:28 UTC (rev 6273)
@@ -32,15 +32,15 @@
signalling. </para>
<para> To make things a little bit more concrete, let's create a new class called <emphasis>
- <property>HelloActionHandler</property>
- </emphasis>. For that firstly we'll create a new package <emphasis>
+ <property>HelloActionHandler</property>.
+ </emphasis> For that firstly we'll create a new package <emphasis>
<property>com.jbay.action</property>
</emphasis> in the <emphasis>
<property>src/java/main</property>
</emphasis> folder of our project. Then, we should call New Class Creation wizard as
usual by right-clicking and navigating <emphasis>
- <property>New > Class</property>
- </emphasis>. </para>
+ <property>New > Class</property>.
+ </emphasis> </para>
<figure>
<title>Creating HelloActionHendler Class</title>
@@ -81,8 +81,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_2.png"
- scale="75"/>
+ <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_2.png" scale="75"/>
</imageobject>
</mediaobject>
</figure>
@@ -127,8 +126,8 @@
transition from the start state to the auction state. So after the signal, the process
should be in the auction state as in the previous scenario. But moreover, the <emphasis>
<property>greeting</property>
- </emphasis> variable should exist and contain the string "Hello from
- ActionHandler". That's what we assert in the last lines of the test
+ </emphasis> variable should exist and contain the string <emphasis>"Hello from
+ ActionHandler"</emphasis>. That's what we assert in the last lines of the test
method.</para>
@@ -160,7 +159,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_5.png"/>
+ <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_5.png" scale="80"/>
</imageobject>
</mediaobject>
</figure>
@@ -172,7 +171,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_6.png"/>
+ <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_6.png" scale="80"/>
</imageobject>
</mediaobject>
</figure>
@@ -187,8 +186,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_7.png"
- scale="75"/>
+ <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_7.png" scale="80"/>
</imageobject>
</mediaobject>
</figure>
@@ -220,7 +218,7 @@
<mediaobject>
<imageobject>
<imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_10.png"
- scale="75"/>
+ scale="70"/>
</imageobject>
</mediaobject>
</figure>
Modified: trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml 2008-02-12 17:09:45 UTC (rev 6272)
+++ trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml 2008-02-12 17:12:28 UTC (rev 6273)
@@ -136,7 +136,7 @@
<mediaobject>
<imageobject>
<imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour6.png"
- scale="75"/>
+ scale="60"/>
</imageobject>
</mediaobject>
</figure>
@@ -147,8 +147,8 @@
with two .xml files : <emphasis>
<property>gpd.xml</property>
</emphasis> and <emphasis>
- <property>processdefinition.xml</property>
- </emphasis>.</para>
+ <property>processdefinition.xml</property>.
+ </emphasis></para>
<para>The <emphasis>
<property>gpd.xml</property>
</emphasis> contains the graphical information used by the process
@@ -171,8 +171,8 @@
<?dbhtml filename="adding_the_nodes.html"?>
<title>Adding the Nodes</title>
<para>At first select respectively <emphasis>
- <property>Start</property>
- </emphasis>, <emphasis>
+ <property>Start</property>,
+ </emphasis> <emphasis>
<property>State</property>
</emphasis> and <emphasis>
<property>End</property>
@@ -182,8 +182,8 @@
<title>A Simple Process With Three Nodes</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour7.png"
- scale="75"/>
+ <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour7.png"
+ scale="60"/>
</imageobject>
</mediaobject>
</figure>
@@ -208,7 +208,7 @@
<mediaobject>
<imageobject>
<imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour8.png"
- scale="75"/>
+ scale="60"/>
</imageobject>
</mediaobject>
</figure>
Modified: trunk/jbpm/docs/reference/en/modules/jboss_jbpm_runtime_installation.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/jboss_jbpm_runtime_installation.xml 2008-02-12 17:09:45 UTC (rev 6272)
+++ trunk/jbpm/docs/reference/en/modules/jboss_jbpm_runtime_installation.xml 2008-02-12 17:12:28 UTC (rev 6273)
@@ -23,8 +23,8 @@
some situations with Sun-based VMs.</para></note>
<para>Navigate to <emphasis>
- <property>Window > Preferences > JBoss jBPM > Runtime Locations</property>
- </emphasis>. Here you can add, edit and remove JBoss jBPM installation locations. Click <emphasis>
+ <property>Window > Preferences > JBoss jBPM > Runtime Locations</property>.
+ </emphasis> Here you can add, edit and remove JBoss jBPM installation locations. Click <emphasis>
<property>Add</property>
</emphasis> button. In the dialog that appeared enter a name for a newly added jBPM runtime and
point to the correct location of this package on your harddrive. Click <emphasis>
Modified: trunk/jbpm/docs/reference/en/modules/the_views.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/the_views.xml 2008-02-12 17:09:45 UTC (rev 6272)
+++ trunk/jbpm/docs/reference/en/modules/the_views.xml 2008-02-12 17:12:28 UTC (rev 6273)
@@ -13,33 +13,34 @@
<para>The views are used for representation and navigation the resources you are working on at
the moment. One of the advantages of all the views is that all modifications made in the
currant-active file are immediately displayed in them. Let’s get acquainted more closely
- with those that the jPDL perspective provides. </para>
+ with those that the <property>jPDL perspective</property> provides. </para>
<figure>
<title>The jPDL Perspective Views and Editors</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/the_views/the_views.png" scale="75"/>
+ <imagedata fileref="images/the_views/the_views.png" scale="60"/>
</imageobject>
</mediaobject>
</figure>
- <para>As you can see in the picture above, the jPDL perspective contains a complete set of
+ <para>As you can see in the picture above, the <property>jPDL perspective</property> contains a complete set of
functionality that's necessary for working on the jBPM project.</para>
<section id="the_outline_view">
<?dbhtml filename="the_outline_view.html"?>
<title>The Outline View</title>
- <para>To have a way to quickly see an outline of the process use the Outline view that is
+ <para>To have a way to quickly see an outline of the process use the <emphasis>
+ <property>Outline view</property></emphasis> that is
presented as the classical tree. If it is not visible select <emphasis>
- <property>Window > Show view > Outline</property>
- </emphasis>.</para>
+ <property>Window > Show view > Outline</property>.
+ </emphasis></para>
<figure>
<title>The Overview View</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/the_views/the_views1.png" scale="75"/>
+ <imagedata fileref="images/the_views/the_views1.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -49,14 +50,15 @@
<?dbhtml filename="the_outline_view.html"?>
<title>The Overview</title>
<para>The main advantage of this view is that it gives visual representation of the whole
- currant-developing process. Besides, the Overview comes as a scrollable thumbnail which
+ currant-developing process. Besides, the <emphasis>
+ <property>Overview</property></emphasis> comes as a scrollable thumbnail which
enables a better navigation of the process structure if it's too large.</para>
<figure>
<title>The Overview</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/the_views/the_views2.png" scale="75"/>
+ <imagedata fileref="images/the_views/the_views2.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -67,8 +69,8 @@
<title>The Properties View</title>
<para> Here, we dwell on the JBDS <property>Properties view</property>.</para>
<para>Notice if it's not visible you can access it by navigating <emphasis>
- <property>Window > Show view > Properties</property>
- </emphasis>.</para>
+ <property>Window > Show view > Properties</property>.
+ </emphasis></para>
<para>The view shows the relevant properties of the selected item in the tabbed form. Every
item has its own set of properties, which can be directly editable in the Properties
view or by brining up the context menu.</para>
@@ -84,11 +86,11 @@
<para>For example, on the picture above the Properties view displays all the properties for
a selected transition. Its name has been changed to <emphasis>
- <property>to_auction</property>
- </emphasis>. We've done it directly in active General tab of the view. The same
+ <property>to_auction</property>.
+ </emphasis> We've done it directly in active General tab of the view. The same
way let's change the name for the second transition to <emphasis>
- <property>to_end</property>
- </emphasis>.</para>
+ <property>to_end</property>.
+ </emphasis></para>
<para>If no one item is selected, the view represents the properties of the whole process
definition. </para>
@@ -102,17 +104,17 @@
</figure>
<para>In this case, it contains six tabs. The first one is the <emphasis>
- <property>General</property></emphasis>. It allows to specify
+ <property>General</property>.</emphasis> It allows to specify
a process name and add necessary description. To illustrate let's change the process
definition name to <emphasis>
- <property>jbay</property>
+ <property>jbay</property>.
</emphasis></para>
</section>
<section id="jbpm_gpd_editor">
<?dbhtml filename="direct_editing.html"?>
<title>The jBPM Graphical Process Designer editor.</title>
- <para>The jBPM GPD editor includes four modes: Diagram, Deployment, Design and Source, which
+ <para>The <property>jBPM GPD editor</property> includes four modes: Diagram, Deployment, Design and Source, which
are available as switchable tabs at the bottom of the editor. Let's dwell on
each of them.</para>
@@ -130,14 +132,14 @@
</mediaobject>
</figure>
- <para>Besides, some properties can be directly edited in the Diagram mode of the
+ <para>Besides, some properties can be directly edited in the <property>Diagram mode</property> of the
graphical editor. One example of this is the <emphasis>
<property>name</property>
</emphasis> property of nodes. You can edit this directly by selecting the node of
which you want to change the name and then click once inside this node. This enables
an editor in the node. We change the name of the node to <emphasis>
- <property>auction</property>
- </emphasis>.</para>
+ <property>auction</property>.
+ </emphasis></para>
</section>
<section id="source_mode">
@@ -155,7 +157,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>The Source mode enables to easily manipulate our XML. That is manually inserting
+ <para>The <property>Source mode</property> enables to easily manipulate our XML. That is manually inserting
and editing necessary elements or attributes. In addition, here you can take
advantage of content assist.</para>
</section>
@@ -180,8 +182,8 @@
directly edited in the second column of the Design mode table.</para>
<para>For instance, let’s add a comment on the second transition. For that, you should
bring up the context menu for it and choose <emphasis>
- <property>Add Before > Comment</property>
- </emphasis>.</para>
+ <property>Add Before > Comment</property>.
+ </emphasis></para>
<figure>
<title>Adding a Comment</title>
@@ -209,7 +211,7 @@
<?dbhtml filename="the_deployment_view.html"?>
<title>The Deployment Mode</title>
<para>Finally, to adjust the deployment settings of the project you should switch on to
- the tab that opens the Deployment mode. On the picture below the Deployment mode is
+ the tab that opens the <property>Deployment mode</property>. On the picture below the <property>Deployment mode</property> is
performed with default settings. Here, you can easily modify them or, if the
settings won't match your needs, to reset defaults. </para>
<figure>
@@ -229,5 +231,5 @@
</section>
- <para>Now that we've seen how to work with jPDL perspective, let's pass on to the project testing.</para>
+ <para>Now that we've seen how to work with <property>jPDL perspective</property>, let's pass on to the project testing.</para>
</chapter>
16 years, 4 months
- 1
- 0