[jboss-cvs] JBoss Messaging SVN: r6767 - in trunk/src: config/stand-alone/non-clustered and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 13 10:37:13 EDT 2009
Author: ataylor
Date: 2009-05-13 10:37:13 -0400 (Wed, 13 May 2009)
New Revision: 6767
Modified:
trunk/src/config/common/schema/jbm-jms.xsd
trunk/src/config/stand-alone/non-clustered/jbm-jms.xml
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/deployers/impl/AddressSettingsDeployer.java
trunk/src/main/org/jboss/messaging/core/deployers/impl/BasicUserCredentialsDeployer.java
trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java
trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
Log:
fix for new schema location
Modified: trunk/src/config/common/schema/jbm-jms.xsd
===================================================================
--- trunk/src/config/common/schema/jbm-jms.xsd 2009-05-13 13:50:35 UTC (rev 6766)
+++ trunk/src/config/common/schema/jbm-jms.xsd 2009-05-13 14:37:13 UTC (rev 6767)
@@ -139,10 +139,14 @@
<xsd:complexType name="queueType">
<xsd:sequence>
<xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+ <xsd:element name="filter" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="durable" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
- <xsd:attribute name="durable" type="xsd:boolean" use="optional"></xsd:attribute>
- <xsd:attribute name="filter" type="xsd:string" use="optional"></xsd:attribute>
</xsd:complexType>
<xsd:complexType name="topicType">
Modified: trunk/src/config/stand-alone/non-clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-jms.xml 2009-05-13 13:50:35 UTC (rev 6766)
+++ trunk/src/config/stand-alone/non-clustered/jbm-jms.xml 2009-05-13 14:37:13 UTC (rev 6767)
@@ -10,7 +10,7 @@
</entries>
</connection-factory>
- <queue name="DLQ" durable="true" filter="foo='bar'">
+ <queue name="DLQ">
<entry name="/queue/DLQ"/>
</queue>
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2009-05-13 13:50:35 UTC (rev 6766)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2009-05-13 14:37:13 UTC (rev 6767)
@@ -22,18 +22,9 @@
package org.jboss.messaging.core.config.impl;
+import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.cluster.BridgeConfiguration;
import org.jboss.messaging.core.config.cluster.BroadcastGroupConfiguration;
@@ -50,6 +41,14 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* ConfigurationImpl
* This class allows the Configuration class to be configured via a config file.
@@ -67,7 +66,7 @@
private static final String DEFAULT_CONFIGURATION_URL = "jbm-configuration.xml";
- private static final String CONFIGURATION_SCHEMA_URL = "jbm-configuration.xsd";
+ private static final String CONFIGURATION_SCHEMA_URL = "schema/jbm-configuration.xsd";
// Attributes ----------------------------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/AddressSettingsDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/AddressSettingsDeployer.java 2009-05-13 13:50:35 UTC (rev 6766)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/AddressSettingsDeployer.java 2009-05-13 14:37:13 UTC (rev 6767)
@@ -82,7 +82,7 @@
@Override
public void validate(Node rootNode) throws Exception
{
- org.jboss.messaging.utils.XMLUtil.validate(rootNode, "jbm-configuration.xsd");
+ org.jboss.messaging.utils.XMLUtil.validate(rootNode, "schema/jbm-configuration.xsd");
}
/**
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/BasicUserCredentialsDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/BasicUserCredentialsDeployer.java 2009-05-13 13:50:35 UTC (rev 6766)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/BasicUserCredentialsDeployer.java 2009-05-13 14:37:13 UTC (rev 6767)
@@ -64,7 +64,7 @@
@Override
public void validate(Node rootNode) throws Exception
{
- org.jboss.messaging.utils.XMLUtil.validate(rootNode, "jbm-users.xsd");
+ org.jboss.messaging.utils.XMLUtil.validate(rootNode, "schema/jbm-users.xsd");
}
public void deploy(final Node node) throws Exception
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java 2009-05-13 13:50:35 UTC (rev 6766)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java 2009-05-13 14:37:13 UTC (rev 6767)
@@ -58,7 +58,7 @@
@Override
public void validate(Node rootNode) throws Exception
{
- org.jboss.messaging.utils.XMLUtil.validate(rootNode, "jbm-configuration.xsd");
+ org.jboss.messaging.utils.XMLUtil.validate(rootNode, "schema/jbm-configuration.xsd");
}
/**
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java 2009-05-13 13:50:35 UTC (rev 6766)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java 2009-05-13 14:37:13 UTC (rev 6767)
@@ -22,10 +22,6 @@
package org.jboss.messaging.core.deployers.impl;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
import org.jboss.messaging.core.deployers.DeploymentManager;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.security.Role;
@@ -33,6 +29,10 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
/**
* Deploys the security settings into a security repository and adds them to the security store.
*
@@ -82,7 +82,7 @@
@Override
public void validate(Node rootNode) throws Exception
{
- org.jboss.messaging.utils.XMLUtil.validate(rootNode, "jbm-configuration.xsd");
+ org.jboss.messaging.utils.XMLUtil.validate(rootNode, "schema/jbm-configuration.xsd");
}
/**
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-05-13 13:50:35 UTC (rev 6766)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-05-13 14:37:13 UTC (rev 6767)
@@ -137,7 +137,7 @@
@Override
public void validate(Node rootNode) throws Exception
{
- org.jboss.messaging.utils.XMLUtil.validate(rootNode, "jbm-jms.xsd");
+ org.jboss.messaging.utils.XMLUtil.validate(rootNode, "schema/jbm-jms.xsd");
}
/**
More information about the jboss-cvs-commits
mailing list