JBoss Tools SVN: r35441 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-06 19:47:06 -0400 (Thu, 06 Oct 2011)
New Revision: 35441
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java
Log:
JBIDE-9852
https://issues.jboss.org/browse/JBIDE-9852
Extension features from superclass loaded.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java 2011-10-06 23:17:14 UTC (rev 35440)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java 2011-10-06 23:47:06 UTC (rev 35441)
@@ -122,6 +122,10 @@
for (Class<?> c: is) {
getFeatures(c, result);
}
+ if(!cls.isInterface()) {
+ Class<?> s = cls.getSuperclass();
+ if(s != null) getFeatures(s, result);
+ }
}
boolean isFeature(Class<?> cls) {
13 years, 3 months
JBoss Tools SVN: r35440 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-06 19:17:14 -0400 (Thu, 06 Oct 2011)
New Revision: 35440
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
Log:
[JBIDE-9856] fixing build by decreasing version range to e3.7 installed components
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-10-06 23:16:42 UTC (rev 35439)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-10-06 23:17:14 UTC (rev 35440)
@@ -62,7 +62,6 @@
import org.jboss.ide.eclipse.as.ui.editor.DeploymentModuleOptionCompositeAssistant;
import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI;
import org.jboss.ide.eclipse.as.ui.editor.ModuleDeploymentPage;
-import org.jboss.ide.eclipse.as.ui.editor.ServerModeSection;
import org.jboss.ide.eclipse.as.ui.editor.ServerModeSectionComposite.ChangeServerPropertyCommand;
import org.jboss.tools.as.wst.server.ui.xpl.ExploreActionProvider;
@@ -107,11 +106,6 @@
// Do nothing
}
- @Override @Deprecated
- public void fillComposite(Composite parent, ServerModeSection modeSection) {
- return;
- }
-
@Override
public void fillComposite(Composite parent, IServerModeUICallback callback) {
parent.setLayout(new FillLayout());
13 years, 3 months
JBoss Tools SVN: r35439 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-06 19:16:42 -0400 (Thu, 06 Oct 2011)
New Revision: 35439
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
Log:
[JBIDE-9856] fixing build by decreasing version range to e3.7 installed components
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-06 23:15:10 UTC (rev 35438)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-06 23:16:42 UTC (rev 35439)
@@ -13,10 +13,10 @@
org.eclipse.core.databinding.property;bundle-version="1.4.0",
org.eclipse.jface.databinding;bundle-version="1.5.0",
org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",
- org.eclipse.wst.server.core;bundle-version="1.1.402",
+ org.eclipse.wst.server.core;bundle-version="[1.1.3,2.0.0)",
org.eclipse.debug.core;bundle-version="3.7.0",
- org.jboss.ide.eclipse.as.ui;bundle-version="2.3.0",
- org.eclipse.wst.server.ui;bundle-version="1.1.405"
+ org.jboss.ide.eclipse.as.ui;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.wst.server.ui;bundle-version="[1.1.3,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.jboss.tools.common.databinding,
13 years, 3 months
JBoss Tools SVN: r35437 - in trunk/as: plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/httpclient and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-06 16:03:19 -0400 (Thu, 06 Oct 2011)
New Revision: 35437
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftService.java
trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/httpclient/UrlConnectionHttpClient.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/TestUser.java
Log:
[JBIDE-9857] corrected user-agent so that it would more look like a classic browser
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftService.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftService.java 2011-10-06 20:02:07 UTC (rev 35436)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/client/OpenshiftService.java 2011-10-06 20:03:19 UTC (rev 35437)
@@ -12,6 +12,7 @@
import java.net.MalformedURLException;
import java.net.URL;
+import java.text.MessageFormat;
import java.util.List;
import org.jboss.tools.openshift.express.internal.client.Application;
@@ -46,6 +47,10 @@
*/
public class OpenshiftService implements IOpenshiftService {
+ // TODO extract to properties file
+ public static final String VERSION = "0.1.0";
+ private static final String USERAGENT_FORMAT = "Java Openshift/{0} ({1})";
+
private String baseUrl;
private String id;
@@ -256,6 +261,7 @@
}
private IHttpClient createHttpClient(String id, String url) throws MalformedURLException {
- return new UrlConnectionHttpClient(id, new URL(url));
+ String userAgent = MessageFormat.format(USERAGENT_FORMAT, VERSION, id);
+ return new UrlConnectionHttpClient(userAgent, new URL(url));
}
}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/httpclient/UrlConnectionHttpClient.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/httpclient/UrlConnectionHttpClient.java 2011-10-06 20:02:07 UTC (rev 35436)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.client/src/org/jboss/tools/openshift/express/internal/client/httpclient/UrlConnectionHttpClient.java 2011-10-06 20:03:19 UTC (rev 35437)
@@ -34,7 +34,7 @@
this.userAgent = userAgent;
this.url = url;
}
-
+
public String post(String data) throws HttpClientException {
HttpURLConnection connection = null;
try {
@@ -98,10 +98,7 @@
connection.setConnectTimeout(TIMEOUT);
connection.setRequestProperty(PROPERTY_CONTENT_TYPE, "application/x-www-form-urlencoded");
connection.setInstanceFollowRedirects(true);
- if (userAgent != null
- && userAgent.length() > 0) {
- connection.setRequestProperty(USER_AGENT, userAgent);
- }
+ connection.setRequestProperty(USER_AGENT, userAgent);
return connection;
}
}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2011-10-06 20:02:07 UTC (rev 35436)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2011-10-06 20:03:19 UTC (rev 35437)
@@ -27,8 +27,9 @@
*/
public class CredentialsWizardPageModel extends ObservableUIPojo {
- private static final String ID = OpenshiftUIActivator.PLUGIN_ID;
-
+ private static final String ID = OpenshiftUIActivator.PLUGIN_ID
+ + OpenshiftUIActivator.getDefault().getBundle().getVersion();
+
private static final String RHLOGIN_PREFS_KEY = "org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardModel_RHLOGIN";
public static final String PROPERTY_SERVER_URL = "serverUrl";
Modified: trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/TestUser.java
===================================================================
--- trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/TestUser.java 2011-10-06 20:02:07 UTC (rev 35436)
+++ trunk/as/tests/org.jboss.tools.openshift.express.client.test/src/org/jboss/tools/openshift/express/internal/client/test/fakes/TestUser.java 2011-10-06 20:03:19 UTC (rev 35437)
@@ -13,6 +13,7 @@
import org.jboss.tools.openshift.express.client.Cartridge;
import org.jboss.tools.openshift.express.client.IApplication;
import org.jboss.tools.openshift.express.client.OpenshiftException;
+import org.jboss.tools.openshift.express.client.OpenshiftService;
import org.jboss.tools.openshift.express.client.User;
import org.jboss.tools.openshift.express.internal.client.test.utils.ApplicationUtils;
@@ -21,7 +22,7 @@
*/
public class TestUser extends User {
- public static final String ID = "org.jboss.tools.openshift.express.client.test";
+ public static final String ID = "org.jboss.tools.openshift.express.client.test " + OpenshiftService.VERSION;
public static final String RHLOGIN_USER_WITHOUT_DOMAIN = "toolsjboss.no.domain2(a)gmail.com";
public static final String PASSWORD_USER_WITHOUT_DOMAIN = "1q2w3e";
13 years, 3 months
JBoss Tools SVN: r35436 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-10-06 16:02:07 -0400 (Thu, 06 Oct 2011)
New Revision: 35436
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java
Log:
fixed:
Failed tests:
testCDIBeanQueryParticipant(org.jboss.tools.cdi.ui.test.search.CDISearchParticipantTest)
testCDIBeanQueryParticipantAtProducerField(org.jboss.tools.cdi.ui.test.search.CDISearchParticipantTest)
testCDIBeanQueryParticipantAtProducerMethod(org.jboss.tools.cdi.ui.test.search.CDISearchParticipantTest)
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java 2011-10-06 19:45:23 UTC (rev 35435)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java 2011-10-06 20:02:07 UTC (rev 35436)
@@ -185,6 +185,7 @@
matches.add(new MatchStructure(InjectionPointField.class, "TransientFieldInjectionPointBean.injectedBean"));
matches.add(new MatchStructure(InjectionPointField.class, "SpecializingDecoratorBroken.logger"));
matches.add(new MatchStructure(InjectionPointField.class, "ObserverMethodInDecoratorBroken.logger"));
+ matches.add(new MatchStructure(InjectionPointField.class, "ObjectInjection.object"));
matches.add(new MatchStructure(InjectionPointParameter.class, "ConstructorInjectionPointBean.ConstructorInjectionPointBean(BeanWithInjectionPointMetadata injectedBean)"));
matches.add(new MatchStructure(InjectionPointParameter.class, "MethodInjectionPointBean.methodWithInjectedMetadata(BeanWithInjectionPointMetadata injectedBean)"));
@@ -201,6 +202,7 @@
matches.add(new MatchStructure(InjectionPointField.class, "NamedStereotypedDecoratorBroken.logger"));
matches.add(new MatchStructure(InjectionPointField.class, "SpecializingDecoratorBroken.logger"));
matches.add(new MatchStructure(InjectionPointField.class, "ObserverMethodInDecoratorBroken.logger"));
+ matches.add(new MatchStructure(InjectionPointField.class, "ObjectInjection.object"));
testSearchParticipant("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Zoo.java", FIELD_SEARCH, "petShop", "", new CDIBeanQueryParticipant(), matches);
}
@@ -214,6 +216,7 @@
matches.add(new MatchStructure(InjectionPointField.class, "NamedStereotypedDecoratorBroken.logger"));
matches.add(new MatchStructure(InjectionPointField.class, "SpecializingDecoratorBroken.logger"));
matches.add(new MatchStructure(InjectionPointField.class, "ObserverMethodInDecoratorBroken.logger"));
+ matches.add(new MatchStructure(InjectionPointField.class, "ObjectInjection.object"));
testSearchParticipant("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Zoo.java", METHOD_SEARCH, "getPetShop", "", new CDIBeanQueryParticipant(), matches);
}
13 years, 3 months
JBoss Tools SVN: r35435 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects: CDIConfigTest/lib and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-06 15:45:23 -0400 (Thu, 06 Oct 2011)
New Revision: 35435
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/lib/solder-api.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/lib/solder-impl.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/solder-api.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/solder-impl.jar
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/lib/seam-config-xml.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/lib/seam-solder.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/seam-config-xml.jar
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.classpath
Log:
JBIDE-9852
https://issues.jboss.org/browse/JBIDE-9852
Tests fo Seam config migrated to 3.1.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/.classpath 2011-10-06 19:43:50 UTC (rev 35434)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/.classpath 2011-10-06 19:45:23 UTC (rev 35435)
@@ -5,7 +5,8 @@
<classpathentry kind="lib" path="lib/cdi-api.jar"/>
<classpathentry kind="lib" path="lib/javax.inject.jar"/>
<classpathentry kind="lib" path="lib/seam-config-xml.jar"/>
- <classpathentry kind="lib" path="lib/seam-solder.jar"/>
+ <classpathentry kind="lib" path="lib/solder-api.jar"/>
+ <classpathentry kind="lib" path="lib/solder-impl.jar"/>
<classpathentry kind="lib" path="lib/jboss-interceptor-api.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/lib/seam-config-xml.jar
===================================================================
(Binary files differ)
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/lib/seam-solder.jar
===================================================================
(Binary files differ)
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/lib/solder-api.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/lib/solder-api.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/lib/solder-impl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigTest/lib/solder-impl.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.classpath 2011-10-06 19:43:50 UTC (rev 35434)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/.classpath 2011-10-06 19:45:23 UTC (rev 35435)
@@ -4,7 +4,8 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="lib" path="lib/cdi-api.jar"/>
<classpathentry kind="lib" path="lib/javax.inject.jar"/>
- <classpathentry kind="lib" path="lib/seam-config-xml.jar"/>
+ <classpathentry kind="lib" path="lib/solder-api.jar"/>
+ <classpathentry kind="lib" path="lib/solder-impl.jar"/>
<classpathentry kind="lib" path="lib/jboss-interceptor-api.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/seam-config-xml.jar
===================================================================
(Binary files differ)
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/solder-api.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/solder-api.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/solder-impl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIConfigValidationTest/lib/solder-impl.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.classpath 2011-10-06 19:43:50 UTC (rev 35434)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/projects/CDIDependentConfigTest/.classpath 2011-10-06 19:45:23 UTC (rev 35435)
@@ -4,7 +4,8 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/CDIConfigTest/lib/cdi-api.jar"/>
<classpathentry kind="lib" path="/CDIConfigTest/lib/javax.inject.jar"/>
- <classpathentry kind="lib" path="/CDIConfigTest/lib/seam-config-xml.jar"/>
+ <classpathentry kind="lib" path="/CDIConfigTest/lib/solder-api.jar"/>
+ <classpathentry kind="lib" path="/CDIConfigTest/lib/solder-impl.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/CDIConfigTest"/>
<classpathentry kind="output" path="bin"/>
</classpath>
13 years, 3 months
JBoss Tools SVN: r35434 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core: src/org/jboss/tools/cdi/seam/config/core and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-06 15:43:50 -0400 (Thu, 06 Oct 2011)
New Revision: 35434
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigConstants.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java
Log:
JBIDE-9852
https://issues.jboss.org/browse/JBIDE-9852
Seam config migrated to 3.1.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/plugin.xml 2011-10-06 19:40:32 UTC (rev 35433)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/plugin.xml 2011-10-06 19:43:50 UTC (rev 35434)
@@ -5,6 +5,10 @@
point="org.jboss.tools.cdi.core.cdiextensions">
<cdiextension
class="org.jboss.tools.cdi.seam.config.core.CDISeamConfigExtension"
+ runtime="org.jboss.solder.config.xml.bootstrap.XmlConfigExtension">
+ </cdiextension>
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.config.core.CDISeamConfigExtension"
runtime="org.jboss.seam.config.xml.bootstrap.XmlConfigExtension">
</cdiextension>
</extension>
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigConstants.java 2011-10-06 19:40:32 UTC (rev 35433)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigConstants.java 2011-10-06 19:43:50 UTC (rev 35434)
@@ -56,5 +56,6 @@
public String ATTR_DIMENSIONS = "dimensions";
- public String INLINE_BEAN_QUALIFIER = "org.jboss.seam.config.xml.fieldset.InlineBeanQualifier";
+ public String INLINE_BEAN_QUALIFIER = "org.jboss.solder.config.xml.fieldset.InlineBeanQualifier";
+ public String INLINE_BEAN_QUALIFIER_30 = "org.jboss.seam.config.xml.fieldset.InlineBeanQualifier";
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java 2011-10-06 19:40:32 UTC (rev 35433)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java 2011-10-06 19:43:50 UTC (rev 35434)
@@ -61,15 +61,20 @@
*
*/
public class CDISeamConfigExtension implements ICDIExtension, IBuildParticipantFeature, IValidatorFeature {
+ private static String ID = "org.jboss.solder.config.xml.bootstrap.XmlConfigExtension";
+ private static String ID_30 = "org.jboss.seam.config.xml.bootstrap.XmlConfigExtension";
ConfigDefinitionContext context = new ConfigDefinitionContext();
ConfigFileSet fileSet = new ConfigFileSet();
public static CDISeamConfigExtension getExtension(CDICoreNature project) {
- Set<ICDIExtension> es = project.getExtensionManager().getExtensions(IBuildParticipantFeature.class);
- for (ICDIExtension ext: es) {
- if(ext instanceof CDISeamConfigExtension) return (CDISeamConfigExtension)ext;
+ ICDIExtension result = project.getExtensionManager().getExtensionByRuntime(ID);
+ if(result == null) {
+ result = project.getExtensionManager().getExtensionByRuntime(ID_30);
}
+ if(result instanceof CDISeamConfigExtension) {
+ return (CDISeamConfigExtension)result;
+ }
return null;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java 2011-10-06 19:40:32 UTC (rev 35433)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java 2011-10-06 19:43:50 UTC (rev 35434)
@@ -495,6 +495,9 @@
IJavaAnnotation createInlineBeanQualifier() {
IType type = project.getType(CDISeamConfigConstants.INLINE_BEAN_QUALIFIER);
if(type == null) {
+ type = project.getType(CDISeamConfigConstants.INLINE_BEAN_QUALIFIER_30);
+ }
+ if(type == null) {
return null;
}
long id = inlineBeanCount++;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java 2011-10-06 19:40:32 UTC (rev 35433)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/util/Util.java 2011-10-06 19:43:50 UTC (rev 35434)
@@ -38,6 +38,7 @@
*/
public class Util implements CDISeamConfigConstants {
public static Map<String, String> EE_TYPES = new HashMap<String, String>();
+ public static Map<String, String> EE_TYPES_30 = new HashMap<String, String>();
static {
EE_TYPES.put("int", "java.lang.Integer");
@@ -86,7 +87,10 @@
// In Seam3 doc, item 6.7. Overriding the type of an injection point is devoted to @Exact,
// but item 6.1 does not mentions its package in namespace urn:java:ee.
String[] SEAM_SOLDER = {"Exact"};
- for (String s: SEAM_SOLDER) EE_TYPES.put(s, "org.jboss.seam.solder.core." + s);
+ for (String s: SEAM_SOLDER) {
+ EE_TYPES.put(s, "org.jboss.solder.core." + s);
+ EE_TYPES_30.put(s, "org.jboss.seam.solder.core." + s);
+ }
}
@@ -109,6 +113,9 @@
String typeName = null;
if(pkg.equals(PACKAGE_EE)) {
typeName = Util.EE_TYPES.get(name);
+ if(typeName == null) {
+ typeName = Util.EE_TYPES_30.get(name);
+ }
} else {
typeName = pkg + "." + name;
}
13 years, 3 months
JBoss Tools SVN: r35433 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-06 15:40:32 -0400 (Thu, 06 Oct 2011)
New Revision: 35433
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java
Log:
JBIDE-9855
https://issues.jboss.org/browse/JBIDE-9855
Parser for seam-beans.xml is fixed.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java 2011-10-06 19:31:29 UTC (rev 35432)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java 2011-10-06 19:40:32 UTC (rev 35433)
@@ -29,6 +29,16 @@
*
*/
public class SAXParser extends SAXValidator {
+ /**
+ * If this limit is set to 0, parser will abort on the very first fatal error.
+ * In that case, the completing of parsing process is guaranteed, though parser
+ * will not be so smart as to extract maximum of correct data for the model.
+ *
+ * If this limit is set to a positive number, parser will be smart, but is not
+ * secured against making a mistake.
+ *
+ */
+ static int SUPPRESSED_FATAL_ERROR_LIMIT = 0;
/**
*
@@ -47,7 +57,7 @@
setFeature(parserInstance, VALIDATION_SCHEMA_FEATURE_ID, true);
setFeature(parserInstance, VALIDATION_SCHEMA_CHECKING_FEATURE_ID, false);
setFeature(parserInstance, VALIDATION_DYNAMIC_FEATURE_ID, false);
- setFeature(parserInstance, FATAL_ERROR_PROCESSING_FEATURE_ID, true);
+ setFeature(parserInstance, FATAL_ERROR_PROCESSING_FEATURE_ID, SUPPRESSED_FATAL_ERROR_LIMIT > 0);
try {
parserInstance.setProperty(ENTITY_RESOLVER_PROPERTY_ID, new XMLEntityResolverImpl());
@@ -81,7 +91,7 @@
} catch (IOException e) {
CommonPlugin.getDefault().logError(e);
} catch (SAXException e) {
- CommonPlugin.getDefault().logError(e);
+ //ignore, that is user data error that will be shown as error marker.
}
return handler.getRootElement();
@@ -205,6 +215,7 @@
public void fatalError(SAXParseException e) throws SAXException {
String message = e.getMessage();
errors.add(message);
+ if(errors.size() > SUPPRESSED_FATAL_ERROR_LIMIT) throw e;
}
/**
13 years, 3 months
JBoss Tools SVN: r35432 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-06 15:31:29 -0400 (Thu, 06 Oct 2011)
New Revision: 35432
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIActivator.java
Log:
[JBIDE-9857] corrected plug-in id so that we send the correct user-agent
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIActivator.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIActivator.java 2011-10-06 19:25:58 UTC (rev 35431)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIActivator.java 2011-10-06 19:31:29 UTC (rev 35432)
@@ -11,7 +11,7 @@
public class OpenshiftUIActivator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.openshift.ui"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.jboss.tools.openshift.express.ui"; //$NON-NLS-1$
// The shared instance
private static OpenshiftUIActivator plugin;
13 years, 3 months