Author: anil.saldhana at jboss.com
Date: 2007-08-21 11:51:02 -0400 (Tue, 21 Aug 2007)
New Revision: 64738
Removed:
trunk/server/src/main/org/jboss/metamodel/descriptor/SecurityRoleRef.java
Modified:
trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
Log:
JBAS-4423: use SecurityRoleRef from the security project
Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java 2007-08-21 15:50:33 UTC (rev 64737)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java 2007-08-21 15:51:02 UTC (rev 64738)
@@ -25,6 +25,7 @@
import org.jboss.metadata.serviceref.ServiceRefDelegate;
import org.jboss.metadata.serviceref.ServiceRefObjectFactory;
+import org.jboss.security.SecurityRoleRef;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
@@ -359,12 +360,18 @@
{
if (localName.equals("role-name"))
{
- ref.setRoleName(getValue(localName, value));
+ ref.setName(getValue(localName, value));
}
else if (localName.equals("role-link"))
{
- ref.setRoleLink(getValue(localName, value));
+
+ ref.setLink(getValue(localName, value));
}
+ else if (localName.equals("description"))
+ {
+
+ ref.setDescription(getValue(localName, value));
+ }
}
public void setValue(Listener listener, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
Deleted: trunk/server/src/main/org/jboss/metamodel/descriptor/SecurityRoleRef.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/SecurityRoleRef.java 2007-08-21 15:50:33 UTC (rev 64737)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/SecurityRoleRef.java 2007-08-21 15:51:02 UTC (rev 64738)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metamodel.descriptor;
-
-
-/**
- * Represents an <security-role-ref>
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision$</tt>
- */
-public class SecurityRoleRef
-{
- protected String roleName = null;
- protected String roleLink = null;
-
- public String getRoleName()
- {
- return roleName;
- }
-
- public void setRoleName(String roleName)
- {
- this.roleName = roleName;
- }
-
- public String getRoleLink()
- {
- return roleLink;
- }
-
- public void setRoleLink(String roleLink)
- {
- this.roleLink = roleLink;
- }
-
- public String toString()
- {
- StringBuffer sb = new StringBuffer(100);
- sb.append("[");
- sb.append("roleName=").append(roleName);
- sb.append("]");
- return sb.toString();
- }
-}