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

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

Author: alex.loubyansky at jboss.com
Date: 2006-11-07 10:38:22 -0500 (Tue, 07 Nov 2006)
New Revision: 58183

Modified:
   trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
   trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java
   trunk/server/src/main/org/jboss/metadata/ConfigurationMetaData.java
Log:
JBAS-3835 parsing container-configurations

Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java	2006-11-07 14:57:10 UTC (rev 58182)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java	2006-11-07 15:38:22 UTC (rev 58183)
@@ -30,6 +30,7 @@
 import org.jboss.metadata.InvokerProxyBindingMetaData;
 import org.jboss.metadata.MessageDestinationMetaData;
 import org.jboss.metadata.SecurityRoleMetaData;
+import org.jboss.metadata.ConfigurationMetaData;
 import org.jboss.xb.binding.UnmarshallingContext;
 import org.xml.sax.Attributes;
 
@@ -101,8 +102,14 @@
       }
       else if(localName.equals("container-configurations"))
       {
-         // TODO
+         child = dd;
       }
+      else if(localName.equals("container-configuration"))
+      {
+         // TODO: it should be a holder (or some other trick)
+         //  to be able to override the defaults in jboss.xml
+         child = new ConfigurationMetaData();
+      }
       else if(localName.equals("webservices"))
       {
          // TODO
@@ -172,6 +179,12 @@
       }
    }
 
+   public void addChild(ApplicationMetaData parent, ConfigurationMetaData container,
+         UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.addContainerConfiguration(container);
+   }
+
    public void setValue(ApplicationMetaData amd,
          UnmarshallingContext navigator, String namespaceURI, String localName,
          String value)
@@ -233,6 +246,72 @@
          boolean flag = Boolean.valueOf(value);
          bean.metaData.setCallByValue(flag);
       }
+   }
 
+   public void setValue(ConfigurationMetaData container,
+         UnmarshallingContext navigator, String namespaceURI, String localName,
+         String value)
+   {
+      if (localName.equals("container-name"))
+      {
+         container.setName(value);
+      }
+      else if(localName.equals("call-logging"))
+      {
+         container.setCallLogging(Boolean.valueOf(value));
+      }
+      else if(localName.equals("invoker-proxy-binding-name"))
+      {
+         // TODO: according to the DTD there could only be one
+         container.setInvokerNames(new String[]{value});
+      }
+      else if(localName.equals("sync-on-commit-only"))
+      {
+         container.setSyncOnCommitOnly(Boolean.valueOf(value));
+      }
+      else if(localName.equals("insert-after-ejb-post-create"))
+      {
+         container.setInsertAfterEjbPostCreate(Boolean.valueOf(value));
+      }
+      else if(localName.equals("call-ejb-store-on-clean"))
+      {
+         container.setEjbStoreForClean(Boolean.valueOf(value));
+      }
+      else if(localName.equals("store-not-flushed"))
+      {
+         container.setStoreNotFlushed(Boolean.valueOf(value));
+      }
+      else if(localName.equals("instance-pool"))
+      {
+         container.setInstancePool(value);
+      }
+      else if(localName.equals("instance-cache"))
+      {
+         container.setInstanceCache(value);
+      }
+      else if(localName.equals("persistence-manager"))
+      {
+         container.setPersistenceManager(value);
+      }
+      else if(localName.equals("web-class-loader"))
+      {
+         container.setWebClassLoader(value);
+      }
+      else if(localName.equals("locking-policy"))
+      {
+         container.setLockClass(value);
+      }
+      else if(localName.equals("commit-option"))
+      {
+         container.setCommitOption(value);
+      }
+      else if(localName.equals("optiond-refresh-rate"))
+      {
+         container.setOptionDRefreshRate(Long.parseLong(value));
+      }
+      else if(localName.equals("security-domain"))
+      {
+         container.setSecurityDomain(value);;
+      }
    }
 }

