[jboss-cvs] JBossAS SVN: r66394 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/client/spec and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 24 14:27:51 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-24 14:27:51 -0400 (Wed, 24 Oct 2007)
New Revision: 66394
Removed:
projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/spec/IServiceReferenceMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/spec/IServiceReferencesMetaData.java
Modified:
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/common/ejb/IEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.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/jboss/JBossRemoteEnvironmentRefsGroupMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/Environment.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/javaee/spec/ServiceReferenceMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
Log:
Drop the IServiceReferencesMetaData/IServiceReferenceMetaData interfaces as its uneeded indirection
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-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -27,12 +27,12 @@
import javax.xml.bind.annotation.XmlTransient;
import org.jboss.metadata.client.spec.ApplicationClientMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
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.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
@@ -234,12 +234,12 @@
return jndiEnvironmentRefsGroup.getPreDestroys();
}
- public IServiceReferenceMetaData getServiceReferenceByName(String name)
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
{
return jndiEnvironmentRefsGroup.getServiceReferenceByName(name);
}
- public IServiceReferencesMetaData getServiceReferences()
+ public ServiceReferencesMetaData getServiceReferences()
{
return jndiEnvironmentRefsGroup.getServiceReferences();
}
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-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -24,12 +24,12 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
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.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
@@ -224,11 +224,11 @@
return null;
}
- public IServiceReferenceMetaData getServiceReferenceByName(String name)
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
{
return AbstractMappedMetaData.getByName(name, getServiceReferences());
}
- public IServiceReferencesMetaData getServiceReferences()
+ public ServiceReferencesMetaData getServiceReferences()
{
if (jndiEnvironmentRefsGroup != null)
return jndiEnvironmentRefsGroup.getServiceReferences();
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEnterpriseBeanMetaData.java 2007-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/common/ejb/IEnterpriseBeanMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -23,8 +23,6 @@
import java.lang.reflect.Method;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
import org.jboss.metadata.ejb.spec.ContainerTransactionsMetaData;
import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
import org.jboss.metadata.ejb.spec.InterceptorBindingMetaData;
@@ -42,6 +40,8 @@
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
@@ -100,8 +100,8 @@
public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences();;
public ResourceReferenceMetaData getResourceReferenceByName(String name);
public ResourceReferencesMetaData getResourceReferences();;
- public IServiceReferenceMetaData getServiceReferenceByName(String name);
- public IServiceReferencesMetaData getServiceReferences();;
+ public ServiceReferenceMetaData getServiceReferenceByName(String name);
+ public ServiceReferencesMetaData getServiceReferences();;
public MethodPermissionsMetaData getMethodPermissions();;
public ContainerTransactionsMetaData getContainerTransactions();;
public TransAttributeType getMethodTransactionType(String methodName, Class<?>[] params, MethodInterfaceType iface);
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/spec/IServiceReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/spec/IServiceReferenceMetaData.java 2007-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/spec/IServiceReferenceMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option); any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.common.javaee.spec;
-
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
-import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
-import org.jboss.metadata.javaee.spec.EmptyMetaData;
-import org.jboss.metadata.javaee.spec.PortComponentRef;
-import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferenceHandlerChainsMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferenceHandlersMetaData;
-import org.jboss.metadata.javaee.support.IdMetaData;
-import org.jboss.metadata.javaee.support.MergeableMappedMetaData;
-
-/**
- * Common interface to ServiceReferenceMetaData
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public interface IServiceReferenceMetaData
- extends MergeableMappedMetaData<IServiceReferenceMetaData>,
- IdMetaData
-{
- public DescriptionGroupMetaData getDescriptionGroup();
- public void setDescriptionGroup(DescriptionGroupMetaData descriptionGroup);
- public String getJndiName();
- public void setJndiName(String jndiName);
- public String getMappedName();
- public void setMappedName(String mappedName);
- public Set<ResourceInjectionTargetMetaData> getInjectionTargets();
- public void setInjectionTargets(Set<ResourceInjectionTargetMetaData> injectionTargets);
- public EmptyMetaData getIgnoreDependency();
- public void setIgnoreDependency(EmptyMetaData ignoreDependency);
- public boolean isDependencyIgnored();
-
- public String getServiceRefName();
- public void setServiceRefName(String serviceRefName);
- public String getJaxrpcMappingFile();
- public void setJaxrpcMappingFile(String jaxrpcMappingFile);
- public String getServiceInterface();
- public void setServiceInterface(String serviceInterface);
- public QName getServiceQname();
- public void setServiceQname(QName serviceQname);
- public String getServiceRefType();
- public void setServiceRefType(String serviceRefType);
- public String getWsdlFile();
- public void setWsdlFile(String wsdlFile);
- public PortComponentRef getPortComponentRef();
- public void setPortComponentRef(PortComponentRef portComponentRef);
- public ServiceReferenceHandlersMetaData getHandlers();
- public void setHandlers(ServiceReferenceHandlersMetaData handlers);
- public ServiceReferenceHandlerChainsMetaData getHandlerChains();
- public void setHandlerChains(ServiceReferenceHandlerChainsMetaData handlerChains);
- public void merge(IServiceReferenceMetaData override, IServiceReferenceMetaData original);
-}
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/spec/IServiceReferencesMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/spec/IServiceReferencesMetaData.java 2007-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/common/javaee/spec/IServiceReferencesMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metadata.common.javaee.spec;
-
-import org.jboss.metadata.javaee.support.MappedMetaData;
-
-/**
- * Common interface to ServiceReferencesMetaData
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public interface IServiceReferencesMetaData
- extends MappedMetaData<IServiceReferenceMetaData>
-{
-
-}
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-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -31,8 +31,6 @@
import org.jboss.metadata.common.ejb.IEjbJarMetaData;
import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
import org.jboss.metadata.common.ejb.IEnterpriseBeansMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
import org.jboss.metadata.ejb.spec.ContainerTransactionMetaData;
import org.jboss.metadata.ejb.spec.ContainerTransactionsMetaData;
import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
@@ -59,6 +57,8 @@
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
@@ -934,12 +934,12 @@
return jndiEnvironmentRefsGroup.getResourceReferences();
}
- public IServiceReferenceMetaData getServiceReferenceByName(String name)
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
{
return AbstractMappedMetaData.getByName(name, getServiceReferences());
}
- public IServiceReferencesMetaData getServiceReferences()
+ public ServiceReferencesMetaData getServiceReferences()
{
return jndiEnvironmentRefsGroup.getServiceReferences();
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java 2007-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnvironmentRefsGroupMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -25,7 +25,6 @@
import javax.xml.bind.annotation.XmlElement;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
import org.jboss.metadata.javaee.jboss.JBossServiceReferenceMetaData;
import org.jboss.metadata.javaee.jboss.JBossServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
@@ -115,14 +114,14 @@
}
- public IServiceReferencesMetaData getServiceReferences()
+ public ServiceReferencesMetaData getServiceReferences()
{
return serviceReferences;
}
@JBossXmlCollection(type=JBossServiceReferencesMetaData.class)
@XmlElement(name="service-ref", type=JBossServiceReferenceMetaData.class)
- public void setServiceReferences(IServiceReferencesMetaData serviceReferences)
+ public void setServiceReferences(ServiceReferencesMetaData serviceReferences)
{
this.serviceReferences = (JBossServiceReferencesMetaData) serviceReferences;
}
@@ -178,7 +177,7 @@
ResourceReferencesMetaData jbossResRefs = null;
ResourceEnvironmentReferencesMetaData resEnvRefs = null;
ResourceEnvironmentReferencesMetaData jbossResEnvRefs = null;
- IServiceReferencesMetaData serviceRefs = null;
+ ServiceReferencesMetaData serviceRefs = null;
JBossServiceReferencesMetaData jbossServiceRefs = null;
MessageDestinationReferencesMetaData messageDestinationRefs = null;
MessageDestinationReferencesMetaData jbossMessageDestinationRefs = null;
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-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EnterpriseBeanMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -28,8 +28,6 @@
import org.jboss.metadata.common.ejb.IEjbJarMetaData;
import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
import org.jboss.metadata.common.ejb.IEnterpriseBeansMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
@@ -38,6 +36,8 @@
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
@@ -431,12 +431,12 @@
return null;
}
- public IServiceReferenceMetaData getServiceReferenceByName(String name)
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
{
return AbstractMappedMetaData.getByName(name, getServiceReferences());
}
- public IServiceReferencesMetaData getServiceReferences()
+ public ServiceReferencesMetaData getServiceReferences()
{
if (jndiEnvironmentRefsGroup != null)
return jndiEnvironmentRefsGroup.getServiceReferences();
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-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -21,8 +21,6 @@
*/
package org.jboss.metadata.ejb.spec;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
@@ -31,6 +29,8 @@
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
@@ -305,12 +305,12 @@
return null;
}
- public IServiceReferenceMetaData getServiceReferenceByName(String name)
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
{
return AbstractMappedMetaData.getByName(name, getServiceReferences());
}
- public IServiceReferencesMetaData getServiceReferences()
+ public ServiceReferencesMetaData getServiceReferences()
{
if (environment != null)
return environment.getServiceReferences();
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossRemoteEnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossRemoteEnvironmentRefsGroupMetaData.java 2007-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossRemoteEnvironmentRefsGroupMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -21,9 +21,9 @@
*/
package org.jboss.metadata.javaee.jboss;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
@@ -66,8 +66,8 @@
EnvironmentEntriesMetaData envEntries = null;
EJBReferencesMetaData ejbRefs = null;
EJBReferencesMetaData jbossEjbRefs = null;
- IServiceReferencesMetaData serviceRefs = null;
- IServiceReferencesMetaData jbossServiceRefs = null;
+ ServiceReferencesMetaData serviceRefs = null;
+ ServiceReferencesMetaData jbossServiceRefs = null;
ResourceReferencesMetaData resRefs = null;
ResourceReferencesMetaData jbossResRefs = null;
ResourceEnvironmentReferencesMetaData resEnvRefs = null;
@@ -104,7 +104,7 @@
if (mergedEjbRefs != null)
merged.setEjbReferences(mergedEjbRefs);
- IServiceReferencesMetaData mergedServiceRefs = ServiceReferencesMetaData.merge(jbossServiceRefs, serviceRefs, overridenFile, overrideFile);
+ ServiceReferencesMetaData mergedServiceRefs = ServiceReferencesMetaData.merge(jbossServiceRefs, serviceRefs, overridenFile, overrideFile);
if (mergedServiceRefs != null)
merged.setServiceReferences(mergedServiceRefs);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java 2007-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -24,8 +24,8 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
/**
<xsd:sequence>
@@ -159,8 +159,8 @@
*/
public void merge(JBossServiceReferenceMetaData override, JBossServiceReferenceMetaData original)
{
- IServiceReferenceMetaData sr0 = override;
- IServiceReferenceMetaData sr1 = original;
+ ServiceReferenceMetaData sr0 = override;
+ ServiceReferenceMetaData sr1 = original;
super.merge(sr0, sr1);
/* TODO
if (override != null && override.serviceClass != null)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java 2007-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -23,10 +23,10 @@
import javax.xml.bind.annotation.XmlType;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
import org.jboss.metadata.javaee.support.JavaEEMetaDataUtil;
@@ -37,8 +37,7 @@
*/
@XmlType(name="service-refType")
public class JBossServiceReferencesMetaData
- extends AbstractMappedMetaData<IServiceReferenceMetaData>
- implements IServiceReferencesMetaData
+ extends ServiceReferencesMetaData
{
/** The serialVersionUID */
private static final long serialVersionUID = 1;
@@ -48,7 +47,6 @@
*/
public JBossServiceReferencesMetaData()
{
- super("service ref name for service ref");
}
/**
* Merge resource references
@@ -59,7 +57,7 @@
* @param overrideFile the override file
* @return the merged referencees
*/
- public static JBossServiceReferencesMetaData merge(JBossServiceReferencesMetaData override, IServiceReferencesMetaData overriden, String overridenFile, String overrideFile)
+ public static JBossServiceReferencesMetaData merge(JBossServiceReferencesMetaData override, ServiceReferencesMetaData overriden, String overridenFile, String overrideFile)
{
if (override == null && overriden == null)
return null;
@@ -67,12 +65,12 @@
JBossServiceReferencesMetaData merged = new JBossServiceReferencesMetaData();
if(override != null)
{
- for(IServiceReferenceMetaData ref : override)
+ for(ServiceReferenceMetaData ref : override)
{
JBossServiceReferenceMetaData jref = (JBossServiceReferenceMetaData) ref;
if(overriden != null)
{
- IServiceReferenceMetaData sref = overriden.get(ref.getServiceRefName());
+ ServiceReferenceMetaData sref = overriden.get(ref.getServiceRefName());
if(sref != null)
jref.merge(null, sref);
}
@@ -81,7 +79,7 @@
}
else if(overriden != null)
{
- for(IServiceReferenceMetaData ref : overriden)
+ for(ServiceReferenceMetaData ref : overriden)
{
JBossServiceReferenceMetaData jref = new JBossServiceReferenceMetaData();
jref.merge(null, ref);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/Environment.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/Environment.java 2007-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/Environment.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -21,8 +21,6 @@
*/
package org.jboss.metadata.javaee.spec;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
/**
* Environment.
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-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironment.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -21,8 +21,6 @@
*/
package org.jboss.metadata.javaee.spec;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
/**
* Environment.
@@ -69,7 +67,7 @@
* Get the service references
* @return
*/
- IServiceReferencesMetaData getServiceReferences();
+ ServiceReferencesMetaData getServiceReferences();
/**
* Get by name
@@ -78,7 +76,7 @@
* @return the result or null if not found
* @throws IllegalArgumentException for a null name
*/
- IServiceReferenceMetaData getServiceReferenceByName(String name);
+ ServiceReferenceMetaData getServiceReferenceByName(String name);
/**
* Get the resourceReferences.
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-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/RemoteEnvironmentRefsGroupMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -24,8 +24,6 @@
import java.io.Serializable;
import javax.xml.bind.annotation.XmlElement;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
import org.jboss.xb.annotations.JBossXmlCollection;
import org.jboss.xb.annotations.JBossXmlModelGroup;
@@ -141,7 +139,7 @@
*
* @return the serviceReferences.
*/
- public IServiceReferencesMetaData getServiceReferences()
+ public ServiceReferencesMetaData getServiceReferences()
{
return serviceReferences;
}
@@ -154,7 +152,7 @@
*/
@JBossXmlCollection(type=ServiceReferencesMetaData.class)
@XmlElement(name="service-ref", type=ServiceReferenceMetaData.class)
- public void setServiceReferences(IServiceReferencesMetaData serviceReferences)
+ public void setServiceReferences(ServiceReferencesMetaData serviceReferences)
{
this.serviceReferences = (ServiceReferencesMetaData)serviceReferences;
}
@@ -334,7 +332,7 @@
{
return AbstractMappedMetaData.getByName(name, resourceReferences);
}
- public IServiceReferenceMetaData getServiceReferenceByName(String name)
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
{
return AbstractMappedMetaData.getByName(name, serviceReferences);
}
@@ -344,8 +342,8 @@
EnvironmentEntriesMetaData envEntries = null;
EJBReferencesMetaData ejbRefs = null;
EJBReferencesMetaData jbossEjbRefs = null;
- IServiceReferencesMetaData serviceRefs = null;
- IServiceReferencesMetaData jbossServiceRefs = null;
+ ServiceReferencesMetaData serviceRefs = null;
+ ServiceReferencesMetaData jbossServiceRefs = null;
ResourceReferencesMetaData resRefs = null;
ResourceReferencesMetaData jbossResRefs = null;
ResourceEnvironmentReferencesMetaData resEnvRefs = null;
@@ -382,7 +380,7 @@
if (mergedEjbRefs != null)
setEjbReferences(mergedEjbRefs);
- IServiceReferencesMetaData mergedServiceRefs = ServiceReferencesMetaData.merge(jbossServiceRefs, serviceRefs, "", "");
+ ServiceReferencesMetaData mergedServiceRefs = ServiceReferencesMetaData.merge(jbossServiceRefs, serviceRefs, "", "");
if (mergedServiceRefs != null)
setServiceReferences(mergedServiceRefs);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java 2007-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferenceMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -25,7 +25,6 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
import org.jboss.metadata.javaee.support.MergeableMappedMetaData;
import org.jboss.metadata.javaee.support.ResourceInjectionMetaDataWithDescriptionGroup;
@@ -38,8 +37,7 @@
*/
@XmlType(name="service-refType")
public class ServiceReferenceMetaData extends ResourceInjectionMetaDataWithDescriptionGroup
- implements MergeableMappedMetaData<IServiceReferenceMetaData>,
- IServiceReferenceMetaData
+ implements MergeableMappedMetaData<ServiceReferenceMetaData>
{
/** The serialVersionUID */
private static final long serialVersionUID = 5693673588576610322L;
@@ -76,9 +74,9 @@
// For serialization
}
- public IServiceReferenceMetaData merge(IServiceReferenceMetaData original)
+ public ServiceReferenceMetaData merge(ServiceReferenceMetaData original)
{
- IServiceReferenceMetaData merged = new ServiceReferenceMetaData();
+ ServiceReferenceMetaData merged = new ServiceReferenceMetaData();
merged.merge(this, original);
return merged;
}
@@ -89,7 +87,7 @@
* @param override data which overrides original
* @param original the original data
*/
- public void merge(IServiceReferenceMetaData override, IServiceReferenceMetaData original)
+ public void merge(ServiceReferenceMetaData override, ServiceReferenceMetaData original)
{
super.merge((ResourceInjectionMetaDataWithDescriptionGroup)override,
(ResourceInjectionMetaDataWithDescriptionGroup)original);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java 2007-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/ServiceReferencesMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -21,8 +21,6 @@
*/
package org.jboss.metadata.javaee.spec;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
import org.jboss.metadata.javaee.support.JavaEEMetaDataUtil;
@@ -34,8 +32,7 @@
*/
//@SchemaGroup(name="service-refGroup")
public class ServiceReferencesMetaData
- extends AbstractMappedMetaData<IServiceReferenceMetaData>
- implements IServiceReferencesMetaData
+ extends AbstractMappedMetaData<ServiceReferenceMetaData>
{
/** The serialVersionUID */
private static final long serialVersionUID = -2667900705228419782L;
@@ -56,18 +53,6 @@
* @param overrideFile the override file
* @return the merged referencees
*/
- public static IServiceReferencesMetaData merge(IServiceReferencesMetaData override, IServiceReferencesMetaData overriden, String overridenFile, String overrideFile)
- {
- if (override == null && overriden == null)
- return null;
-
- if (override == null)
- return overriden;
-
- ServiceReferencesMetaData merged = new ServiceReferencesMetaData();
- return JavaEEMetaDataUtil.merge(merged, overriden, override, "service-ref", overridenFile, overrideFile, true);
- }
-
public static ServiceReferencesMetaData merge(ServiceReferencesMetaData override, ServiceReferencesMetaData overriden, String overridenFile, String overrideFile)
{
if (override == null && overriden == null)
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java 2007-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/merge/MergeUtil.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -21,11 +21,11 @@
*/
package org.jboss.metadata.merge;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
@@ -59,8 +59,8 @@
EnvironmentEntriesMetaData envEntries = null;
EJBReferencesMetaData ejbRefs = null;
EJBReferencesMetaData jbossEjbRefs = null;
- IServiceReferencesMetaData serviceRefs = null;
- IServiceReferencesMetaData jbossServiceRefs = null;
+ ServiceReferencesMetaData serviceRefs = null;
+ ServiceReferencesMetaData jbossServiceRefs = null;
ResourceReferencesMetaData resRefs = null;
ResourceReferencesMetaData jbossResRefs = null;
ResourceEnvironmentReferencesMetaData resEnvRefs = null;
@@ -97,7 +97,7 @@
if (mergedEjbRefs != null)
merged.setEjbReferences(mergedEjbRefs);
- IServiceReferencesMetaData mergedServiceRefs = ServiceReferencesMetaData.merge(jbossServiceRefs, serviceRefs, overridenFile, overrideFile);
+ ServiceReferencesMetaData mergedServiceRefs = ServiceReferencesMetaData.merge(jbossServiceRefs, serviceRefs, overridenFile, overrideFile);
if (mergedServiceRefs != null)
merged.setServiceReferences(mergedServiceRefs);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2007-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -31,8 +31,6 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnvironmentRefsGroupMetaData;
@@ -41,6 +39,8 @@
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.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
@@ -707,13 +707,13 @@
}
@XmlTransient
- public IServiceReferenceMetaData getServiceReferenceByName(String name)
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
{
return AbstractMappedMetaData.getByName(name, getServiceReferences());
}
@XmlTransient
- public IServiceReferencesMetaData getServiceReferences()
+ public ServiceReferencesMetaData getServiceReferences()
{
return getMergedEnvironment().getServiceReferences();
}
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-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -27,8 +27,6 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
@@ -38,6 +36,8 @@
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
@@ -439,12 +439,12 @@
return null;
}
- public IServiceReferenceMetaData getServiceReferenceByName(String name)
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
{
return AbstractMappedMetaData.getByName(name, getServiceReferences());
}
- public IServiceReferencesMetaData getServiceReferences()
+ public ServiceReferencesMetaData getServiceReferences()
{
if (jndiEnvironmentRefsGroup != null)
return jndiEnvironmentRefsGroup.getServiceReferences();
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java 2007-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xUnitTestCase.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -38,8 +38,6 @@
import org.jboss.metadata.BeanMetaData;
import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
import org.jboss.metadata.common.ejb.IEnterpriseBeansMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
@@ -49,10 +47,10 @@
import org.jboss.metadata.javaee.spec.DescriptionImpl;
import org.jboss.metadata.javaee.spec.DisplayNameImpl;
import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
-import org.jboss.metadata.javaee.spec.IconImpl;
-import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
+import org.jboss.metadata.javaee.spec.IconImpl;
+import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -208,9 +206,9 @@
IEnterpriseBeansMetaData beans = result.getEnterpriseBeans();
assertNotNull(beans);
IEnterpriseBeanMetaData bean = beans.get("StatelessSession1");
- IServiceReferencesMetaData serviceRefs = bean.getServiceReferences();
+ ServiceReferencesMetaData serviceRefs = bean.getServiceReferences();
assertNotNull(serviceRefs);
- IServiceReferenceMetaData srmd = serviceRefs.get("session1/Hello");
+ ServiceReferenceMetaData srmd = serviceRefs.get("session1/Hello");
assertNotNull(srmd);
assertEquals("session1-service-ref", srmd.getId());
assertEquals("session1/Hello", srmd.getServiceRefName());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2007-10-24 17:52:51 UTC (rev 66393)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2007-10-24 18:27:51 UTC (rev 66394)
@@ -37,8 +37,6 @@
import org.jboss.metadata.MessageDestinationRefMetaData;
import org.jboss.metadata.ResourceEnvRefMetaData;
import org.jboss.metadata.ResourceRefMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferenceMetaData;
-import org.jboss.metadata.common.javaee.spec.IServiceReferencesMetaData;
import org.jboss.metadata.javaee.jboss.AnnotationMetaData;
import org.jboss.metadata.javaee.jboss.AnnotationPropertiesMetaData;
import org.jboss.metadata.javaee.jboss.AnnotationPropertyMetaData;
@@ -57,6 +55,8 @@
import org.jboss.metadata.javaee.spec.Environment;
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.javaee.spec.IconsImpl;
import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
@@ -489,7 +489,7 @@
assertEquals(size + 1, count);
}
- private void assertServiceRefs(String prefix, int size, IServiceReferencesMetaData serviceReferencesMetaData, boolean full)
+ private void assertServiceRefs(String prefix, int size, ServiceReferencesMetaData serviceReferencesMetaData, boolean full)
{
if(full == false)
return;
@@ -497,7 +497,7 @@
assertNotNull("no service refs are set for: "+prefix, serviceReferencesMetaData);
assertEquals(size, serviceReferencesMetaData.size());
int count = 1;
- for (IServiceReferenceMetaData ref : serviceReferencesMetaData)
+ for (ServiceReferenceMetaData ref : serviceReferencesMetaData)
{
assertId(prefix + "ServiceRef" + count, ref);
assertDescriptions(prefix + "ServiceRef" + count, ref.getDescriptionGroup().getDescriptions());
More information about the jboss-cvs-commits
mailing list