Author: rob.stryker(a)jboss.com Date: 2008-12-17 17:02:33 -0500 (Wed, 17 Dec 2008) New Revision: 12663 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/namespaceMap.properties Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.50.default.ports.properties Log: JBIDE-3415 for JBoss 5.0. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2008-12-17 21:23:13 UTC (rev 12662) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2008-12-17 22:02:33 UTC (rev 12663) @@ -40,6 +40,7 @@ import org.eclipse.wst.server.core.IServer; 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.server.IJBossServerConstants; import org.jboss.ide.eclipse.as.core.server.UnitedServerListener; import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; @@ -92,7 +93,7 @@ server2.getRuntime().loadAdapter(LocalJBossServerRuntime.class, null); if(ajbsr != null ) { IPath loc = server2.getRuntime().getLocation(); - IPath configFolder = loc.append("server").append(ajbsr.getJBossConfiguration()); + IPath configFolder = loc.append(IJBossServerConstants.SERVER).append(ajbsr.getJBossConfiguration()); loadDefaults(server2, configFolder.toOSString()); helper.setAttribute(DEFAULTS_SET, true); helper.save(); @@ -295,6 +296,38 @@ } + /* + * Namespace map + */ + public Properties namespaceMap = null; + public Properties getNamespaceMap() { + if( namespaceMap == null ) + loadNamespaceMap(); + return (Properties)namespaceMap.clone(); + } + protected void loadNamespaceMap() { + // TODO load from preferenes. + //If nothing's there, load from default + IPath p = new Path("properties").append("namespaceMap.properties"); + if( p != null ) { + URL url = FileLocator.find(JBossServerCorePlugin.getDefault().getBundle(), p, null); + if( url != null ) { + Properties pr = new Properties(); + try { + pr.load(url.openStream()); + namespaceMap = pr; + return; + } catch(IOException ioe) { + } + } + } + namespaceMap = new Properties(); + } + public void setNamespaceMap(Properties map) { + namespaceMap = map; + // TODO save to preferences + } + /* * Static utility methods */ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2008-12-17 21:23:13 UTC (rev 12662) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2008-12-17 22:02:33 UTC (rev 12663) @@ -24,10 +24,15 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import java.util.Map; import org.dom4j.Document; import org.dom4j.Node; import org.eclipse.core.runtime.Path; +import org.jaxen.JaxenException; +import org.jaxen.SimpleNamespaceContext; +import org.jaxen.XPath; +import org.jaxen.dom4j.Dom4jXPath; import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode; /** @@ -109,8 +114,13 @@ for( int i = 0; i < files.length; i++ ) { fileLoc = new Path(baseDir).append(files[i]).toOSString(); Document d = getRepository().getDocument(fileLoc); - if( d != null ) - nodeList = d.selectNodes(xpathPattern); + if( d != null ) { + XPath xpath = new Dom4jXPath( xpathPattern ); + Map map = XPathModel.getDefault().getNamespaceMap(); + xpath.setNamespaceContext( new SimpleNamespaceContext( map)); + List nodes = xpath.selectNodes(d); + nodeList = xpath.selectNodes(d); + } if( nodeList != null && nodeList.size() > 0 ) resultList.add(new XPathFileResult(this, fileLoc, nodeList)); } @@ -118,6 +128,9 @@ } catch( IllegalStateException ise ) { // cannot load TODO log? results = new XPathFileResult[0]; + } catch( JaxenException je ) { + // cannot load TODO log? + results = new XPathFileResult[0]; } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.50.default.ports.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.50.default.ports.properties 2008-12-17 21:23:13 UTC (rev 12662) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.50.default.ports.properties 2008-12-17 22:02:33 UTC (rev 12663) @@ -2,16 +2,37 @@ # as few files as possible. Each matching file *WILL* be scanned # and cached, regardless of if there's a match. -JNDI=//server/mbean[@name='jboss:service=Naming']/attribute[@name='Port'] -JNDI_FILE=conf/jboss-service.xml -JBoss_Web=//Server/Service[@name=&#39;jboss.web&#39;]/Connector[count((a)sslProtocol) = 0 and (count(@protocol) = 0 or @protocol = 'HTTP/1.1')] -JBoss_Web_ATTRIBUTE=port -JBoss_Web_FILE=deployers/jbossweb.deployer/server.xml -JNDI_RMI=//server/mbean[@name='jboss:service=Naming']/attribute[@name='RmiPort'] -JNDI_RMI_FILE=conf/jboss-service.xml -JRMP_Invoker=//server/mbean[@name='jboss:service=invoker,type=jrmp']/attribute[@name='RMIObjectPort'] -JRMP_Invoker_FILE=conf/jboss-service.xml -Pooled_Invoker=//server/mbean[@name='jboss:service=invoker,type=pooled']/attribute[@name='ServerBindPort'] -Pooled_Invoker_FILE=conf/jboss-service.xml -Web_Services=//server/mbean[@name='jboss:service=WebService']/attribute[@name='Port'] -Web_Services_FILE=conf/jboss-service.xml +JNDI=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=Naming' and jboss_bean-deployer_2:property='Port']/jboss_bean-deployer_2:property[@name='port'] +JNDI_FILE=conf/bootstrap/bindings.xml +JBoss_Web=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss.web:service=WebServer'][not(jboss_bean-deployer_2:property='HttpsConnector')]/jboss_bean-deployer_2:property[@name='port'] +JBoss_Web_FILE=conf/bootstrap/bindings.xml +HTTPS_Connector=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss.web:service=WebServer'][jboss_bean-deployer_2:property='HttpsConnector']/jboss_bean-deployer_2:property[@name='port'] +HTTPS_Connector_FILE=conf/bootstrap/bindings.xml +Unified_Invoker_Connector=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='UnifiedInvokerConnector']/jboss_bean-deployer_2:property[@name='port'] +Unified_Invoker_Connector_FILE=conf/bootstrap/bindings.xml +RMI_JRMP_Invoker=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=invoker,type=jrmp']/jboss_bean-deployer_2:property[@name='port'] +RMI_JRMP_Invoker_FILE=conf/bootstrap/bindings.xml +Pooled_Invoker=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=invoker,type=pooled']/jboss_bean-deployer_2:property[@name='port'] +Pooled_Invoker_FILE=conf/bootstrap/bindings.xml +HA_JNDI_Port=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=HAJNDI'][jboss_bean-deployer_2:property='Port']/jboss_bean-deployer_2:property[@name='port'] +HA_JNDI_Port_FILE=conf/bootstrap/bindings.xml +RMI_JNDI_Port=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=HAJNDI'][jboss_bean-deployer_2:property='RmiPort']/jboss_bean-deployer_2:property[@name='port'] +RMI_JNDI_Port_FILE=conf/bootstrap/bindings.xml +HA_RMI_JRMP_Invoker=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=invoker,type=jrmpha']/jboss_bean-deployer_2:property[@name='port'] +HA_RMI_JRMP_Invoker_FILE=conf/bootstrap/bindings.xml +HA_Pooled_Invoker=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=invoker,type=pooledha']/jboss_bean-deployer_2:property[@name='port'] +HA_Pooled_Invoker_FILE=conf/bootstrap/bindings.xml +IIOP_Deploy=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=CorbaORB']/jboss_bean-deployer_2:property[@name='port'] +IIOP_Deploy_FILE=conf/bootstrap/bindings.xml +SNMP_Manager=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss.jmx:name=SnmpAgent,service=trapd,type=logger']/jboss_bean-deployer_2:property[@name='port'] +SNMP_Manager_FILE=conf/bootstrap/bindings.xml +SNMP_Adapter=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss.jmx:name=SnmpAgent,service=snmp,type=adaptor']/jboss_bean-deployer_2:property[@name='port'] +SNMP_Adapter_FILE=conf/bootstrap/bindings.xml +JMX_Remoting=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss.remoting:service=JMXConnectorServer,protocol=rmi']/jboss_bean-deployer_2:property[@name='port'] +JMX_Remoting_FILE=conf/bootstrap/bindings.xml +JBM_Bisocket_Connector=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss.messaging:service=Connector,transport=bisocket']/jboss_bean-deployer_2:property[@name='port'] +JBM_Bisocket_Connector_FILE=conf/bootstrap/bindings.xml +Transaction_Recovery_Manager=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='TransactionManager'][jboss_bean-deployer_2:property='recoveryManager']/jboss_bean-deployer_2:property[@name='port'] +Transaction_Recovery_Manager_FILE=conf/bootstrap/bindings.xml +Transaction_SocketProcessId=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='TransactionManager'][jboss_bean-deployer_2:property='socketProcessId']/jboss_bean-deployer_2:property[@name='port'] +Transaction_SocketProcessId_FILE=conf/bootstrap/bindings.xml Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/namespaceMap.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/namespaceMap.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/namespaceMap.properties 2008-12-17 22:02:33 UTC (rev 12663) @@ -0,0 +1 @@ +jboss_bean-deployer_2=urn:jboss:bean-deployer:2.0