Modified: trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java	2006-11-07 14:57:10 UTC (rev 58182)
+++ trunk/server/src/main/org/jboss/metadata/ApplicationMetaData.java	2006-11-07 15:38:22 UTC (rev 58183)
@@ -1130,6 +1130,16 @@
          }
       }
    }
+
+   public void addContainerConfiguration(ConfigurationMetaData container)
+   {
+      String name = container.getName();
+      if(name == null)
+      {
+         throw new IllegalStateException("Container configuration must have a non-null name!");
+      }
+      configurations.put(name, container);
+   }
 }
 
 /*

Modified: trunk/server/src/main/org/jboss/metadata/ConfigurationMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/ConfigurationMetaData.java	2006-11-07 14:57:10 UTC (rev 58182)
+++ trunk/server/src/main/org/jboss/metadata/ConfigurationMetaData.java	2006-11-07 15:38:22 UTC (rev 58183)
@@ -96,6 +96,10 @@
    // Static --------------------------------------------------------
 
    // Constructors --------------------------------------------------
+   public ConfigurationMetaData()
+   {
+   }
+
    public ConfigurationMetaData(String name)
    {
       this.name = name;
@@ -210,6 +214,108 @@
       return depends;
    }
 
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+   public void setInstancePool(String instancePool)
+   {
+      this.instancePool = instancePool;
+   }
+
+   public void setInstanceCache(String instanceCache)
+   {
+      this.instanceCache = instanceCache;
+   }
+
+   public void setPersistenceManager(String persistenceManager)
+   {
+      this.persistenceManager = persistenceManager;
+   }
+
+   public void setWebClassLoader(String webClassLoader)
+   {
+      this.webClassLoader = webClassLoader;
+   }
+
+   public void setCommitOption(String commitOption)
+   {
+      try
+      {
+         this.commitOption = stringToCommitOption(commitOption);
+      }
+      catch(DeploymentException e)
+      {
+         throw new IllegalStateException(e.getMessage());
+      }
+   }
+
+   public void setOptionDRefreshRate(long optionDRefreshRate)
+   {
+      this.optionDRefreshRate = optionDRefreshRate;
+   }
+
+   public void setCallLogging(boolean callLogging)
+   {
+      this.callLogging = callLogging;
+   }
+
+   public void setSyncOnCommitOnly(boolean syncOnCommitOnly)
+   {
+      this.syncOnCommitOnly = syncOnCommitOnly;
+   }
+
+   public void setInsertAfterEjbPostCreate(boolean insertAfterEjbPostCreate)
+   {
+      this.insertAfterEjbPostCreate = insertAfterEjbPostCreate;
+   }
+
+   public void setSecurityDomain(String securityDomain)
+   {
+      this.securityDomain = securityDomain;
+   }
+
+   public void setInvokerNames(String[] invokerNames)
+   {
+      this.invokerNames = invokerNames;
+   }
+
+   public void setContainerPoolConf(Element containerPoolConf)
+   {
+      this.containerPoolConf = containerPoolConf;
+   }
+
+   public void setContainerCacheConf(Element containerCacheConf)
+   {
+      this.containerCacheConf = containerCacheConf;
+   }
+
+   public void setContainerInterceptorsConf(Element containerInterceptorsConf)
+   {
+      this.containerInterceptorsConf = containerInterceptorsConf;
+   }
+
+   public void setClusterConfig(ClusterConfigMetaData clusterConfig)
+   {
+      this.clusterConfig = clusterConfig;
+   }
+
+   public void setEjbStoreForClean(boolean ejbStoreForClean)
+   {
+      this.ejbStoreForClean = ejbStoreForClean;
+   }
+
+   public void setStoreNotFlushed(boolean storeNotFlushed)
+   {
+      this.storeNotFlushed = storeNotFlushed;
+   }
+
+   public void setLockClass(String lockClass)
+   {
+      this.lockClass = lockClass;
+   }
+
    public void importJbossXml(Element element) throws DeploymentException
    {