[jboss-cvs] JBossAS SVN: r58232 - in trunk/server/src/main/org/jboss: deployment metadata metadata/web

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2006-11-09 09:19:12 -0500 (Thu, 09 Nov 2006)
New Revision: 58232

Modified:
   trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
   trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java
   trunk/server/src/main/org/jboss/metadata/MessageDestinationMetaData.java
   trunk/server/src/main/org/jboss/metadata/WebMetaData.java
   trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java
Log:
complete assembly-descriptor

Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java	2006-11-09 13:52:10 UTC (rev 58231)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java	2006-11-09 14:19:12 UTC (rev 58232)
@@ -41,6 +41,9 @@
 import org.jboss.metadata.EjbPortComponentMetaData;
 import org.jboss.metadata.SessionMetaData;
 import org.jboss.metadata.ActivationConfigPropertyMetaData;
+import org.jboss.metadata.AssemblyDescriptorMetaData;
+import org.jboss.metadata.SecurityRoleMetaData;
+import org.jboss.metadata.MessageDestinationMetaData;
 import org.jboss.xb.binding.UnmarshallingContext;
 import org.jboss.mx.util.ObjectNameFactory;
 import org.xml.sax.Attributes;
@@ -154,6 +157,10 @@
       {
          // TODO
       }
+      else if(localName.equals("assembly-descriptor"))
+      {
+         child = dd.getAssemblyDescriptor();
+      }
       return child;
    }
 
@@ -288,6 +295,21 @@
       return null;
    }
 
+   public Object newChild(AssemblyDescriptorMetaData parent, UnmarshallingContext navigator,
+         String namespaceURI, String localName, Attributes attrs)
+   {
+      if(localName.equals("security-role"))
+      {
+         return new SecurityRoleMetaData();
+      }
+      else if(localName.equals("message-destination"))
+      {
+         // TODO
+         return new MessageDestinationMetaData();
+      }
+      return null;
+   }
+
    public void addChild(ApplicationMetaData parent, InvokerProxyBindingMetaData binding,
          UnmarshallingContext navigator, String namespaceURI, String localName)
    {
@@ -428,6 +450,31 @@
       parent.setSasContext(child);
    }
 
+   public void addChild(AssemblyDescriptorMetaData parent, SecurityRoleMetaData child,
+         UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      SecurityRoleMetaData ejbjarRole = parent.getSecurityRoleByName(child.getRoleName());
+      if(ejbjarRole != null)
+      {
+         ejbjarRole.addPrincipalNames(child.getPrincipals());
+      }
+      else
+      {
+         parent.addSecurityRoleMetaData(child);
+      }
+   }
+
+   public void addChild(AssemblyDescriptorMetaData parent, MessageDestinationMetaData child,
+         UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      MessageDestinationMetaData ejbjarDest = parent.getMessageDestinationMetaData(child.getName());
+      if(ejbjarDest == null)
+      {
+         throw new IllegalStateException("message-destination " + child.getName() + " found in jboss.xml but not in ejb-jar.xml");
+      }
+      ejbjarDest.setJNDIName(child.getJNDIName());
+   }
+   
    public void setValue(ApplicationMetaData amd,
          UnmarshallingContext navigator, String namespaceURI, String localName,
          String value)
@@ -840,6 +887,20 @@
       }
    }
 
+   public void setValue(SecurityRoleMetaData parent,
+         UnmarshallingContext navigator, String namespaceURI, String localName,
+         String value)
+   {
+      if(localName.equals("role-name"))
+      {
+         parent.setRoleName(value);
+      }
+      else if(localName.equals("principal-name"))
+      {
+         parent.addPrincipalName(value);
+      }
+   }
+
    // static
 
    public static class DomElement

Modified: trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java	2006-11-09 13:52:10 UTC (rev 58231)
+++ trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java	2006-11-09 14:19:12 UTC (rev 58232)
@@ -466,7 +466,7 @@
       }
       else if (localName.equals("mapped-name") || localName.equals("jndi-name"))
       {
-         destination.setJndiName(getValue(localName, value));
+         destination.setJNDIName(getValue(localName, value));
       }
    }
 

Modified: trunk/server/src/main/org/jboss/metadata/MessageDestinationMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/MessageDestinationMetaData.java	2006-11-09 13:52:10 UTC (rev 58231)
+++ trunk/server/src/main/org/jboss/metadata/MessageDestinationMetaData.java	2006-11-09 14:19:12 UTC (rev 58232)
@@ -62,12 +62,8 @@
       this.name = name;
    }
 
-   public String getJndiName()
+   public void setJNDIName(String name)
    {
-      return jndiName;
-   }
-   public void setJndiName(String name)
-   {
       this.jndiName = name;
    }
    /**
@@ -78,9 +74,10 @@
    {
       return jndiName;
    }
+
    public String getMappedName()
    {     
-      return getJndiName();
+      return getJNDIName();
    }
 
    public void importEjbJarXml(Element element) throws DeploymentException

Modified: trunk/server/src/main/org/jboss/metadata/WebMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2006-11-09 13:52:10 UTC (rev 58231)
+++ trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2006-11-09 14:19:12 UTC (rev 58232)
@@ -422,7 +422,7 @@
          messageDestinations.get(updatedDestination.getName());
       if (destination != null)
       {
-         destination.setJndiName(updatedDestination.getMappedName());
+         destination.setJNDIName(updatedDestination.getMappedName());
       }
       else
       {

Modified: trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java	2006-11-09 13:52:10 UTC (rev 58231)
+++ trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java	2006-11-09 14:19:12 UTC (rev 58232)
@@ -163,14 +163,14 @@
       log.debug("addMessageDestinationMetaData, "+destination);
       parent.addMessageDestination(destination);
       // See if this message-destination resolves to an existing ref link
-      String link = destination.getJndiName();
+      String link = destination.getJNDIName();
       if( link != null )
       {
          MessageDestinationMetaData ref = parent.getMessageDestination(link);
          if( ref != null )
          {
-            log.debug("ressolved "+ref+" to link JndiName: "+destination.getJndiName());
-            ref.setJndiName(destination.getJndiName());
+            log.debug("ressolved "+ref+" to link JndiName: "+destination.getJNDIName());
+            ref.setJNDIName(destination.getJNDIName());
          }
       }
    }