[jboss-cvs] JBossAS SVN: r66852 - in projects/metadata/trunk/src/main/java/org/jboss/metadata: client/jboss and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 8 04:53:06 EST 2007
Author: scott.stark at jboss.org
Date: 2007-11-08 04:53:06 -0500 (Thu, 08 Nov 2007)
New Revision: 66852
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractComponentProcessor.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MutableRemoteEnvironment.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironment.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java
Log:
Fix AnnotatedEjbReferences accessor type
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractComponentProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractComponentProcessor.java 2007-11-08 09:44:33 UTC (rev 66851)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/AbstractComponentProcessor.java 2007-11-08 09:53:06 UTC (rev 66852)
@@ -34,6 +34,7 @@
import org.jboss.metadata.annotation.finder.AnnotationFinder;
import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.MutableEnvironment;
import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
@@ -122,10 +123,10 @@
}
processClass(resRefs, type);
- AnnotatedEJBReferenceMetaData aejbRefs = metaData.getAnnotatedEjbReferences();
+ AnnotatedEJBReferencesMetaData aejbRefs = metaData.getAnnotatedEjbReferences();
if(aejbRefs == null)
{
- aejbRefs = new AnnotatedEJBReferenceMetaData();
+ aejbRefs = new AnnotatedEJBReferencesMetaData();
metaData.setAnnotatedEjbReferences(aejbRefs);
}
processClass(aejbRefs, type);
@@ -205,7 +206,6 @@
{
Type type = processor.getClass().getGenericInterfaces()[0];
ParameterizedType pt = (ParameterizedType) type;
- System.err.println(pt.getActualTypeArguments());
Type t0 = pt.getActualTypeArguments()[0];
Class t = null;
if(t0 instanceof Class)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java 2007-11-08 09:44:33 UTC (rev 66851)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java 2007-11-08 09:53:06 UTC (rev 66852)
@@ -32,6 +32,7 @@
import org.jboss.metadata.client.spec.ApplicationClientMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnvironmentRefsGroupMetaData;
import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.Environment;
@@ -213,9 +214,9 @@
}
// TODO?
@XmlTransient
- public AnnotatedEJBReferenceMetaData getAnnotatedEjbReferences()
+ public AnnotatedEJBReferencesMetaData getAnnotatedEjbReferences()
{
- AnnotatedEJBReferenceMetaData refs = null;
+ AnnotatedEJBReferencesMetaData refs = null;
if(jndiEnvironmentRefsGroup != null)
refs = jndiEnvironmentRefsGroup.getAnnotatedEjbReferences();
return refs;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java 2007-11-08 09:44:33 UTC (rev 66851)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java 2007-11-08 09:53:06 UTC (rev 66852)
@@ -26,6 +26,7 @@
import javax.xml.bind.annotation.XmlTransient;
import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
@@ -150,9 +151,9 @@
}
// TODO?
@XmlTransient
- public AnnotatedEJBReferenceMetaData getAnnotatedEjbReferences()
+ public AnnotatedEJBReferencesMetaData getAnnotatedEjbReferences()
{
- AnnotatedEJBReferenceMetaData refs = null;
+ AnnotatedEJBReferencesMetaData refs = null;
if(jndiEnvironmentRefsGroup != null)
refs = jndiEnvironmentRefsGroup.getAnnotatedEjbReferences();
return refs;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-11-08 09:44:33 UTC (rev 66851)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-11-08 09:53:06 UTC (rev 66852)
@@ -50,6 +50,7 @@
import org.jboss.metadata.javaee.jboss.IgnoreDependencyMetaData;
import org.jboss.metadata.javaee.jboss.JndiRefsMetaData;
import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
@@ -911,9 +912,9 @@
}
// TODO?
@XmlTransient
- public AnnotatedEJBReferenceMetaData getAnnotatedEjbReferences()
+ public AnnotatedEJBReferencesMetaData getAnnotatedEjbReferences()
{
- AnnotatedEJBReferenceMetaData refs = null;
+ AnnotatedEJBReferencesMetaData refs = null;
if(jndiEnvironmentRefsGroup != null)
refs = jndiEnvironmentRefsGroup.getAnnotatedEjbReferences();
return refs;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2007-11-08 09:44:33 UTC (rev 66851)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2007-11-08 09:53:06 UTC (rev 66852)
@@ -29,6 +29,7 @@
import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
@@ -350,7 +351,7 @@
}
@XmlTransient
- public AnnotatedEJBReferenceMetaData getAnnotatedEjbReferences()
+ public AnnotatedEJBReferencesMetaData getAnnotatedEjbReferences()
{
if (jndiEnvironmentRefsGroup != null)
return jndiEnvironmentRefsGroup.getAnnotatedEjbReferences();
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java 2007-11-08 09:44:33 UTC (rev 66851)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java 2007-11-08 09:53:06 UTC (rev 66852)
@@ -22,6 +22,7 @@
package org.jboss.metadata.ejb.spec;
import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
@@ -222,9 +223,9 @@
}
// TODO?
@XmlTransient
- public AnnotatedEJBReferenceMetaData getAnnotatedEjbReferences()
+ public AnnotatedEJBReferencesMetaData getAnnotatedEjbReferences()
{
- AnnotatedEJBReferenceMetaData refs = null;
+ AnnotatedEJBReferencesMetaData refs = null;
if(environment != null)
refs = environment.getAnnotatedEjbReferences();
return refs;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MutableRemoteEnvironment.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MutableRemoteEnvironment.java 2007-11-08 09:44:33 UTC (rev 66851)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MutableRemoteEnvironment.java 2007-11-08 09:53:06 UTC (rev 66852)
@@ -46,7 +46,7 @@
*
* @return the annotatedEjbReferences.
*/
- void setAnnotatedEjbReferences(AnnotatedEJBReferenceMetaData annotatedEjbReferences);
+ void setAnnotatedEjbReferences(AnnotatedEJBReferencesMetaData annotatedEjbReferences);
/**
* Set the service references
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironment.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironment.java 2007-11-08 09:44:33 UTC (rev 66851)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironment.java 2007-11-08 09:53:06 UTC (rev 66852)
@@ -59,7 +59,7 @@
*
* @return the ejbReferences.
*/
- AnnotatedEJBReferenceMetaData getAnnotatedEjbReferences();
+ AnnotatedEJBReferencesMetaData getAnnotatedEjbReferences();
/**
* Get by name
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java 2007-11-08 09:44:33 UTC (rev 66851)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java 2007-11-08 09:53:06 UTC (rev 66852)
@@ -59,7 +59,7 @@
private EnvironmentEntriesMetaData environmentEntries;
/** @EJB references */
- private transient AnnotatedEJBReferenceMetaData annotatedEjbReferences;
+ private transient AnnotatedEJBReferencesMetaData annotatedEjbReferences;
/** The ejb references */
private EJBReferencesMetaData ejbReferences;
@@ -142,12 +142,12 @@
}
@XmlTransient
- public AnnotatedEJBReferenceMetaData getAnnotatedEjbReferences()
+ public AnnotatedEJBReferencesMetaData getAnnotatedEjbReferences()
{
return annotatedEjbReferences;
}
@XmlTransient
- public void setAnnotatedEjbReferences(AnnotatedEJBReferenceMetaData annotatedEjbReferences)
+ public void setAnnotatedEjbReferences(AnnotatedEJBReferencesMetaData annotatedEjbReferences)
{
if (annotatedEjbReferences == null)
throw new IllegalArgumentException("Null annotatedEjbReferences");
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java 2007-11-08 09:44:33 UTC (rev 66851)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java 2007-11-08 09:53:06 UTC (rev 66852)
@@ -28,6 +28,7 @@
import javax.xml.bind.annotation.XmlTransient;
import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
@@ -358,9 +359,9 @@
}
// TODO?
@XmlTransient
- public AnnotatedEJBReferenceMetaData getAnnotatedEjbReferences()
+ public AnnotatedEJBReferencesMetaData getAnnotatedEjbReferences()
{
- AnnotatedEJBReferenceMetaData refs = null;
+ AnnotatedEJBReferencesMetaData refs = null;
if(jndiEnvironmentRefsGroup != null)
refs = jndiEnvironmentRefsGroup.getAnnotatedEjbReferences();
return refs;
More information about the jboss-cvs-commits
mailing list