JBoss Tools SVN: r32910 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-14 02:34:42 -0400 (Thu, 14 Jul 2011)
New Revision: 32910
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStatePollerType.java
Log:
JBIDE-9343 - ensuring as7 management poller is unavailable for servers it does not apply to. Same for jmx poller.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStatePollerType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStatePollerType.java 2011-07-14 05:24:51 UTC (rev 32909)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStatePollerType.java 2011-07-14 06:34:42 UTC (rev 32910)
@@ -40,6 +40,10 @@
public String getId() {
return el.getAttribute("id"); //$NON-NLS-1$
}
+ public String getServerTypes() {
+ return el.getAttribute("serverTypes"); //$NON-NLS-1$
+ }
+
public IServerStatePoller createPoller() {
try {
return (IServerStatePoller)el.createExecutableExtension("class"); //$NON-NLS-1$
14 years, 9 months
JBoss Tools SVN: r32909 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-14 01:24:51 -0400 (Thu, 14 Jul 2011)
New Revision: 32909
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/pollers.exsd
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java
Log:
JBIDE-9343 - ensuring as7 management poller is unavailable for servers it does not apply to. Same for jmx poller.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2011-07-14 03:58:08 UTC (rev 32908)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2011-07-14 05:24:51 UTC (rev 32909)
@@ -83,7 +83,7 @@
}
/** Get only the pollers that can poll for startups */
- public ServerStatePollerType[] getStartupPollers() {
+ public ServerStatePollerType[] getStartupPollers(IServerType serverType) {
if( pollers == null )
loadPollers();
ArrayList<ServerStatePollerType> list = new ArrayList<ServerStatePollerType>();
@@ -91,14 +91,14 @@
ServerStatePollerType type;
while(i.hasNext()) {
type = i.next();
- if( type.supportsStartup())
+ if( type.supportsStartup() && pollerSupportsServerType(type, serverType))
list.add(type);
}
return list.toArray(new ServerStatePollerType[list.size()]);
}
/** Get only the pollers that can poll for shutdowns */
- public ServerStatePollerType[] getShutdownPollers() {
+ public ServerStatePollerType[] getShutdownPollers(IServerType serverType) {
if( pollers == null )
loadPollers();
ArrayList<ServerStatePollerType> list = new ArrayList<ServerStatePollerType>();
@@ -106,13 +106,26 @@
ServerStatePollerType type;
while(i.hasNext()) {
type = i.next();
- if( type.supportsShutdown() )
+ if( type.supportsShutdown() && pollerSupportsServerType(type, serverType))
list.add(type);
}
return list.toArray(new ServerStatePollerType[list.size()]);
}
+ protected boolean pollerSupportsServerType(ServerStatePollerType type, IServerType serverType) {
+ String sTypes = type.getServerTypes();
+ if(sTypes == null || sTypes.equals("")) //$NON-NLS-1$
+ return true;
+ String[] allTypes = sTypes.split(","); //$NON-NLS-1$
+ for( int i = 0; i < allTypes.length; i++ ) {
+ if( allTypes[i].equals(serverType.getId())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/** The method used to load / instantiate the failure handlers */
public void loadFailureHandler() {
pollerFailureHandlers = new HashMap<String, IPollerFailureHandler>();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2011-07-14 03:58:08 UTC (rev 32908)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2011-07-14 05:24:51 UTC (rev 32909)
@@ -49,7 +49,8 @@
Bundle-Vendor.0 = JBoss by Red Hat
Bundle-Name.0 = JBoss AS Core Plug-in
-AllJBossRuntimeTypes=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50
-AllJBossServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50
+AllJBossRuntimeTypes=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50
+AllJBossServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50
AllJBTServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.systemCopyServer
-ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60
+ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70
+ServerTypesJBoss6OrLower=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-07-14 03:58:08 UTC (rev 32908)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-07-14 05:24:51 UTC (rev 32909)
@@ -733,6 +733,7 @@
class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagerServicePoller"
id="org.jboss.ide.eclipse.as.core.server.JBoss7ManagerServicePoller"
name="JBoss 7 Manager Service Poller"
+ serverTypes="org.jboss.ide.eclipse.as.70"
supportsShutdown="true"
supportsStartup="true">
</serverPoller>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/pollers.exsd
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/pollers.exsd 2011-07-14 03:58:08 UTC (rev 32908)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/pollers.exsd 2011-07-14 05:24:51 UTC (rev 32909)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.jboss.ide.eclipse.as.core">
+<schema targetNamespace="org.jboss.ide.eclipse.as.core" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.jboss.ide.eclipse.as.core" id="pollers" name="org.jboss.ide.eclipse.as.core.runtime.server.pollers"/>
@@ -11,6 +11,11 @@
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence>
<element ref="serverPoller" minOccurs="0" maxOccurs="unbounded"/>
@@ -82,6 +87,13 @@
</documentation>
</annotation>
</attribute>
+ <attribute name="serverTypes" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
</complexType>
</element>
@@ -121,13 +133,5 @@
</documentation>
</annotation>
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
</schema>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml 2011-07-14 03:58:08 UTC (rev 32908)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml 2011-07-14 05:24:51 UTC (rev 32909)
@@ -20,8 +20,9 @@
class="org.jboss.ide.eclipse.as.jmx.integration.JMXPoller"
id="org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller"
name="JMX Poller"
- supportsStartup="true"
- supportsShutdown="true"/>
+ serverTypes="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50"
+ supportsShutdown="true"
+ supportsStartup="true"/>
</extension>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2011-07-14 03:58:08 UTC (rev 32908)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2011-07-14 05:24:51 UTC (rev 32909)
@@ -98,8 +98,8 @@
}
protected void findPossiblePollers() {
- startupTypes = ExtensionManager.getDefault().getStartupPollers();
- shutdownTypes = ExtensionManager.getDefault().getShutdownPollers();
+ startupTypes = ExtensionManager.getDefault().getStartupPollers(server.getServerType());
+ shutdownTypes = ExtensionManager.getDefault().getShutdownPollers(server.getServerType());
startupTypesStrings = new String[startupTypes.length];
shutdownTypesStrings = new String[shutdownTypes.length];
14 years, 9 months
JBoss Tools SVN: r32908 - trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2011-07-13 23:58:08 -0400 (Wed, 13 Jul 2011)
New Revision: 32908
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java
Log:
JBDS-1710: quick fix for the issue.
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java 2011-07-14 02:27:43 UTC (rev 32907)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java 2011-07-14 03:58:08 UTC (rev 32908)
@@ -97,7 +97,7 @@
} else {
if (resultInput != null) {
// there are errors, but not complication error.
- if (resultInput.indexOf("error") >= 0 && !(resultInput.indexOf("compilation failed") >= 0)) { //$NON-NLS-1$ //$NON-NLS-2$
+ if (resultInput.indexOf("error:") >= 0 && !(resultInput.indexOf("compilation failed") >= 0)) { //$NON-NLS-1$ //$NON-NLS-2$
JBossWSCreationCorePlugin.getDefault().logError(resultInput);
IStatus errorStatus = StatusUtils.errorStatus(resultInput);
status = StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Message_Failed_To_Generate_Code,new CoreException(errorStatus));
14 years, 9 months
JBoss Tools SVN: r32907 - workspace/grid/bpel-examples.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2011-07-13 22:27:43 -0400 (Wed, 13 Jul 2011)
New Revision: 32907
Added:
workspace/grid/bpel-examples/HelloWorld.zip
Log:
JBIDE-9304:BPEL EXAMPLE
Added: workspace/grid/bpel-examples/HelloWorld.zip
===================================================================
(Binary files differ)
Property changes on: workspace/grid/bpel-examples/HelloWorld.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 9 months
JBoss Tools SVN: r32906 - workspace/grid/bpel-examples.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2011-07-13 22:26:51 -0400 (Wed, 13 Jul 2011)
New Revision: 32906
Removed:
workspace/grid/bpel-examples/HelloWorld.zip
Log:
JBIDE-9304:BPEL EXAMPLE
Deleted: workspace/grid/bpel-examples/HelloWorld.zip
===================================================================
(Binary files differ)
14 years, 9 months
JBoss Tools SVN: r32905 - workspace/grid/bpel-examples.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2011-07-13 22:15:35 -0400 (Wed, 13 Jul 2011)
New Revision: 32905
Added:
workspace/grid/bpel-examples/HelloWorld.zip
Removed:
workspace/grid/bpel-examples/HelloWorld.zip
Log:
JBIDE-9304: BPEL examples
Deleted: workspace/grid/bpel-examples/HelloWorld.zip
===================================================================
(Binary files differ)
Added: workspace/grid/bpel-examples/HelloWorld.zip
===================================================================
(Binary files differ)
Property changes on: workspace/grid/bpel-examples/HelloWorld.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 9 months
JBoss Tools SVN: r32904 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test: tck/lookup and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-07-13 21:05:22 -0400 (Wed, 13 Jul 2011)
New Revision: 32904
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-9329
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-13 23:34:14 UTC (rev 32903)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-14 01:05:22 UTC (rev 32904)
@@ -96,6 +96,7 @@
suite.addTestSuite(BeansXmlCATest.class);
suite.addTestSuite(SelectedAlternativeTest.class);
suite.addTestSuite(CircularDependencyTest.class);
+ suite.addTestSuite(DynamicLookupTest.class);
suite.addTestSuite(AmbiguousDependencyTest.class);
suite.addTestSuite(UnsatisfiedDependencyTest.class);
Added: 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 (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java 2011-07-14 01:05:22 UTC (rev 32904)
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core.test.tck.lookup;
+
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.test.tck.TCKTest;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class DynamicLookupTest extends TCKTest {
+
+ /**
+ * section 5.6 aa)
+ * @throws CoreException
+ */
+ public void testObtainsInjectsInstanceOfInstance() throws CoreException {
+ IInjectionPointField injectionPoint = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java", "paymentProcessor");
+ Set<IBean> beans = cdiProject.getBeans(false, injectionPoint);
+ assertEquals(1, beans.size());
+
+ injectionPoint = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInstanceBean.java", "anyPaymentProcessor");
+ beans = cdiProject.getBeans(false, injectionPoint);
+ assertEquals(3, beans.size());
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/lookup/DynamicLookupTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 9 months
JBoss Tools SVN: r32903 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-13 19:34:14 -0400 (Wed, 13 Jul 2011)
New Revision: 32903
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SAXValidator.java
Log:
JBIDE-9287
https://issues.jboss.org/browse/JBIDE-9287
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SAXValidator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SAXValidator.java 2011-07-13 23:32:52 UTC (rev 32902)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SAXValidator.java 2011-07-13 23:34:14 UTC (rev 32903)
@@ -18,6 +18,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.xerces.parsers.SAXParser;
import org.apache.xerces.util.XMLCatalogResolver;
import org.apache.xerces.xni.XMLResourceIdentifier;
import org.eclipse.core.runtime.Platform;
@@ -58,11 +59,8 @@
DefaultHandler handler = new DefaultHandler();
XMLReader parserInstance = null;
- try {
- parserInstance = XMLReaderFactory.createXMLReader(DEFAULT_SAX_PARSER_CLASS_NAME);
- } catch (SAXException e) {
- return null;
- }
+ parserInstance = new SAXParser();
+ //XMLReaderFactory.createXMLReader(DEFAULT_SAX_PARSER_CLASS_NAME);
setFeature(parserInstance, NAMESPACES_FEATURE_ID, true);
setFeature(parserInstance, NAMESPACE_PREFIXES_FEATURE_ID, false);
14 years, 9 months
JBoss Tools SVN: r32902 - 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-07-13 19:32:52 -0400 (Wed, 13 Jul 2011)
New Revision: 32902
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java
Log:
JBIDE-9287
https://issues.jboss.org/browse/JBIDE-9287
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-07-13 17:49:37 UTC (rev 32901)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java 2011-07-13 23:32:52 UTC (rev 32902)
@@ -38,11 +38,8 @@
XMLReader createParser1(DefaultHandler handler) {
XMLReader parserInstance = null;
- try {
- parserInstance = XMLReaderFactory.createXMLReader(DEFAULT_SAX_PARSER_CLASS_NAME);
- } catch (SAXException e) {
- return null;
- }
+ //XMLReaderFactory.createXMLReader(DEFAULT_SAX_PARSER_CLASS_NAME);
+ parserInstance = new org.apache.xerces.parsers.SAXParser();
setFeature(parserInstance, NAMESPACES_FEATURE_ID, true);
setFeature(parserInstance, NAMESPACE_PREFIXES_FEATURE_ID, false);
14 years, 9 months
JBoss Tools SVN: r32901 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-13 13:49:37 -0400 (Wed, 13 Jul 2011)
New Revision: 32901
Modified:
branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml
branches/jbosstools-3.2.x/build/target-platform/unified.target
branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml
Log:
merge changes to multiple.target into unified.target; add missing IUs from .target into .target.p2mirror.xml
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2011-07-13 17:11:26 UTC (rev 32900)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2011-07-13 17:49:37 UTC (rev 32901)
@@ -33,6 +33,19 @@
</source>
<iu id="org.maven.ide.eclipse.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
+<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
+<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
+<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
+<iu id="ch.qos.logback.classic" version=""/>
+<iu id="ch.qos.logback.core" version=""/>
+<iu id="ch.qos.logback.slf4j" version=""/>
+<iu id="org.slf4j.api" version=""/>
+<iu id="com.ning.async-http-client" version=""/>
+<iu id="org.jboss.netty" version=""/>
+<iu id="org.eclipse.equinox.p2.discovery.compatibility" version=""/>
+<iu id="org.eclipse.equinox.p2.discovery" version=""/>
+<iu id="org.eclipse.equinox.p2.ui.discovery" version=""/>
+<iu id="org.eclipse.net4j.jms.api" version=""/>
<iu id="javax.wsdl" version=""/>
<iu id="org.apache.oro" version=""/>
<iu id="org.jdom" version=""/>
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-07-13 17:11:26 UTC (rev 32900)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-07-13 17:49:37 UTC (rev 32901)
@@ -13,9 +13,20 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- <unit id="org.maven.ide.eclipse.feature.feature.group" version="0.12.2.20110415-2017"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.12.0.20110421-1500"/>
-
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106052308"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.20110623-0455"/>
+ <unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
+ <unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
+ <unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
+ <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/>
+ <unit id="com.ning.async-http-client" version="1.6.3.201106052308"/>
+ <unit id="org.jboss.netty" version="3.2.4.Final-201106061504"/>
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110502-1955"/>
+ <unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110502-1955"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110502-1955"/>
+ <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110516-1727"/>
+
<!-- want the latest, 1.6.2.v201005080631, not 1.5.1.v201005080630 -->
<!--
<unit id="javax.wsdl" version="1.6.2.v201005080631"/>
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2011-07-13 17:11:26 UTC (rev 32900)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2011-07-13 17:49:37 UTC (rev 32901)
@@ -33,6 +33,19 @@
</source>
<iu id="org.maven.ide.eclipse.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
+<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
+<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
+<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
+<iu id="ch.qos.logback.classic" version=""/>
+<iu id="ch.qos.logback.core" version=""/>
+<iu id="ch.qos.logback.slf4j" version=""/>
+<iu id="org.slf4j.api" version=""/>
+<iu id="com.ning.async-http-client" version=""/>
+<iu id="org.jboss.netty" version=""/>
+<iu id="org.eclipse.equinox.p2.discovery.compatibility" version=""/>
+<iu id="org.eclipse.equinox.p2.discovery" version=""/>
+<iu id="org.eclipse.equinox.p2.ui.discovery" version=""/>
+<iu id="org.eclipse.net4j.jms.api" version=""/>
<iu id="javax.wsdl" version=""/>
<iu id="org.apache.oro" version=""/>
<iu id="org.jdom" version=""/>
14 years, 9 months