[jboss-cvs] JBossAS SVN: r58384 - 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-15 05:43:54 -0500 (Wed, 15 Nov 2006)
New Revision: 58384

Modified:
   trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
   trunk/server/src/main/org/jboss/metadata/BeanMetaData.java
   trunk/server/src/main/org/jboss/metadata/QueryMetaData.java
Log:
fix the result-type-mapping initialization

Modified: trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2006-11-15 10:26:09 UTC (rev 58383)
+++ trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2006-11-15 10:43:54 UTC (rev 58384)
@@ -389,6 +389,10 @@
    public void addChild(EntityMetaData parent, QueryMetaData query,
          UnmarshallingContext navigator, String namespaceURI, String localName)
    {
+      if(parent.getLocalHome() == null && query.isResultTypeLocal())
+      {
+         query.setResultTypeMapping(QueryMetaData.REMOTE);
+      }
       parent.addQuery(query);
    }
 
@@ -629,13 +633,13 @@
       else if( localName.equals("ejb-name") )
          entity.setEjbName(value);
       else if( localName.equals("home") )
-         entity.setHomeClass(value);
+         entity.setHome(value);
       else if( localName.equals("remote") )
-         entity.setRemoteClass(value);
+         entity.setRemote(value);
       else if( localName.equals("local-home") )
-         entity.setLocalHomeClass(value);
+         entity.setLocalHome(value);
       else if( localName.equals("local") )
-         entity.setLocalClass(value);
+         entity.setLocal(value);
       else if( localName.equals("ejb-class") )
          entity.setEjbClass(value);
       else if( localName.equals("persistence-type") )
@@ -701,13 +705,13 @@
       else if( localName.equals("ejb-name") )
          bean.setEjbName(value);
       else if( localName.equals("home") )
-         bean.setHomeClass(value);
+         bean.setHome(value);
       else if( localName.equals("remote") )
-         bean.setRemoteClass(value);
+         bean.setRemote(value);
       else if( localName.equals("local-home") )
-         bean.setLocalHomeClass(value);
+         bean.setLocalHome(value);
       else if( localName.equals("local") )
-         bean.setLocalClass(value);
+         bean.setLocal(value);
       else if( localName.equals("ejb-class") )
          bean.setEjbClass(value);
       else if( localName.equals("session-type") )

Modified: trunk/server/src/main/org/jboss/metadata/BeanMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/BeanMetaData.java	2006-11-15 10:26:09 UTC (rev 58383)
+++ trunk/server/src/main/org/jboss/metadata/BeanMetaData.java	2006-11-15 10:43:54 UTC (rev 58384)
@@ -869,13 +869,8 @@
       this.configuration = configuration;
    }
 
-   public String getHomeClass()
+   public void setHome(String homeClass)
    {
-      return homeClass;
-   }
-
-   public void setHomeClass(String homeClass)
-   {
       this.homeClass = homeClass;
    }
 
@@ -889,23 +884,13 @@
       this.iorSecurityConfig = iorSecurityConfig;
    }
 
-   public String getLocalClass()
+   public void setLocal(String localClass)
    {
-      return localClass;
-   }
-
-   public void setLocalClass(String localClass)
-   {
       this.localClass = localClass;
    }
 
-   public String getLocalHomeClass()
+   public void setLocalHome(String localHomeClass)
    {
-      return localHomeClass;
-   }
-
-   public void setLocalHomeClass(String localHomeClass)
-   {
       this.localHomeClass = localHomeClass;
    }
 
@@ -929,13 +914,8 @@
       this.methodTx = methodTx;
    }
 
-   public String getRemoteClass()
+   public void setRemote(String remoteClass)
    {
-      return remoteClass;
-   }
-
-   public void setRemoteClass(String remoteClass)
-   {
       this.remoteClass = remoteClass;
    }
 

Modified: trunk/server/src/main/org/jboss/metadata/QueryMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/QueryMetaData.java	2006-11-15 10:26:09 UTC (rev 58383)
+++ trunk/server/src/main/org/jboss/metadata/QueryMetaData.java	2006-11-15 10:43:54 UTC (rev 58384)
@@ -46,6 +46,7 @@
 
    public QueryMetaData () {
       methodParams = new ArrayList();
+      resultTypeMapping = LOCAL;
    }
 
    /**
@@ -113,6 +114,11 @@
       this.ejbQl = ejbQl;
    }
 
+   public boolean isResultTypeLocal()
+   {
+      return LOCAL.equals(resultTypeMapping);
+   }
+   
    /**
     * Loads the data from the query xml element.
     * @param element the query xml element from the ejb-jar.xml file