JBoss Tools SVN: r39180 - trunk/usage/tests/org.jboss.tools.usage.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-28 12:45:03 -0500 (Tue, 28 Feb 2012)
New Revision: 39180
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/pom.xml
Log:
fix for usage tests coverage report
Modified: trunk/usage/tests/org.jboss.tools.usage.test/pom.xml
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/pom.xml 2012-02-28 16:22:50 UTC (rev 39179)
+++ trunk/usage/tests/org.jboss.tools.usage.test/pom.xml 2012-02-28 17:45:03 UTC (rev 39180)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter />
- <emma.instrument.bundles />
+ <emma.filter>org.jboss.tools.usage*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.usage</emma.instrument.bundles>
</properties>
</project>
\ No newline at end of file
12 years, 9 months
JBoss Tools SVN: r39179 - trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/utils.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-02-28 11:22:50 -0500 (Tue, 28 Feb 2012)
New Revision: 39179
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/utils/ValidationMessages.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/utils/ValidationMessages.properties
Log:
Fixed - JBIDE-11069 - Wrong/Missing marker information on JAX-RS validation errors
https://issues.jboss.org/browse/JBIDE-11069
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/utils/ValidationMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/utils/ValidationMessages.java 2012-02-28 16:18:06 UTC (rev 39178)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/utils/ValidationMessages.java 2012-02-28 16:22:50 UTC (rev 39179)
@@ -19,6 +19,8 @@
public static String INVALID_CONTEXT_ANNOTATION;
public static String INVALID_PATHPARAM_VALUE;
+
+ public static String LINE_NUMBER;
static {
NLS.initializeMessages(BUNDLE_NAME, ValidationMessages.class);
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/utils/ValidationMessages.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/utils/ValidationMessages.properties 2012-02-28 16:18:06 UTC (rev 39178)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/utils/ValidationMessages.properties 2012-02-28 16:22:50 UTC (rev 39179)
@@ -1 +1,3 @@
-INVALID_CONTEXT_ANNOTATION=The parameter type ''{0}'' cannot be annotated with @Context INVALID_PATHPARAM_VALUE=Invalid @PathParam value: expected ''{0}''
\ No newline at end of file
+INVALID_CONTEXT_ANNOTATION=The parameter type ''{0}'' cannot be annotated with @Context
+INVALID_PATHPARAM_VALUE=Invalid @PathParam value: expected ''{0}''
+LINE_NUMBER=line {0}
\ No newline at end of file
12 years, 10 months
JBoss Tools SVN: r39178 - trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-02-28 11:18:06 -0500 (Tue, 28 Feb 2012)
New Revision: 39178
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java
Log:
Fixed - JBIDE-11069 - Wrong/Missing marker information on JAX-RS validation errors
https://issues.jboss.org/browse/JBIDE-11069
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java 2012-02-28 16:17:03 UTC (rev 39177)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java 2012-02-28 16:18:06 UTC (rev 39178)
@@ -31,10 +31,12 @@
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jface.text.TypedRegion;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.validation.ValidatorMessage;
@@ -42,6 +44,7 @@
import org.jboss.tools.ws.jaxrs.core.internal.utils.Logger;
import org.jboss.tools.ws.jaxrs.core.internal.utils.ValidationMessages;
import org.jboss.tools.ws.jaxrs.core.jdt.Annotation;
+import org.jboss.tools.ws.jaxrs.core.jdt.CompilationUnitsRepository;
import org.jboss.tools.ws.jaxrs.core.jdt.JavaMethodParameter;
import org.jboss.tools.ws.jaxrs.core.jdt.JavaMethodSignature;
import org.jboss.tools.ws.jaxrs.core.metamodel.EnumElementKind;
@@ -235,8 +238,9 @@
* , {@link Request}, {@link HttpServletResponse} and {@link Response}.
*
* @return
+ * @throws JavaModelException
*/
- private List<ValidatorMessage> validateParamsWithContextAnnotation() {
+ private List<ValidatorMessage> validateParamsWithContextAnnotation() throws JavaModelException {
final List<ValidatorMessage> messages = new ArrayList<ValidatorMessage>();
for (JavaMethodParameter parameter : this.javaMethodParameters) {
final Annotation annotation = parameter.getAnnotation(Context.class
@@ -295,8 +299,9 @@
* the {@link Path} annotations at the method and the parent type levels.
*
* @return errors in case of mismatch, empty list otherwise.
+ * @throws JavaModelException
*/
- private List<ValidatorMessage> validateMissingPathValueInPathParamAnnotations() {
+ private List<ValidatorMessage> validateMissingPathValueInPathParamAnnotations() throws JavaModelException {
final List<ValidatorMessage> messages = new ArrayList<ValidatorMessage>();
final List<String> pathParamValueProposals = getPathParamValueProposals();
for (JavaMethodParameter parameter : this.javaMethodParameters) {
@@ -324,11 +329,16 @@
* @param severity the severity of the marker
* @param region the region that the validation marker points to
* @return the created validation message.
+ * @throws JavaModelException
*/
private ValidatorMessage createValidationMessage(final String msg,
- int severity, final int offset, int length) {
+ int severity, final int offset, int length) throws JavaModelException {
final ValidatorMessage validationMsg = ValidatorMessage.create(msg,
this.getResource());
+ validationMsg.setType(JaxrsMetamodelBuilder.JAXRS_PROBLEM);
+ final ICompilationUnit compilationUnit = this.getJavaElement().getCompilationUnit();
+ final CompilationUnit ast = CompilationUnitsRepository.getInstance().getAST(compilationUnit);
+ validationMsg.setAttribute(IMarker.LOCATION, NLS.bind(ValidationMessages.LINE_NUMBER, ast.getLineNumber(offset)));
validationMsg.setAttribute(IMarker.MARKER,
JaxrsMetamodelBuilder.JAXRS_PROBLEM);
validationMsg.setAttribute(IMarker.SEVERITY, severity);
12 years, 10 months
JBoss Tools SVN: r39177 - in branches/jbosstools-3.3.0.Beta1/as/plugins: org.jboss.ide.eclipse.as.core/META-INF and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-28 11:17:03 -0500 (Tue, 28 Feb 2012)
New Revision: 39177
Modified:
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.71.default.ports.properties
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java
Log:
JBIDE-11058 to branch beta1
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2012-02-28 16:14:54 UTC (rev 39176)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2012-02-28 16:17:03 UTC (rev 39177)
@@ -34,6 +34,7 @@
org.jboss.ide.eclipse.as.core.modules,
org.jboss.ide.eclipse.as.core.publishers,
org.jboss.ide.eclipse.as.core.publishers.patterns,
+ org.jboss.ide.eclipse.as.core.resolvers,
org.jboss.ide.eclipse.as.core.server,
org.jboss.ide.eclipse.as.core.server.bean,
org.jboss.ide.eclipse.as.core.server.internal,
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2012-02-28 16:14:54 UTC (rev 39176)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2012-02-28 16:17:03 UTC (rev 39177)
@@ -27,7 +27,9 @@
import org.jaxen.SimpleNamespaceContext;
import org.jaxen.XPath;
import org.jaxen.dom4j.Dom4jXPath;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
+import org.jboss.ide.eclipse.as.core.resolvers.ConfigNameResolver;
import org.jboss.ide.eclipse.as.core.util.IMemento;
/**
@@ -45,6 +47,7 @@
protected String baseDir;
protected volatile String effectiveBaseDir;
protected String filePattern;
+ protected volatile String effectiveFilePattern;
protected String xpathPattern;
protected String attribute;
@@ -69,6 +72,7 @@
this.xpathPattern = memento.getString("xpathPattern"); //$NON-NLS-1$
this.attribute = memento.getString("attribute"); //$NON-NLS-1$
setEffectiveBaseDir();
+ setEffectiveFilePattern();
}
public XPathQuery(String name, List list) {
@@ -78,6 +82,7 @@
this.xpathPattern = list.get(2).equals(XPathModel.EMPTY_STRING) ? null : (String)list.get(2);
this.attribute = list.size() < 3 || list.get(3).equals(XPathModel.EMPTY_STRING) ? null : (String)list.get(3);
setEffectiveBaseDir();
+ setEffectiveFilePattern();
}
public XPathQuery(IServer server, String name, String baseDir,
@@ -90,40 +95,33 @@
this.attribute = attribute;
this.results = null;
setEffectiveBaseDir();
+ setEffectiveFilePattern();
}
private void setEffectiveBaseDir() {
String serverName = server == null ? "" : server.getName(); //$NON-NLS-1$
String dir1 = baseDir == null ? null : baseDir;
-
- String dir2 = null;
- if( dir1 != null ) {
- dir2 = dir1.replace("${jboss_config_dir}", //$NON-NLS-1$
- "${jboss_config_dir:" + serverName + "}"); //$NON-NLS-1$ //$NON-NLS-2$
- dir2 = dir2.replace("${jboss_config}", //$NON-NLS-1$
- "${jboss_config:" + serverName + "}"); //$NON-NLS-1$ //$NON-NLS-2$
-
- try {
- StringSubstitutionEngine engine = new StringSubstitutionEngine();
- dir2 = engine.performStringSubstitution(dir2, true,
- true, StringVariableManager.getDefault());
- } catch( CoreException ce ) {}
- }
-
-
+ String dir2 = new ConfigNameResolver().performSubstitutions(dir1, serverName);
IPath dir = dir2 == null ? null : new Path(dir2);
if( dir == null && category != null) {
dir = getCategory().getServer().getRuntime().getLocation();
}
if( dir != null && !dir.isAbsolute() && category != null)
dir = getCategory().getServer().getRuntime().getLocation().append(dir);
-
effectiveBaseDir = dir == null ? null : dir.toString();
}
+ private void setEffectiveFilePattern() {
+ String serverName = server == null ? "" : server.getName(); //$NON-NLS-1$
+ String pattern = filePattern == null ? null : filePattern;
+ String pattern2 = new ConfigNameResolver().performSubstitutions(pattern, serverName);
+ effectiveFilePattern = pattern2;
+ }
+
+
protected AntFileFilter getFilter() {
if( filter == null ) {
- filter = new AntFileFilter(effectiveBaseDir, filePattern);
+ filter = new AntFileFilter(effectiveBaseDir, effectiveFilePattern);
}
return filter;
}
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java 2012-02-28 16:14:54 UTC (rev 39176)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/resolvers/ConfigNameResolver.java 2012-02-28 16:17:03 UTC (rev 39177)
@@ -11,6 +11,8 @@
package org.jboss.ide.eclipse.as.core.resolvers;
+import org.eclipse.core.internal.variables.StringSubstitutionEngine;
+import org.eclipse.core.internal.variables.StringVariableManager;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.variables.IDynamicVariable;
@@ -18,31 +20,83 @@
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerCore;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.LocalJBoss7ServerRuntime;
/**
* These classes are primarily geared for as6-and-below
* and are meant to serve as a dereferencing point to discover
* the configuration name and it's parent directory in the case
* other portions of the tool, such as xpaths or classpaths,
* want to use these variables in their saved strings.
- *
- * They are not really geared for use with as7 and above, and their
- * behaviour with regards to as7 and above are officially undefined,
- * though unofficially both should return the empty string in these cases
- * @author rob
- *
*/
public class ConfigNameResolver implements IDynamicVariableResolver {
+ public static final String JBOSS_CONFIG = "jboss_config"; //$NON-NLS-1$
+ public static final String JBOSS_CONFIG_DIR = "jboss_config_dir"; //$NON-NLS-1$
+ public static final String JBOSS_AS7_CONFIG_FILE = "jboss_config_file"; //$NON-NLS-1$
+
+ /*
+ * entry points to fill out the server name in these variable substitutions
+ */
+
+ /**
+ * Kick off the substitution engine for this string, doing
+ * server-related replacements (adding variables) beforehand.
+ *
+ * @param dir1
+ * @param serverName
+ * @return
+ */
+ public String performSubstitutions(String dir1, String serverName) {
+ String dir2 = null;
+ if( dir1 != null ) {
+ dir2 = replace(dir1, ConfigNameResolver.JBOSS_CONFIG, serverName);
+ dir2 = replace(dir2, ConfigNameResolver.JBOSS_CONFIG_DIR, serverName);
+ dir2 = replace(dir2, ConfigNameResolver.JBOSS_AS7_CONFIG_FILE, serverName);
+
+ try {
+ StringSubstitutionEngine engine = new StringSubstitutionEngine();
+ dir2 = engine.performStringSubstitution(dir2, true,
+ true, StringVariableManager.getDefault());
+ } catch( CoreException ce ) {
+ JBossServerCorePlugin.log(ce.getStatus());
+ }
+ }
+ return dir2;
+ }
+
+ private String replace(String original, String variable, String serverName) {
+ if( original != null ) {
+ return original.replace(getVariablePattern(variable), getVariablePattern(variable, serverName));
+ }
+ return null;
+ }
+
+ private String getVariablePattern(String var) {
+ return "${" + var + "}"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ private String getVariablePattern(String var, String serverName) {
+ return "${" + var + ":" + serverName + "}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+
+
+ /*
+ * Actual resolution of these dynamic variables are performed below
+ */
+
public String resolveValue(IDynamicVariable variable, String argument)
throws CoreException {
- if( variable.getName().equals("jboss_config")) //$NON-NLS-1$
+ if( variable.getName().equals(JBOSS_CONFIG))
return handleConfig(variable, argument);
- if( variable.getName().equals("jboss_config_dir")) //$NON-NLS-1$
+ if( variable.getName().equals(JBOSS_CONFIG_DIR))
return handleConfigDir(variable, argument);
+ if( variable.getName().equals(JBOSS_AS7_CONFIG_FILE))
+ return handleAS7ConfigFile(variable, argument);
return null;
}
-
+
protected String handleConfig(IDynamicVariable variable, String argument) {
IJBossServerRuntime ajbsrt = findJBossServerRuntime(argument);
if( ajbsrt != null ) {
@@ -66,6 +120,14 @@
return null;
}
+ protected String handleAS7ConfigFile(IDynamicVariable variable, String argument) {
+ IJBossServerRuntime ajbsrt = findJBossServerRuntime(argument);
+ if( ajbsrt != null && ajbsrt instanceof LocalJBoss7ServerRuntime) {
+ return ((LocalJBoss7ServerRuntime)ajbsrt).getConfigurationFile();
+ }
+ return null;
+ }
+
private IJBossServerRuntime findJBossServerRuntime(String serverName) {
IServer[] servers = ServerCore.getServers();
for( int i = 0; i < servers.length; i++ ) {
@@ -82,7 +144,6 @@
}
}
return null;
-
}
}
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2012-02-28 16:14:54 UTC (rev 39176)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2012-02-28 16:17:03 UTC (rev 39177)
@@ -1123,6 +1123,12 @@
resolver="org.jboss.ide.eclipse.as.core.resolvers.ConfigNameResolver"
supportsArgument="true">
</variable>
+ <variable
+ name="jboss_config_file"
+ description="Returns the full path of the configuration file for the server who's name matches the variable, or, if none, the runtime who's name matches the variable"
+ resolver="org.jboss.ide.eclipse.as.core.resolvers.ConfigNameResolver"
+ supportsArgument="true">
+ </variable>
</extension>
<extension
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties 2012-02-28 16:14:54 UTC (rev 39176)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties 2012-02-28 16:17:03 UTC (rev 39177)
@@ -3,4 +3,4 @@
JBoss_Web_ATTRIBUTE=port
JBoss_Management=//*[local-name()="management-interfaces"]/*[local-name()="native-interface"]
JBoss_Management_ATTRIBUTE=port
-JBoss_Management_FILE=standalone/configuration/standalone.xml
\ No newline at end of file
+JBoss_Management_FILE=standalone/configuration/${jboss_config_file}
\ No newline at end of file
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.71.default.ports.properties
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.71.default.ports.properties 2012-02-28 16:14:54 UTC (rev 39176)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.71.default.ports.properties 2012-02-28 16:17:03 UTC (rev 39177)
@@ -3,4 +3,4 @@
JBoss_Web_ATTRIBUTE=port
JBoss_Management=//*[local-name()="socket-binding-group"]/*[local-name()="socket-binding"][@name="management-native"]
JBoss_Management_ATTRIBUTE=port
-JBoss_Management_FILE=standalone/configuration/standalone.xml
\ No newline at end of file
+JBoss_Management_FILE=standalone/configuration/${jboss_config_file}
\ No newline at end of file
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF 2012-02-28 16:14:54 UTC (rev 39176)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF 2012-02-28 16:17:03 UTC (rev 39177)
@@ -28,7 +28,6 @@
org.eclipse.rse.ui;bundle-version="3.2.0",
org.eclipse.wst.server.ui;bundle-version="1.1.305",
org.eclipse.debug.ui;bundle-version="3.7.0",
- org.eclipse.rse.subsystems.shells.dstore;bundle-version="2.1.300",
org.eclipse.rse.subsystems.shells.local;bundle-version="2.1.300",
org.eclipse.rse.subsystems.shells.ssh;bundle-version="2.1.300",
org.eclipse.rse.subsystems.shells.telnet;bundle-version="1.2.200",
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java 2012-02-28 16:14:54 UTC (rev 39176)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java 2012-02-28 16:17:03 UTC (rev 39177)
@@ -67,6 +67,7 @@
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery;
+import org.jboss.ide.eclipse.as.core.resolvers.ConfigNameResolver;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -372,25 +373,23 @@
final String xpText = xpathText.getText();
final String attText = attributeText.getText();
- final String filePattern = filesetText.getText();
+ String filePattern = filesetText.getText();
String directory = baseDirText.getText();
- directory = directory.replace("${jboss_config_dir}", //$NON-NLS-1$
- "${jboss_config_dir:" + server.getName() + "}"); //$NON-NLS-1$ //$NON-NLS-2$
- directory = directory.replace("${jboss_config}", //$NON-NLS-1$
- "${jboss_config:" + server.getName() + "}"); //$NON-NLS-1$ //$NON-NLS-2$
- try {
- StringSubstitutionEngine engine = new StringSubstitutionEngine();
- directory = engine.performStringSubstitution(directory, true,
- true, StringVariableManager.getDefault());
- } catch( CoreException ce ) {}
+
+ // substitute in basedir
+ directory = new ConfigNameResolver().performSubstitutions(directory, server.getName());
if( !new Path(directory).isAbsolute()) {
directory = server.getRuntime().getLocation().append(directory).toString();
}
-
final String directory2 = directory;
+
+ // substitute in filePattern
+ filePattern = new ConfigNameResolver().performSubstitutions(filePattern, server.getName());
+ final String filePattern2 = filePattern;
+
IRunnableWithProgress op = new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- XPathQuery tmp = new XPathQuery(null, "", directory2, filePattern, xpText, attText); //$NON-NLS-1$
+ XPathQuery tmp = new XPathQuery(null, "", directory2, filePattern2, xpText, attText); //$NON-NLS-1$
tmp.setRepository(repository);
final ArrayList<XPathFileResult> list = new ArrayList<XPathFileResult>();
list.addAll(Arrays.asList(tmp.getResults()));
@@ -413,7 +412,9 @@
try {
new ProgressMonitorDialog(new Shell()).run(true, true, op);
} catch (InvocationTargetException e) {
+ //Do not need to do anything
} catch (InterruptedException e) {
+ //Do not need to do anything
}
}
protected void layoutWidgets(Composite c) {
12 years, 10 months
JBoss Tools SVN: r39176 - branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-28 11:14:54 -0500 (Tue, 28 Feb 2012)
New Revision: 39176
Modified:
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java
Log:
JBIDE-11071 to branch beta1
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java 2012-02-28 16:14:14 UTC (rev 39175)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java 2012-02-28 16:14:54 UTC (rev 39176)
@@ -69,8 +69,8 @@
Label top = new Label(main, SWT.NONE);
Label userLabel = new Label(main, SWT.NONE);
Label passLabel = new Label(main, SWT.NONE);
- final Text userText = new Text(main, SWT.DEFAULT);
- final Text passText = new Text(main, SWT.DEFAULT);
+ final Text userText = new Text(main, SWT.SINGLE | SWT.BORDER);
+ final Text passText = new Text(main, SWT.SINGLE | SWT.BORDER | SWT.PASSWORD);
userText.setEditable(true);
passText.setEditable(true);
final Button saveCredentials = new Button(main, SWT.CHECK);
12 years, 10 months
JBoss Tools SVN: r39175 - in branches/jbosstools-3.3.0.Beta1/as/plugins: org.jboss.ide.eclipse.as.ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-28 11:14:14 -0500 (Tue, 28 Feb 2012)
New Revision: 39175
Modified:
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-11055 to branch beta1
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-02-28 16:12:11 UTC (rev 39174)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-02-28 16:14:14 UTC (rev 39175)
@@ -28,20 +28,14 @@
import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.WEB_PORT_DETECT;
import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.WEB_PORT_DETECT_XPATH;
-import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLEncoder;
import java.util.Date;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.eclipse.equinox.security.storage.EncodingUtils;
-import org.eclipse.equinox.security.storage.ISecurePreferences;
-import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
-import org.eclipse.equinox.security.storage.StorageException;
import org.eclipse.jst.server.core.IWebModule;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
@@ -250,7 +244,7 @@
// first class parameters
public String getUsername() {
- return getAttribute(SERVER_USERNAME, ""); //$NON-NLS-1$
+ return getAttribute(SERVER_USERNAME, "admin"); //$NON-NLS-1$
}
public void setUsername(String name) {
setAttribute(SERVER_USERNAME, name);
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java 2012-02-28 16:12:11 UTC (rev 39174)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java 2012-02-28 16:14:14 UTC (rev 39175)
@@ -11,6 +11,7 @@
package org.jboss.ide.eclipse.as.ui.editor;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
@@ -68,12 +69,12 @@
Label username = toolkit.createLabel(composite, Messages.swf_Username);
username.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
- String n = helper.getAttribute(IJBossToolingConstants.SERVER_USERNAME, ""); //$NON-NLS-1$
+ String n = ServerConverter.getJBossServer(server.getOriginal()).getUsername();
String p = ServerConverter.getJBossServer(server.getOriginal()).getPassword();
nameText = toolkit.createText(composite, n);
Label password = toolkit.createLabel(composite, Messages.swf_Password);
password.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
- passText = toolkit.createText(composite, p);
+ passText = toolkit.createText(composite, p, SWT.SINGLE | SWT.PASSWORD);
passwordString = p;
d = new GridData(); d.grabExcessHorizontalSpace = true; d.widthHint = 100;
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2012-02-28 16:12:11 UTC (rev 39174)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2012-02-28 16:14:14 UTC (rev 39175)
@@ -186,13 +186,13 @@
class="org.jboss.ide.eclipse.as.ui.editor.ServerPasswordSection"
id="org.jboss.ide.eclipse.as.ui.editor.passwordSection"
insertionId="org.eclipse.wst.server.editor.overview.left"
- order="10"
+ order="9"
typeIds="%AllJBossServerTypes"/>
<section
class="org.jboss.ide.eclipse.as.ui.editor.ServerModeSection"
id="org.jboss.ide.eclipse.as.ui.editor.serverModeSection"
insertionId="org.eclipse.wst.server.editor.overview.left"
- order="9"
+ order="10"
typeIds="%AllJBTServerTypes"/>
<!-- NEW_SERVER_ADAPTER Add the server editor sections for a new server above this line -->
12 years, 10 months
JBoss Tools SVN: r39174 - trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/xpl.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-02-28 11:12:11 -0500 (Tue, 28 Feb 2012)
New Revision: 39174
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/xpl/JSFAppConfigUtils.java
Log:
JBIDE-11078 fix NPE when creating utility project with war packaging
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/xpl/JSFAppConfigUtils.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/xpl/JSFAppConfigUtils.java 2012-02-28 16:09:23 UTC (rev 39173)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/utils/xpl/JSFAppConfigUtils.java 2012-02-28 16:12:11 UTC (rev 39174)
@@ -74,14 +74,15 @@
List<String> filesList = Collections.emptyList();
if (ModuleCoreNature.isFlexibleProject(project)) {
IModelProvider provider = ModelProviderManager.getModelProvider(project);
- Object webAppObj = provider.getModelObject();
- if (webAppObj != null){
- if (webAppObj instanceof WebApp)
- filesList = getConfigFilesForJ2EEApp(project);
- else if (webAppObj instanceof org.eclipse.jst.javaee.web.WebApp)
- filesList = getConfigFilesForJEEApp((org.eclipse.jst.javaee.web.WebApp)webAppObj);
+ if (provider != null) {
+ Object webAppObj = provider.getModelObject();
+ if (webAppObj != null){
+ if (webAppObj instanceof WebApp)
+ filesList = getConfigFilesForJ2EEApp(project);
+ else if (webAppObj instanceof org.eclipse.jst.javaee.web.WebApp)
+ filesList = getConfigFilesForJEEApp((org.eclipse.jst.javaee.web.WebApp)webAppObj);
+ }
}
-
}
return filesList;
}
12 years, 10 months
JBoss Tools SVN: r39173 - branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-28 11:09:23 -0500 (Tue, 28 Feb 2012)
New Revision: 39173
Modified:
branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
Log:
JBIDE-11063 to beta1 branch
Modified: branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2012-02-28 15:08:24 UTC (rev 39172)
+++ branches/jbosstools-3.3.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2012-02-28 16:09:23 UTC (rev 39173)
@@ -29,6 +29,7 @@
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.RuntimeUtils;
+import org.jboss.ide.eclipse.as.core.util.ServerUtil;
/*
* Some of this code will need to be abstracted out from JBossServer
@@ -100,7 +101,7 @@
// Cannot move this code to JBossServer because this requires an
// RSE-specific key!! Damn!
- if (server.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70)) {
+ if (ServerUtil.isJBoss7(server.getServerType())) {
IPath p = new Path("standalone/deployments/");
return makeGlobal(server, p).toString();
} else {
12 years, 10 months
JBoss Tools SVN: r39172 - trunk/build/aggregate/soa-site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-28 10:08:24 -0500 (Tue, 28 Feb 2012)
New Revision: 39172
Modified:
trunk/build/aggregate/soa-site/site.xml
Log:
https://issues.jboss.org/browse/JBIDE-11088 remove smooks from JBoss Tools
Modified: trunk/build/aggregate/soa-site/site.xml
===================================================================
--- trunk/build/aggregate/soa-site/site.xml 2012-02-28 15:05:25 UTC (rev 39171)
+++ trunk/build/aggregate/soa-site/site.xml 2012-02-28 15:08:24 UTC (rev 39172)
@@ -13,12 +13,14 @@
<category name="SOATools" />
</feature>
+ <!-- https://issues.jboss.org/browse/JBIDE-11088
<feature url="features/org.jboss.tools.smooks.feature_0.0.0.jar" id="org.jboss.tools.smooks.feature" version="0.0.0">
<category name="AbridgedTools" />
<category name="SOATools" />
<category name="DataTools" />
<category name="GeneralTools" />
</feature>
+ -->
<feature url="features/org.jboss.tools.bpel.feature_0.0.0.jar" id="org.jboss.tools.bpel.feature" version="0.0.0">
<category name="SOATools" />
12 years, 10 months
JBoss Tools SVN: r39171 - branches/jbosstools-3.3.0.Beta1/build/aggregate/soa-site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-28 10:05:25 -0500 (Tue, 28 Feb 2012)
New Revision: 39171
Modified:
branches/jbosstools-3.3.0.Beta1/build/aggregate/soa-site/site.xml
Log:
https://issues.jboss.org/browse/JBIDE-11088 remove smooks from JBoss Tools
Modified: branches/jbosstools-3.3.0.Beta1/build/aggregate/soa-site/site.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta1/build/aggregate/soa-site/site.xml 2012-02-28 14:58:29 UTC (rev 39170)
+++ branches/jbosstools-3.3.0.Beta1/build/aggregate/soa-site/site.xml 2012-02-28 15:05:25 UTC (rev 39171)
@@ -13,12 +13,14 @@
<category name="SOATools" />
</feature>
+ <!-- https://issues.jboss.org/browse/JBIDE-11088
<feature url="features/org.jboss.tools.smooks.feature_0.0.0.jar" id="org.jboss.tools.smooks.feature" version="0.0.0">
<category name="AbridgedTools" />
<category name="SOATools" />
<category name="DataTools" />
<category name="GeneralTools" />
</feature>
+ -->
<feature url="features/org.jboss.tools.bpel.feature_0.0.0.jar" id="org.jboss.tools.bpel.feature" version="0.0.0">
<category name="SOATools" />
12 years, 10 months