Author: david.lloyd(a)jboss.com Date: 2010-03-12 11:28:28 -0500 (Fri, 12 Mar 2010) New Revision: 5824 Modified: remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/EndpointMetaData.java remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/RefMetaData.java remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/RemotingMetaData.java remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/ServerMetaData.java remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/ServiceMetaData.java remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/UserEntryMetaData.java Log: Remove property replacement Modified: remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/EndpointMetaData.java =================================================================== --- remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/EndpointMetaData.java 2010-03-10 05:53:33 UTC (rev 5823) +++ remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/EndpointMetaData.java 2010-03-12 16:28:28 UTC (rev 5824) @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.util.StringPropertyReplacer; import org.jboss.xnio.metadata.OptionMetaData; import javax.xml.bind.annotation.XmlAttribute; @@ -84,7 +83,7 @@ @XmlAttribute(required = true) public void setName(final String name) { - this.name = StringPropertyReplacer.replaceProperties(name); + this.name = name; } public boolean isDefaultFlag() { Modified: remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/RefMetaData.java =================================================================== --- remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/RefMetaData.java 2010-03-10 05:53:33 UTC (rev 5823) +++ remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/RefMetaData.java 2010-03-12 16:28:28 UTC (rev 5824) @@ -22,8 +22,6 @@ package org.jboss.remoting3.metadata; -import org.jboss.util.StringPropertyReplacer; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; @@ -37,6 +35,6 @@ @XmlAttribute(required = true) public void setName(final String name) { - this.name = StringPropertyReplacer.replaceProperties(name); + this.name = name; } } Modified: remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/RemotingMetaData.java =================================================================== --- remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/RemotingMetaData.java 2010-03-10 05:53:33 UTC (rev 5823) +++ remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/RemotingMetaData.java 2010-03-12 16:28:28 UTC (rev 5824) @@ -18,7 +18,6 @@ import org.jboss.remoting3.security.ServerAuthenticationProvider; import org.jboss.remoting3.security.SimpleClientCallbackHandler; import org.jboss.remoting3.security.SimpleServerAuthenticationProvider; -import org.jboss.util.StringPropertyReplacer; import org.jboss.xb.annotations.JBossXmlSchema; import org.jboss.xnio.ChannelListener; import org.jboss.xnio.Option; @@ -61,7 +60,7 @@ @XmlAttribute(name = "endpoint") public void setEndpoint(final String endpoint) { - this.endpoint = StringPropertyReplacer.replaceProperties(endpoint); + this.endpoint = endpoint; } public List<ServiceMetaData> getServices() { Modified: remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/ServerMetaData.java =================================================================== --- remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/ServerMetaData.java 2010-03-10 05:53:33 UTC (rev 5823) +++ remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/ServerMetaData.java 2010-03-12 16:28:28 UTC (rev 5824) @@ -64,7 +64,7 @@ @XmlAttribute public void setProtocol(final String protocol) { - this.protocol = StringPropertyReplacer.replaceProperties(protocol); + this.protocol = protocol; } public String getName() { @@ -73,6 +73,6 @@ @XmlAttribute(required = true) public void setName(final String name) { - this.name = StringPropertyReplacer.replaceProperties(name); + this.name = name; } } Modified: remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/ServiceMetaData.java =================================================================== --- remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/ServiceMetaData.java 2010-03-10 05:53:33 UTC (rev 5823) +++ remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/ServiceMetaData.java 2010-03-12 16:28:28 UTC (rev 5824) @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.util.StringPropertyReplacer; import org.jboss.xnio.metadata.OptionMetaData; import javax.xml.bind.annotation.XmlElement; @@ -98,7 +97,7 @@ @XmlAttribute(name = "type", required = true) public void setType(final String type) { - this.type = StringPropertyReplacer.replaceProperties(type); + this.type = type; } public String getGroupName() { @@ -107,6 +106,6 @@ @XmlAttribute(name = "group-name") public void setGroupName(final String groupName) { - this.groupName = StringPropertyReplacer.replaceProperties(groupName); + this.groupName = groupName; } } Modified: remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/UserEntryMetaData.java =================================================================== --- remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/UserEntryMetaData.java 2010-03-10 05:53:33 UTC (rev 5823) +++ remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/UserEntryMetaData.java 2010-03-12 16:28:28 UTC (rev 5824) @@ -22,8 +22,6 @@ package org.jboss.remoting3.metadata; -import org.jboss.util.StringPropertyReplacer; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; @@ -39,7 +37,7 @@ @XmlAttribute(name = "user-name", required = true) public void setUserName(final String userName) { - this.userName = StringPropertyReplacer.replaceProperties(userName); + this.userName = userName; } public String getRealmName() { @@ -48,7 +46,7 @@ @XmlAttribute(name = "realm-name", required = true) public void setRealmName(final String realmName) { - this.realmName = StringPropertyReplacer.replaceProperties(realmName); + this.realmName = realmName; } public String getPassword() {