JBoss Tools SVN: r34381 - in branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-30 04:21:49 -0400 (Tue, 30 Aug 2011)
New Revision: 34381
Modified:
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
Log:
JBIDE-9381 - branch
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2011-08-30 07:06:49 UTC (rev 34380)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2011-08-30 08:21:49 UTC (rev 34381)
@@ -17,10 +17,10 @@
public class JBossServerType implements IJBossToolingConstants {
- private static final String JBOSS_AS_PATH = "jboss-as"; //$NON-NLS-1$
- private static final String BIN_PATH = "bin"; //$NON-NLS-1$
+ public static final String JBOSS_AS_PATH = "jboss-as"; //$NON-NLS-1$
+ public static final String BIN_PATH = "bin"; //$NON-NLS-1$
private static final String TWIDDLE_JAR_NAME = "twiddle.jar"; //$NON-NLS-1$
- private static final String RUN_JAR_NAME = "run.jar"; //$NON-NLS-1$
+ public static final String RUN_JAR_NAME = "run.jar"; //$NON-NLS-1$
private static final String JBOSS_ESB_PATH = "jboss-esb"; //$NON-NLS-1$
private static final String SOAP_JBPM_JPDL_PATH = "jbpm-jpdl"; //$NON-NLS-1$
private static final String JBOSS_AS_WEB_PATH = "jboss-as-web"; //$NON-NLS-1$
@@ -83,7 +83,7 @@
UNKNOWN_STR,
UNKNOWN_STR,
"",//$NON-NLS-1$
- new String[]{V6_0, V5_1, V5_0, V4_3, V4_2, V4_0, V3_2}, null);
+ new String[]{V6_0, V6_1, V5_2, V5_1, V5_0, V4_3, V4_2, V4_0, V3_2}, null);
public String toString() {
return id;
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2011-08-30 07:06:49 UTC (rev 34380)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2011-08-30 08:21:49 UTC (rev 34381)
@@ -27,7 +27,17 @@
public ServerBean loadFromLocation(File location) {
JBossServerType type = getServerType(location);
- String version = getServerVersion(getFullServerVersion(new File(location,type.getSystemJarPath())));
+ String version = null;
+ if (!JBossServerType.UNKNOWN.equals(type)) {
+ String fullVersion = getFullServerVersion(new File(location,type.getSystemJarPath()));
+ if (fullVersion != null && fullVersion.startsWith("5.1.1") && JBossServerType.SOAP.equals(type)) { //$NON-NLS-1$
+ // SOA-P 5.2
+ String runJar = JBossServerType.JBOSS_AS_PATH + File.separatorChar +
+ JBossServerType.BIN_PATH+ File.separatorChar + JBossServerType.RUN_JAR_NAME;
+ fullVersion = getFullServerVersion(new File(location, runJar));
+ }
+ version = getServerVersion(fullVersion);
+ }
ServerBean server = new ServerBean(location.getPath(),getName(location),type,version);
return server;
}
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-08-30 07:06:49 UTC (rev 34380)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-08-30 08:21:49 UTC (rev 34381)
@@ -47,6 +47,7 @@
public static final String V4_3 = "4.3"; //$NON-NLS-1$
public static final String V5_0 = "5.0"; //$NON-NLS-1$
public static final String V5_1 = "5.1"; //$NON-NLS-1$
+ public static final String V5_2 = "5.2"; //$NON-NLS-1$
public static final String V6_0 = "6.0"; //$NON-NLS-1$
public static final String V6_1 = "6.1"; //$NON-NLS-1$
14 years, 3 months
JBoss Tools SVN: r34380 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-30 03:06:49 -0400 (Tue, 30 Aug 2011)
New Revision: 34380
Modified:
trunk/build/parent/pom.xml
Log:
trunk is now at M4
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-08-30 06:58:47 UTC (rev 34379)
+++ trunk/build/parent/pom.xml 2011-08-30 07:06:49 UTC (rev 34380)
@@ -17,7 +17,7 @@
-->
<tychoVersion>0.12.0</tychoVersion>
<scmBranch>trunk</scmBranch>
- <BUILD_ALIAS>M3</BUILD_ALIAS>
+ <BUILD_ALIAS>M4</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
14 years, 3 months
JBoss Tools SVN: r34379 - trunk/build/aggregate/webtools-site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-30 02:58:47 -0400 (Tue, 30 Aug 2011)
New Revision: 34379
Modified:
trunk/build/aggregate/webtools-site/index-template.html
trunk/build/aggregate/webtools-site/index.html
Log:
fix label on index page
Modified: trunk/build/aggregate/webtools-site/index-template.html
===================================================================
--- trunk/build/aggregate/webtools-site/index-template.html 2011-08-30 05:37:32 UTC (rev 34378)
+++ trunk/build/aggregate/webtools-site/index-template.html 2011-08-30 06:58:47 UTC (rev 34379)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools - SOA Tooling - ${update.site.description} Update Site${update.site.version}</title>
+<title>JBoss Tools - Web Tools - ${update.site.description} Update Site${update.site.version}</title>
<style>
@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
</style>
@@ -18,7 +18,7 @@
<tr>
<td>  </td>
<td>
- <h2 class="title">JBoss Tools - SOA Tooling - ${update.site.description} Update Site</h2>
+ <h2 class="title">JBoss Tools - Web Tools - ${update.site.description} Update Site</h2>
<table width="100%">
<tr class="header">
<td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td>
@@ -27,7 +27,7 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>${update.site.description}</b>
- Update Site for JBoss Tools - SOA Tooling. See <a class="link"
+ Update Site for JBoss Tools - Web Tools. See <a class="link"
href="http://www.jboss.org/tools/download/update">Installation
Instructions</a>.</p>
</td>
Modified: trunk/build/aggregate/webtools-site/index.html
===================================================================
--- trunk/build/aggregate/webtools-site/index.html 2011-08-30 05:37:32 UTC (rev 34378)
+++ trunk/build/aggregate/webtools-site/index.html 2011-08-30 06:58:47 UTC (rev 34379)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools - SOA Tooling - Nightly Build Update Site</title>
+<title>JBoss Tools - Web Tools - Nightly Build Update Site</title>
<style>
@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
</style>
@@ -18,7 +18,7 @@
<tr>
<td>  </td>
<td>
- <h2 class="title">JBoss Tools - SOA Tooling - Nightly Build Update Site</h2>
+ <h2 class="title">JBoss Tools - Web Tools - Nightly Build Update Site</h2>
<table width="100%">
<tr class="header">
<td class="sub-header" width="100%"><span>Latest Build</span></td>
@@ -27,7 +27,7 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>Nightly Build</b>
- Update Site for JBoss Tools - SOA Tooling. See <a class="link"
+ Update Site for JBoss Tools - Web Tools. See <a class="link"
href="http://www.jboss.org/tools/download/update">Installation
Instructions</a>.</p>
</td>
14 years, 3 months
JBoss Tools SVN: r34378 - branches.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-30 01:37:32 -0400 (Tue, 30 Aug 2011)
New Revision: 34378
Added:
branches/jbosstools-3.3.0.M3/
Log:
branch for M3
14 years, 3 months
JBoss Tools SVN: r34377 - trunk/jsf/plugins/org.jboss.tools.jsf.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-29 21:18:03 -0400 (Mon, 29 Aug 2011)
New Revision: 34377
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-9588 Poor performance of XHTML template validation
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-08-30 00:54:50 UTC (rev 34376)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-08-30 01:18:03 UTC (rev 34377)
@@ -391,6 +391,7 @@
</listener>
</extension>
+<!-- TODO https://issues.jboss.org/browse/JBIDE-9588
<extension id="xhtml" name="%XHTML_Validator.name"
point="org.eclipse.wst.validation.validatorV2">
<validator
@@ -420,7 +421,7 @@
</rules>
</include>
</validator>
- </extension>
+ </extension -->
<extension point="org.eclipse.wst.xml.core.catalogContributions">
<catalogContribution id="default">
14 years, 3 months
JBoss Tools SVN: r34376 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-29 20:54:50 -0400 (Mon, 29 Aug 2011)
New Revision: 34376
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLEntityResolver.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-9588 Poor performance of XHTML template validation
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLEntityResolver.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLEntityResolver.java 2011-08-30 00:23:03 UTC (rev 34375)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLEntityResolver.java 2011-08-30 00:54:50 UTC (rev 34376)
@@ -118,31 +118,32 @@
}
}
- is = new XMLInputSource(rid.getPublicId(), location, location);
-
- // This block checks that the file exists. If it doesn't we need
- // to throw
- // an exception so Xerces will report an error. note: This may
- // not be
- // necessary with all versions of Xerces but has specifically
- // been
- // experienced with the version included in IBM's 1.4.2 JDK.
- InputStream isTemp = null;
- try {
- isTemp = new URL(physical).openStream();
- } catch (IOException e) {
- // physical was a bad url, so cache it so we know next time
- if (context instanceof XMLNestedValidatorContext) {
- XMLNestedValidatorContext xmlContext = ((XMLNestedValidatorContext) context);
- xmlContext.markURIInaccessible(physical);
- }
- throw e;
- } finally {
- if (isTemp != null) {
- isTemp.close();
- }
+// // This block checks that the file exists. If it doesn't we need
+// // to throw
+// // an exception so Xerces will report an error. note: This may
+// // not be
+// // necessary with all versions of Xerces but has specifically
+// // been
+// // experienced with the version included in IBM's 1.4.2 JDK.
+// InputStream isTemp = null;
+// try {
+// isTemp = new URL(physical).openStream();
+// } catch (IOException e) {
+// // physical was a bad url, so cache it so we know next time
+// if (context instanceof XMLNestedValidatorContext) {
+// XMLNestedValidatorContext xmlContext = ((XMLNestedValidatorContext) context);
+// xmlContext.markURIInaccessible(physical);
+// }
+// throw e;
+// } finally {
+// if (isTemp != null) {
+// isTemp.close();
+// }
+// }
+ if(physical.startsWith("file:")||physical.startsWith("jar:")) {
+ is = new XMLInputSource(rid.getPublicId(), location, location);
+ is.setByteStream(new LazyURLInputStream(physical));
}
- is.setByteStream(new LazyURLInputStream(physical));
}
}
return is;
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java 2011-08-30 00:23:03 UTC (rev 34375)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java 2011-08-30 00:54:50 UTC (rev 34376)
@@ -51,6 +51,11 @@
IProgressMonitor monitor;
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.wst.xml.core.internal.validation.eclipse.Validator#validationStarting(org.eclipse.core.resources.IProject, org.eclipse.wst.validation.ValidationState, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor) {
super.validationStarting(project, state, monitor);
this.monitor = monitor;
@@ -94,26 +99,14 @@
XMLValidationConfiguration configuration = new XMLValidationConfiguration();
try {
- configuration.setFeature(
- XMLValidationConfiguration.INDICATE_NO_GRAMMAR, 0); // None.
- // No
- // grammar
- // indication
- // is
- // needed
+ configuration.setFeature(XMLValidationConfiguration.INDICATE_NO_GRAMMAR, 0); // None. No grammar indication is needed
} catch (Exception e) {
// Unable to set the preference. Log this problem.
JSFModelPlugin.log("XHTMLSyntaxValidator was unable to set the preference", e);
}
-
- XMLValidationReport valreport = null;
- if (inputstream != null) {
- valreport = validator.validate(uri, inputstream, configuration,
- context, result);
- } else {
- valreport = validator.validate(uri, null, configuration, context, result);
- }
+ XMLValidationReport valreport = validator.validate(uri, inputstream, configuration, context, result);
+
if (JSFModelPlugin.getDefault().isDebugging()) {
long et = System.currentTimeMillis() - ct;
System.out.println("XHTMLSyntaxValidator: Elapsed time = " + (et) + " ms for " + uri);
@@ -169,36 +162,36 @@
String grammarFile = "";
Reader reader1 = null; // Used for the preparse.
Reader reader2 = null; // Used for validation parse.
-
+
if (inputStream != null) {
String string = createStringForInputStream(inputStream);
reader1 = new StringReader(string);
reader2 = new StringReader(string);
}
-
+
XMLValidationInfo valinfo = new XMLValidationInfo(uri);
XHTMLEntityResolver entityResolver = new XHTMLEntityResolver(uriResolver, context);
XHTMLValidatorHelper helper = new XHTMLValidatorHelper(entityResolver);
-
+
try {
helper.computeValidationInformation(uri, reader1, uriResolver);
-
+
// The syntax validation is to be performed
valinfo.setDTDEncountered(false);
valinfo.setElementDeclarationCount(0);
valinfo.setNamespaceEncountered(false);
valinfo.setGrammarEncountered(false);
-
+
// No validation needed for native HTML files
// The only XHTML files are to be validated here
if (!helper.isXHTMLDoctype) {
return valinfo;
}
-
+
XMLReader reader = createXMLReader(valinfo, entityResolver);
XMLErrorHandler errorhandler = new XMLErrorHandler(valinfo);
reader.setErrorHandler(errorhandler);
-
+
InputSource inputSource = new InputSource(uri);
inputSource.setCharacterStream(reader2);
reader.parse(inputSource);
@@ -252,7 +245,7 @@
class XHTMLValidatorHelper extends ValidatorHelper {
public boolean isXHTMLDoctype = false;
private XHTMLEntityResolver entityResolver;
-
+
public XHTMLValidatorHelper(XHTMLEntityResolver entityResolver) {
this.entityResolver = entityResolver;
}
@@ -260,7 +253,7 @@
protected XMLReader createXMLReader(String uri) throws SAXNotRecognizedException, SAXNotSupportedException
{
XMLReader reader = super.createXMLReader(uri);
-
+
reader.setFeature("http://xml.org/sax/features/namespaces", false);
reader.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
reader.setFeature("http://xml.org/sax/features/validation", false);
@@ -268,33 +261,35 @@
reader.setFeature("http://apache.org/xml/features/validation/schema-full-checking", false);
reader.setFeature("http://apache.org/xml/features/validation/dynamic", false);
reader.setFeature("http://apache.org/xml/features/continue-after-fatal-error", false);
+ reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+// reader.setFeature("http://apache.org/xml/features/resolve-dtd-uris", false);
LexicalHandler lexicalHandler = new LexicalHandler()
{
public void startDTD (String name, String publicId, String systemId) {
- isGrammarEncountered = true;
+ isGrammarEncountered = true;
isDTDEncountered = true;
if (publicId != null && publicId.indexOf("W3C") != -1 &&
publicId.indexOf("DTD") != -1 && publicId.indexOf("XHTML") != -1) {
isXHTMLDoctype = true;
}
}
-
+
public void endDTD() throws SAXException {
}
-
+
public void startEntity(String name) throws SAXException {
}
-
+
public void endEntity(String name) throws SAXException {
}
-
+
public void startCDATA() throws SAXException {
}
-
+
public void endCDATA() throws SAXException {
}
-
+
public void comment (char ch[], int start, int length) throws SAXException {
}
};
14 years, 3 months
JBoss Tools SVN: r34375 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: resources/tck/tests/lookup/dynamic and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-29 20:23:03 -0400 (Mon, 29 Aug 2011)
New Revision: 34375
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ObtainsInstanceBean.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/dynamic/ObtainsInstanceBean.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java
Log:
JBIDE-9428
https://issues.jboss.org/browse/JBIDE-9428
Added resolution of Provider<X> injections.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ObtainsInstanceBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ObtainsInstanceBean.java 2011-08-30 00:22:01 UTC (rev 34374)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/ObtainsInstanceBean.java 2011-08-30 00:23:03 UTC (rev 34375)
@@ -21,11 +21,14 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Instance;
import javax.inject.Inject;
+import javax.inject.Provider;
class ObtainsInstanceBean {
@Inject @PayBy(CHEQUE) Instance<AsynchronousPaymentProcessor> paymentProcessor;
+ @Inject @PayBy(CHEQUE) Provider<AsynchronousPaymentProcessor> paymentProcessor2;
@Inject @Any Instance<PaymentProcessor> anyPaymentProcessor;
+ @Inject @Any Provider<PaymentProcessor> anyPaymentProcessor2;
@Inject @Any PaymentProcessor anyPaymentProcessorBroken;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/dynamic/ObtainsInstanceBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/dynamic/ObtainsInstanceBean.java 2011-08-30 00:22:01 UTC (rev 34374)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/dynamic/ObtainsInstanceBean.java 2011-08-30 00:23:03 UTC (rev 34375)
@@ -21,10 +21,12 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Instance;
import javax.inject.Inject;
+import javax.inject.Provider;
class ObtainsInstanceBean
{
@Inject @PayBy(CHEQUE) Instance<AsynchronousPaymentProcessor> paymentProcessor;
+ @Inject @PayBy(CHEQUE) Provider<AsynchronousPaymentProcessor> paymentProcessor2;
@Inject @Any Instance<PaymentProcessor> anyPaymentProcessor;
public Instance<AsynchronousPaymentProcessor> getPaymentProcessor()
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java 2011-08-30 00:22:01 UTC (rev 34374)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java 2011-08-30 00:23:03 UTC (rev 34375)
@@ -33,6 +33,13 @@
assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.lookup.dynamic.AdvancedPaymentProcessor");
}
+ public void testObtainsInjectsProvider() throws CoreException {
+ IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java", "paymentProcessor2");
+ Set<IBean> beans = cdiProject.getBeans(true, injection);
+ assertEquals(1, beans.size());
+ assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.lookup.dynamic.AdvancedPaymentProcessor");
+ }
+
/**
* Section 5.6 - Programmatic lookup
* @throws CoreException
14 years, 3 months
JBoss Tools SVN: r34374 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-29 20:22:01 -0400 (Mon, 29 Aug 2011)
New Revision: 34374
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationHelper.java
Log:
JBIDE-9428
https://issues.jboss.org/browse/JBIDE-9428
Added resolution of Provider<X> injections.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java 2011-08-30 00:21:16 UTC (rev 34373)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIConstants.java 2011-08-30 00:22:01 UTC (rev 34374)
@@ -36,8 +36,6 @@
public String SCOPE_ANNOTATION_TYPE_NAME = "javax.inject.Scope";
public String NORMAL_SCOPE_ANNOTATION_TYPE_NAME = "javax.enterprise.context.NormalScope";
- public String PROVIDER_ANNOTATION_TYPE_NAME = "javax.inject.Provider";
-
public String INJECT_ANNOTATION_TYPE_NAME = "javax.inject.Inject";
public String ALTERNATIVE_ANNOTATION_TYPE_NAME = "javax.enterprise.inject.Alternative";
@@ -81,6 +79,7 @@
public String INTERCEPTOR_SIMPLE_NAME = "Interceptor";
public String INTERCEPTOR_TYPE_NAME = "javax.enterprise.inject.spi.Interceptor";
+ public String PROVIDER_TYPE_NAME = "javax.inject.Provider";
public String INSTANCE_TYPE_NAME = "javax.enterprise.inject.Instance";
public String PRE_DESTROY_TYPE_NAME = "javax.annotation.PreDestroy";
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-30 00:21:16 UTC (rev 34373)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-30 00:22:01 UTC (rev 34374)
@@ -310,8 +310,10 @@
if(type == null) {
return result;
}
+
+ IType jType = type.getType();
- if(type.getType() != null && CDIConstants.EVENT_TYPE_NAME.equals(type.getType().getFullyQualifiedName())) {
+ if(jType != null && CDIConstants.EVENT_TYPE_NAME.equals(jType.getFullyQualifiedName())) {
List<? extends IParametedType> ps = type.getParameters();
if(ps.size() == 1) {
EventBean eventBean = new EventBean(type, injectionPoint);
@@ -322,7 +324,8 @@
}
}
- if(type.getType() != null && CDIConstants.INSTANCE_TYPE_NAME.equals(type.getType().getFullyQualifiedName())) {
+ if(jType != null && (CDIConstants.INSTANCE_TYPE_NAME.equals(jType.getFullyQualifiedName())
+ || CDIConstants.PROVIDER_TYPE_NAME.equals(jType.getFullyQualifiedName()))) {
List<? extends IParametedType> ps = type.getParameters();
if(ps.size() == 1) {
type = ps.get(0);
@@ -361,8 +364,8 @@
if(isNew) {
//TODO improve
IType bType = b.getBeanClass();
- if(bType != null && type.getType() != null
- && bType.getFullyQualifiedName().equals(type.getType().getFullyQualifiedName())) {
+ if(bType != null && jType != null
+ && bType.getFullyQualifiedName().equals(jType.getFullyQualifiedName())) {
result.add(b);
}
continue;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationHelper.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationHelper.java 2011-08-30 00:21:16 UTC (rev 34373)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationHelper.java 2011-08-30 00:22:01 UTC (rev 34374)
@@ -57,7 +57,6 @@
CDI_ANNOTATION_TYPES.add(PRODUCES_ANNOTATION_TYPE_NAME);
CDI_ANNOTATION_TYPES.add(SCOPE_ANNOTATION_TYPE_NAME);
CDI_ANNOTATION_TYPES.add(NORMAL_SCOPE_ANNOTATION_TYPE_NAME);
- CDI_ANNOTATION_TYPES.add(PROVIDER_ANNOTATION_TYPE_NAME);
CDI_ANNOTATION_TYPES.add(INJECT_ANNOTATION_TYPE_NAME);
CDI_ANNOTATION_TYPES.add(ALTERNATIVE_ANNOTATION_TYPE_NAME);
CDI_ANNOTATION_TYPES.add(INTERCEPTOR_BINDING_ANNOTATION_TYPE_NAME);
14 years, 3 months
JBoss Tools SVN: r34373 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-29 20:21:16 -0400 (Mon, 29 Aug 2011)
New Revision: 34373
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELReferencesQueryParticipant.java
Log:
https://issues.jboss.org/browse/JBIDE-1636 Code Review
code cleanup. seam.ui, jsf.core and cdi.ui tests are passed without errors
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELReferencesQueryParticipant.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELReferencesQueryParticipant.java 2011-08-29 20:29:02 UTC (rev 34372)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELReferencesQueryParticipant.java 2011-08-30 00:21:16 UTC (rev 34373)
@@ -47,35 +47,27 @@
QuerySpecification querySpecification, IProgressMonitor monitor)
throws CoreException {
- if(querySpecification instanceof ElementQuerySpecification){
- if (!isSearchForReferences(querySpecification.getLimitTo()))
- return;
-
- ElementQuerySpecification qs = (ElementQuerySpecification)querySpecification;
- if(qs.getElement() instanceof IField || qs.getElement() instanceof IMethod || qs.getElement() instanceof IType){
- IFile file = (IFile)qs.getElement().getResource();
- if(file == null)
- return;
-
- String name = qs.getElement().getElementName();
-
- searcher = new ELSearcher(requestor, qs.getElement(), file, name);
- searcher.setSearchScope(qs.getScope());
-
- searcher.findELReferences();
+ if(querySpecification instanceof ElementQuerySpecification && isSearchForReferences(querySpecification.getLimitTo())){
+
+ IJavaElement element = ((ElementQuerySpecification)querySpecification).getElement();
+ if(element instanceof IField || element instanceof IMethod || element instanceof IType){
+ IFile file = (IFile)element.getResource();
+ if(file != null) {
+ String name = element.getElementName();
+ searcher = new ELSearcher(requestor, element, file, name);
+ searcher.setSearchScope(querySpecification.getScope());
+ searcher.findELReferences();
+ }
}
}
}
public boolean isSearchForReferences(int limitTo) {
- int maskedLimitTo = limitTo & ~(IJavaSearchConstants.IGNORE_DECLARING_TYPE+IJavaSearchConstants.IGNORE_RETURN_TYPE);
- if (maskedLimitTo == IJavaSearchConstants.REFERENCES || maskedLimitTo == IJavaSearchConstants.ALL_OCCURRENCES) {
- return true;
- }
-
- return false;
- }
-
+ int maskedLimitTo = limitTo
+ & ~(IJavaSearchConstants.IGNORE_DECLARING_TYPE + IJavaSearchConstants.IGNORE_RETURN_TYPE);
+ return maskedLimitTo == IJavaSearchConstants.REFERENCES || maskedLimitTo == IJavaSearchConstants.ALL_OCCURRENCES;
+ }
+
class ELSearcher extends RefactorSearcher{
ISearchRequestor requestor;
IProjectsSet projectSet=null;
@@ -89,7 +81,6 @@
if(projectSet != null)
projectSet.init(file.getProject());
}
-
}
protected void outOfSynch(IProject file){
14 years, 3 months
JBoss Tools SVN: r34372 - in trunk/ws: plugins/org.jboss.tools.ws.jaxrs.core/META-INF and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2011-08-29 16:29:02 -0400 (Mon, 29 Aug 2011)
New Revision: 34372
Added:
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/plugin.properties
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/plugin.properties
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.properties
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF
Log:
[FIXED][JBIDE-9333] provider/plugin name is missing for JAX-RS plugins
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2011-08-29 14:32:54 UTC (rev 34371)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/META-INF/MANIFEST.MF 2011-08-29 20:29:02 UTC (rev 34372)
@@ -1,10 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
+Bundle-Vendor: %PLUGIN_PROVIDER
+Bundle-Localization: plugin
Bundle-SymbolicName: org.jboss.tools.ws.jaxrs.core;singleton:=true
Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxrs.core.JBossJaxrsCorePlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0";visibility:=reexport,
org.eclipse.core.resources;bundle-version="3.7.100";visibility:=reexport,
org.eclipse.equinox.ds;bundle-version="1.3.0";visibility:=reexport,
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/plugin.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/plugin.properties 2011-08-29 14:32:54 UTC (rev 34371)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/plugin.properties 2011-08-29 20:29:02 UTC (rev 34372)
@@ -1,2 +1,2 @@
-PLUGIN_NAME=JBoss JAXRS Tooling (Core)
+PLUGIN_NAME=JBoss JAX-RS Tooling (Core)
PLUGIN_PROVIDER=JBoss by Red Hat
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF 2011-08-29 14:32:54 UTC (rev 34371)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/META-INF/MANIFEST.MF 2011-08-29 20:29:02 UTC (rev 34372)
@@ -1,6 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
+Bundle-Vendor: %PLUGIN_PROVIDER
+Bundle-Localization: plugin
Bundle-SymbolicName: org.jboss.tools.ws.jaxrs.ui;singleton:=true
Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxrs.ui.JBossJaxrsUIPlugin
@@ -22,5 +24,4 @@
org.eclipse.jdt.ui;bundle-version="3.6.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-ClassPath: .
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.properties 2011-08-29 14:32:54 UTC (rev 34371)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.properties 2011-08-29 20:29:02 UTC (rev 34372)
@@ -1,2 +1,2 @@
-PLUGIN_NAME=JBoss JAXRS Tooling (UI)
+PLUGIN_NAME=JBoss JAX-RS Tooling (UI)
PLUGIN_PROVIDER=JBoss by Red Hat
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF 2011-08-29 14:32:54 UTC (rev 34371)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF 2011-08-29 20:29:02 UTC (rev 34372)
@@ -1,6 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Tests
+Bundle-Name: %PLUGIN_NAME
+Bundle-Vendor: %PLUGIN_PROVIDER
+Bundle-Localization: plugin
Bundle-SymbolicName: org.jboss.tools.ws.jaxrs.core.test;singleton:=true
Bundle-Version: 1.2.2.qualifier
Bundle-Activator: org.jboss.tools.ws.jaxrs.core.JBossJaxrsCoreTestsPlugin
Added: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/plugin.properties
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/plugin.properties (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/plugin.properties 2011-08-29 20:29:02 UTC (rev 34372)
@@ -0,0 +1,2 @@
+PLUGIN_NAME=JBoss JAX-RS Tooling (Core Tests)
+PLUGIN_PROVIDER=JBoss by Red Hat
Property changes on: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/plugin.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 3 months