[jboss-cvs] JBossAS SVN: r66471 - trunk/ejb3/src/main/org/jboss/ejb3/clientmodule.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 25 23:38:43 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-25 23:38:42 -0400 (Thu, 25 Oct 2007)
New Revision: 66471
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/EnvironmentRefGroupConveter.java
Log:
Update the conversion mappings
Modified: trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/EnvironmentRefGroupConveter.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/EnvironmentRefGroupConveter.java 2007-10-26 01:08:13 UTC (rev 66470)
+++ trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/EnvironmentRefGroupConveter.java 2007-10-26 03:38:42 UTC (rev 66471)
@@ -26,10 +26,20 @@
import java.util.List;
import java.util.Set;
+import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationUsageType;
import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.ResourceAuthorityType;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
import org.jboss.metamodel.descriptor.EjbLocalRef;
import org.jboss.metamodel.descriptor.EjbRef;
import org.jboss.metamodel.descriptor.EnvEntry;
@@ -52,6 +62,13 @@
extends EnvironmentRefGroup
{
private RemoteEnvironmentRefsGroupMetaData refs;
+ private boolean convertedEjbLocalRefs;
+ private boolean convertedEjbRefs = false;
+ private boolean convertedEnvEntries = false;
+ private boolean convertedMessageDestinationRefs = false;
+ private boolean convertedResourceEnvRefs = false;
+ private boolean convertedResourceRefs = false;
+ private boolean convertedServiceRefs = false;
public EnvironmentRefGroupConveter(RemoteEnvironmentRefsGroupMetaData refs)
{
@@ -61,64 +78,107 @@
@Override
public Collection<EjbLocalRef> getEjbLocalRefs()
{
- // TODO Auto-generated method stub
+ if(convertedEjbLocalRefs == false)
+ {
+ convertedEjbLocalRefs = true;
+ }
return super.getEjbLocalRefs();
}
@Override
public Collection<EjbRef> getEjbRefs()
{
- // TODO Auto-generated method stub
+ if(convertedEjbRefs == false)
+ {
+ EJBReferencesMetaData erefs = refs.getEjbReferences();
+ if(erefs != null)
+ for(EJBReferenceMetaData ref : erefs)
+ {
+ EjbRef eref = new EjbRef();
+ eref.setEjbLink(ref.getLink());
+ eref.setEjbRefName(ref.getEjbRefName());
+ eref.setEjbRefType(ref.getType());
+ eref.setHome(ref.getHome());
+ eref.setRemote(ref.getRemote());
+ eref.setIgnoreDependency(ref.isDependencyIgnored());
+ eref.setMappedName(ref.getMappedName());
+ eref.setInjectionTarget(getInjectionTarget(ref.getInjectionTargets()));
+ ejbRefs.put(ref.getEjbRefName(), eref);
+ }
+ convertedEjbRefs = true;
+ }
return super.getEjbRefs();
}
@Override
public Collection<EnvEntry> getEnvEntries()
{
- ArrayList<EnvEntry> entries = new ArrayList<EnvEntry>();
- EnvironmentEntriesMetaData env = refs.getEnvironmentEntries();
- if (env != null)
+ if(convertedEnvEntries == false)
{
- for(EnvironmentEntryMetaData entry : env)
+ EnvironmentEntriesMetaData env = refs.getEnvironmentEntries();
+ if (env != null)
{
- EnvEntry ee = new EnvEntry();
- ee.setEnvEntryName(entry.getEnvEntryName());
- ee.setEnvEntryType(entry.getType());
- ee.setEnvEntryValue(entry.getValue());
- Set<ResourceInjectionTargetMetaData> rits = entry.getInjectionTargets();
- if(rits != null && rits.isEmpty() == false)
+ for(EnvironmentEntryMetaData entry : env)
{
- ResourceInjectionTargetMetaData rit = rits.iterator().next();
- InjectionTarget it = new InjectionTarget();
- it.setTargetClass(rit.getInjectionTargetClass());
- it.setTargetName(rit.getInjectionTargetName());
- ee.setInjectionTarget(it);
+ EnvEntry ee = new EnvEntry();
+ ee.setEnvEntryName(entry.getEnvEntryName());
+ ee.setEnvEntryType(entry.getType());
+ ee.setEnvEntryValue(entry.getValue());
+ Set<ResourceInjectionTargetMetaData> rits = entry.getInjectionTargets();
+ if(rits != null && rits.isEmpty() == false)
+ {
+ ResourceInjectionTargetMetaData rit = rits.iterator().next();
+ InjectionTarget it = new InjectionTarget();
+ it.setTargetClass(rit.getInjectionTargetClass());
+ it.setTargetName(rit.getInjectionTargetName());
+ ee.setInjectionTarget(it);
+ }
+ ee.setIgnoreDependency(entry.isDependencyIgnored());
+ envEntries.put(ee.getEnvEntryName(), ee);
}
- ee.setIgnoreDependency(entry.isDependencyIgnored());
- entries.add(ee);
}
+ convertedEnvEntries = true;
}
- return entries;
+ return super.getEnvEntries();
}
@Override
public Collection<JndiRef> getJndiRefs()
{
- // TODO Auto-generated method stub
return super.getJndiRefs();
}
@Override
public MessageDestinationRef getMessageDestinationRefForLink(String link)
{
- // TODO Auto-generated method stub
+ if(convertedMessageDestinationRefs == false)
+ getMessageDestinationRefs();
return super.getMessageDestinationRefForLink(link);
}
@Override
public Collection<MessageDestinationRef> getMessageDestinationRefs()
{
- // TODO Auto-generated method stub
+ if(convertedMessageDestinationRefs == false)
+ {
+ MessageDestinationReferencesMetaData mrefs = refs.getMessageDestinationReferences();
+ if(mrefs != null)
+ for(MessageDestinationReferenceMetaData mref : mrefs)
+ {
+ MessageDestinationRef ref = new MessageDestinationRef();
+ ref.setIgnoreDependency(mref.isDependencyIgnored());
+ ref.setMappedName(mref.getMappedName());
+ ref.setJndiName(mref.getMappedName());
+ ref.setMessageDestinationLink(mref.getLink());
+ ref.setMessageDestinationRefName(mref.getMessageDestinationRefName());
+ ref.setMessageDestinationType(mref.getType());
+ MessageDestinationUsageType usage = mref.getMessageDestinationUsage();
+ if(usage != null)
+ ref.setMessageDestinationUsage(usage.name());
+ messageDestinationRefs.put(ref.getMessageDestinationRefName(), ref);
+ }
+ convertedMessageDestinationRefs = true;
+ }
return super.getMessageDestinationRefs();
}
@@ -139,29 +199,82 @@
@Override
public Collection<ResourceEnvRef> getResourceEnvRefs()
{
- // TODO Auto-generated method stub
+ if(convertedResourceEnvRefs == false)
+ {
+ ResourceEnvironmentReferencesMetaData rrefs = refs.getResourceEnvironmentReferences();
+ if(rrefs != null)
+ for(ResourceEnvironmentReferenceMetaData rref : rrefs)
+ {
+ ResourceEnvRef ref = new ResourceEnvRef();
+ ref.setResRefName(rref.getResourceEnvRefName());
+ ref.setIgnoreDependency(ref.isIgnoreDependency());
+ ref.setResType(rref.getType());
+ ref.setJndiName(rref.getJndiName());
+ ref.setMappedName(rref.getMappedName());
+ ref.setResAuth("Container");
+ ref.setInjectionTarget(getInjectionTarget(rref.getInjectionTargets()));
+ resourceEnvRefs.put(ref.getResRefName(), ref);
+ }
+ convertedResourceEnvRefs = true;
+ }
return super.getResourceEnvRefs();
}
@Override
public Collection<ResourceRef> getResourceRefs()
{
- // TODO Auto-generated method stub
+ if(convertedResourceRefs == false)
+ {
+ ResourceReferencesMetaData rrefs = refs.getResourceReferences();
+ if(rrefs != null)
+ for(ResourceReferenceMetaData rref : rrefs)
+ {
+ ResourceRef ref = new ResourceRef();
+ ref.setResRefName(rref.getResourceRefName());
+ ref.setIgnoreDependency(ref.isIgnoreDependency());
+ ref.setResType(rref.getType());
+ ref.setJndiName(rref.getJndiName());
+ ref.setMappedName(rref.getMappedName());
+ ref.setResUrl(rref.getResUrl());
+ ResourceAuthorityType authType = rref.getResAuth();
+ if(authType != null)
+ ref.setResAuth(authType.name());
+ ref.setInjectionTarget(getInjectionTarget(rref.getInjectionTargets()));
+ resourceRefs.put(ref.getResRefName(), ref);
+ }
+ convertedResourceRefs = true;
+ }
return super.getResourceRefs();
}
@Override
public ServiceRefMetaData getServiceRef(String name)
{
- // TODO Auto-generated method stub
+ if(convertedServiceRefs == false)
+ getServiceRefs();
return super.getServiceRef(name);
}
@Override
public Collection<ServiceRefMetaData> getServiceRefs()
{
- // TODO Auto-generated method stub
+ if(convertedServiceRefs == false)
+ {
+ convertedServiceRefs = true;
+ }
return super.getServiceRefs();
}
+ private InjectionTarget getInjectionTarget(Set<ResourceInjectionTargetMetaData> rits)
+ {
+ InjectionTarget it = null;
+ if(rits != null && rits.isEmpty() == false)
+ {
+ ResourceInjectionTargetMetaData rit = rits.iterator().next();
+ it = new InjectionTarget();
+ it.setTargetClass(rit.getInjectionTargetClass());
+ it.setTargetName(rit.getInjectionTargetName());
+ }
+ return it;
+ }
}
More information about the jboss-cvs-commits
mailing list