Author: david.lloyd(a)jboss.com Date: 2010-03-16 14:38:13 -0400 (Tue, 16 Mar 2010) New Revision: 5829 Modified: remoting-mc-int/trunk/pom.xml remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/RemotingMetaData.java remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/ServiceManager.java remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/ServiceMetaData.java remoting-mc-int/trunk/src/main/resources/META-INF/jboss-remoting_3_1.xsd Log: Update to R3 beta3-snapshot Modified: remoting-mc-int/trunk/pom.xml =================================================================== --- remoting-mc-int/trunk/pom.xml 2010-03-16 18:36:20 UTC (rev 5828) +++ remoting-mc-int/trunk/pom.xml 2010-03-16 18:38:13 UTC (rev 5829) @@ -56,7 +56,7 @@ <dependency> <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> - <version>3.1.0.Beta2</version> + <version>3.1.0.Beta3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.jboss.xnio</groupId> 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-16 18:36:20 UTC (rev 5828) +++ remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/RemotingMetaData.java 2010-03-16 18:38:13 UTC (rev 5829) @@ -128,7 +128,7 @@ final List<BeanMetaData> metaDataList = new ArrayList<BeanMetaData>(); for (ServiceMetaData service : services) { final String type = service.getType(); - final String groupName = defaulted(service.getGroupName(), "default"); + final String groupName = defaulted(service.getInstanceName(), "default"); final BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("Remoting:" + endpoint + ":SERVICE:" + type + ":" + groupName, ServiceManager.class.getName()); builder.ignoreCreate(); builder.ignoreDestroy(); @@ -142,7 +142,7 @@ builder.addPropertyMetaData("serviceType", service.getType()); final RefMetaData classloader = service.getClassloader(); if (classloader != null) builder.addPropertyMetaData("classloader", builder.createInject(classloader.getName())); - builder.addPropertyMetaData("groupName", service.getGroupName()); + builder.addPropertyMetaData("groupName", service.getInstanceName()); metaDataList.add(builder.getBeanMetaData()); } for (LocalClientMetaData localClient : localClients) { Modified: remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/ServiceManager.java =================================================================== --- remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/ServiceManager.java 2010-03-16 18:36:20 UTC (rev 5828) +++ remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/ServiceManager.java 2010-03-16 18:38:13 UTC (rev 5829) @@ -37,7 +37,7 @@ private ClientListener<I, O> clientListener; private OptionMap optionMap; private String serviceType; - private String groupName; + private String instanceName; public void setEndpoint(final Endpoint endpoint) { this.endpoint = endpoint; @@ -63,8 +63,8 @@ this.serviceType = serviceType; } - public void setGroupName(final String groupName) { - this.groupName = groupName; + public void setInstanceName(final String instanceName) { + this.instanceName = instanceName; } public void start() throws IOException { @@ -72,7 +72,7 @@ builder.setClientListener(clientListener); builder.setOptionMap(optionMap); builder.setServiceType(serviceType); - builder.setGroupName(groupName); + builder.setInstanceName(instanceName); serviceRegistration = builder.register(); } 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-16 18:36:20 UTC (rev 5828) +++ remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/ServiceMetaData.java 2010-03-16 18:38:13 UTC (rev 5829) @@ -43,7 +43,7 @@ private RefMetaData classloader; private List<OptionMetaData> options = new ArrayList<OptionMetaData>(); private String type; - private String groupName; + private String instanceName; public RefMetaData getClientListener() { return clientListener; @@ -100,12 +100,12 @@ this.type = type; } - public String getGroupName() { - return groupName; + public String getInstanceName() { + return instanceName; } - @XmlAttribute(name = "group-name") - public void setGroupName(final String groupName) { - this.groupName = groupName; + @XmlAttribute(name = "instance-name") + public void setInstanceName(final String instanceName) { + this.instanceName = instanceName; } } Modified: remoting-mc-int/trunk/src/main/resources/META-INF/jboss-remoting_3_1.xsd =================================================================== --- remoting-mc-int/trunk/src/main/resources/META-INF/jboss-remoting_3_1.xsd 2010-03-16 18:36:20 UTC (rev 5828) +++ remoting-mc-int/trunk/src/main/resources/META-INF/jboss-remoting_3_1.xsd 2010-03-16 18:38:13 UTC (rev 5829) @@ -61,7 +61,7 @@ <xs:element name="options" type="xnio:optionsType" minOccurs="0"/> </xs:all> <xs:attribute name="type" type="xs:string" use="required"/> - <xs:attribute name="group-name" type="xs:string" use="optional"/> + <xs:attribute name="instance-name" type="xs:string" use="optional"/> </xs:complexType> <xs:complexType name="connection">