[jboss-cvs] JBossAS SVN: r65956 - in projects/metadata/trunk/src/main/java/org/jboss/metadata/web: spec and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 8 23:49:54 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-08 23:49:54 -0400 (Mon, 08 Oct 2007)
New Revision: 65956
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50WebMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/JspConfigMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/LocaleEncodingsMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebResourceCollectionMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WelcomeFileListMetaData.java
Log:
Ad jboss-web metadata
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50WebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50WebMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50WebMetaData.java 2007-10-09 03:49:54 UTC (rev 65956)
@@ -0,0 +1,46 @@
+/*
+ * 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.web.jboss;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at XmlRootElement(name="jboss-web", namespace=JavaEEMetaDataConstants.JBOSS_NS)
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace=JavaEEMetaDataConstants.JBOSS_NS,
+ elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlType(name="jboss-webType", namespace=JavaEEMetaDataConstants.JBOSS_NS)
+public class JBoss50WebMetaData extends JBossWebMetaData
+{
+
+}
Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBoss50WebMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: 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 (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2007-10-09 03:49:54 UTC (rev 65956)
@@ -0,0 +1,359 @@
+/*
+ * 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.web.jboss;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.bind.annotation.XmlTransient;
+
+import org.jboss.metadata.ejb.jboss.JBossEnvironmentRefsGroupMetaData;
+import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
+import org.jboss.metadata.javaee.spec.EnvironmentEntryMetaData;
+import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
+import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceContextReferencesMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferenceMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
+import org.jboss.metadata.javaee.spec.RunAsMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+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.IdMetaDataImplWithOverride;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.metadata.web.spec.WebMetaData;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class JBossWebMetaData extends IdMetaDataImplWithOverride<WebMetaData>
+{
+ private static final long serialVersionUID = 1;
+
+ private String contextRoot;
+ private String alternativeDD;
+ private String securityDomain;
+ private String jaccContextID;
+ private boolean java2ClassLoadingCompliance;
+ /** A list of extra dependencies to wait on */
+ private List<String> depends;
+ /** */
+ private Map<String, SecurityRoleMetaData> runAsIdentity = new HashMap<String, SecurityRoleMetaData>();
+ private SecurityRolesMetaData securityRoles;
+ /** The environment */
+ private JBossEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup;
+ /** The merged environment */
+ private transient JBossEnvironmentRefsGroupMetaData mergedEnvironment;
+
+ public String getAlternativeDD()
+ {
+ return alternativeDD;
+ }
+ public void setAlternativeDD(String alternativeDD)
+ {
+ this.alternativeDD = alternativeDD;
+ }
+ public String getContextRoot()
+ {
+ return contextRoot;
+ }
+ public void setContextRoot(String contextRoot)
+ {
+ this.contextRoot = contextRoot;
+ }
+
+ public List<String> getDepends()
+ {
+ return depends;
+ }
+ public void setDepends(List<String> depends)
+ {
+ this.depends = depends;
+ }
+
+ public boolean isJava2ClassLoadingCompliance()
+ {
+ return java2ClassLoadingCompliance;
+ }
+ public void setJava2ClassLoadingCompliance(boolean java2ClassLoadingCompliance)
+ {
+ this.java2ClassLoadingCompliance = java2ClassLoadingCompliance;
+ }
+
+ public String getJaccContextID()
+ {
+ return jaccContextID;
+ }
+ public void setJaccContextID(String jaccContextID)
+ {
+ this.jaccContextID = jaccContextID;
+ }
+ public String getSecurityDomain()
+ {
+ return securityDomain;
+ }
+ public void setSecurityDomain(String securityDomain)
+ {
+ this.securityDomain = securityDomain;
+ }
+ public SecurityRolesMetaData getSecurityRoles()
+ {
+ return securityRoles;
+ }
+ public void setSecurityRoles(SecurityRolesMetaData securityRoles)
+ {
+ this.securityRoles = securityRoles;
+ }
+
+ public Map<String, Set<String>> getPrincipalVersusRolesMap()
+ {
+ Map<String, Set<String>> principalRolesMap = null;
+
+ for(SecurityRoleMetaData srm : securityRoles)
+ {
+ String rolename = srm.getRoleName();
+ if(principalRolesMap == null)
+ principalRolesMap = new HashMap<String, Set<String>>();
+ for(String pr : srm.getPrincipals())
+ {
+ Set<String> roleset = (Set<String>)principalRolesMap.get(pr);
+ if(roleset == null)
+ roleset = new HashSet<String>();
+ if(!roleset.contains(rolename))
+ roleset.add(rolename);
+ principalRolesMap.put(pr, roleset);
+ }
+ }
+ return principalRolesMap;
+ }
+
+ /**
+ * Get the jndiEnvironmentRefsGroup.
+ *
+ * @return the jndiEnvironmentRefsGroup.
+ */
+ public JBossEnvironmentRefsGroupMetaData getJbossJndiEnvironmentRefsGroup()
+ {
+ return jndiEnvironmentRefsGroup;
+ }
+
+ /**
+ * Set the jndiEnvironmentRefsGroup.
+ *
+ * @param jndiEnvironmentRefsGroup the jndiEnvironmentRefsGroup.
+ * @throws IllegalArgumentException for a null jndiEnvironmentRefsGroup
+ */
+ public void setJbossJndiEnvironmentRefsGroup(JBossEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup)
+ {
+ if (jndiEnvironmentRefsGroup == null)
+ throw new IllegalArgumentException("Null jndiEnvironmentRefsGroup");
+ this.jndiEnvironmentRefsGroup = jndiEnvironmentRefsGroup;
+ }
+
+ /**
+ * Get the mergedEnvironment.
+ * TODO
+ *
+ * @return the mergedEnvironment.
+ */
+ @XmlTransient
+ public JBossEnvironmentRefsGroupMetaData getMergedEnvironment()
+ {
+ if (mergedEnvironment != null)
+ return mergedEnvironment;
+
+ try
+ {
+ mergedEnvironment = JBossEnvironmentRefsGroupMetaData.merge(jndiEnvironmentRefsGroup,
+ this.getOverridenMetaData().getJndiEnvironmentRefsGroup(),
+ "web.xml", "jboss-web.xml");
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Error merging jndi environment for " + getId(), e);
+ }
+ return mergedEnvironment;
+ }
+
+ public EnvironmentEntriesMetaData getEnvironmentEntries()
+ {
+ return getMergedEnvironment().getEnvironmentEntries();
+ }
+
+ public EnvironmentEntryMetaData getEnvironmentEntryByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getEnvironmentEntries());
+ }
+
+ public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getMessageDestinationReferences());
+ }
+
+ public MessageDestinationReferencesMetaData getMessageDestinationReferences()
+ {
+ return getMergedEnvironment().getMessageDestinationReferences();
+ }
+
+ public PersistenceContextReferenceMetaData getPersistenceContextReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getPersistenceContextRefs());
+ }
+
+ public PersistenceContextReferencesMetaData getPersistenceContextRefs()
+ {
+ return getMergedEnvironment().getPersistenceContextRefs();
+ }
+
+ public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getPersistenceUnitRefs());
+ }
+
+ public PersistenceUnitReferencesMetaData getPersistenceUnitRefs()
+ {
+ return getMergedEnvironment().getPersistenceUnitRefs();
+ }
+
+ public LifecycleCallbacksMetaData getPostConstructs()
+ {
+ return getMergedEnvironment().getPostConstructs();
+ }
+
+ public LifecycleCallbacksMetaData getPreDestroys()
+ {
+ return getMergedEnvironment().getPreDestroys();
+ }
+
+ public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getResourceEnvironmentReferences());
+ }
+
+ public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences()
+ {
+ return getMergedEnvironment().getResourceEnvironmentReferences();
+ }
+
+ public ResourceReferenceMetaData getResourceReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getResourceReferences());
+ }
+
+ public ResourceReferencesMetaData getResourceReferences()
+ {
+ return getMergedEnvironment().getResourceReferences();
+ }
+
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getServiceReferences());
+ }
+
+ public ServiceReferencesMetaData getServiceReferences()
+ {
+ return getMergedEnvironment().getServiceReferences();
+ }
+
+ /**
+ * Get the security identity
+ *
+ * @return the security identity
+ */
+ public SecurityIdentityMetaData getSecurityIdentity()
+ {
+ // This is hacky because of the stupid way security identity is included in the environment
+ if (getOverridenMetaData() == null)
+ {
+ if (jndiEnvironmentRefsGroup == null)
+ return null;
+ else
+ return jndiEnvironmentRefsGroup.getSecurityIdentity();
+ }
+ return getMergedEnvironment().getSecurityIdentity();
+ }
+
+ /**
+ * Access the RunAsIdentity associated with the given servlet
+ * @param servletName - the servlet-name from the web.xml
+ * @return RunAsIdentity for the servet if one exists, null otherwise
+ */
+ public SecurityRoleMetaData getRunAsIdentity(String servletName)
+ {
+ SecurityRoleMetaData srmd = runAsIdentity.get(servletName);
+ if (srmd == null)
+ {
+ ServletMetaData servlet = getOverridenMetaData().getServlets().get(servletName);
+ if (servlet == null)
+ {
+ // Check for a web.xml run-as only specification
+ synchronized (runAsIdentity)
+ {
+ RunAsMetaData runAs = servlet.getRunAs();
+ if (runAs != null)
+ {
+ String roleName = runAs.getRoleName();
+ srmd = new SecurityRoleMetaData();
+ srmd.setName(roleName);
+ runAsIdentity.put(servletName, srmd);
+ }
+ }
+ }
+ }
+ return srmd;
+ }
+
+ /**
+ *
+ * @return servlet/run-as <String servlet-name, SecurityRoleMetaData>
+ */
+ public Map<String, SecurityRoleMetaData> getRunAsIdentity()
+ {
+ return runAsIdentity;
+ }
+
+ /** The jboss-web.xml servlet/run-as <String servlet-name, SecurityRoleMetaData>
+ */
+ public void setRunAsIdentity(Map<String, SecurityRoleMetaData> runAsIdentity)
+ {
+ this.runAsIdentity.clear();
+ this.runAsIdentity.putAll(runAsIdentity);
+ }
+
+ public void mergeSecurityRoles(SecurityRolesMetaData roles)
+ {
+
+ }
+}
Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/JspConfigMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/JspConfigMetaData.java 2007-10-09 03:49:41 UTC (rev 65955)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/JspConfigMetaData.java 2007-10-09 03:49:54 UTC (rev 65956)
@@ -36,8 +36,8 @@
public class JspConfigMetaData extends IdMetaDataImpl
{
private static final long serialVersionUID = 1;
- private List<TaglibMetaData> taglib = Collections.emptyList();
- private List<JspPropertyGroup> propertyGroups = Collections.emptyList();
+ private List<TaglibMetaData> taglib;
+ private List<JspPropertyGroup> propertyGroups;
public List<TaglibMetaData> getTaglibs()
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/LocaleEncodingsMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/LocaleEncodingsMetaData.java 2007-10-09 03:49:41 UTC (rev 65955)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/LocaleEncodingsMetaData.java 2007-10-09 03:49:54 UTC (rev 65956)
@@ -36,7 +36,7 @@
{
private static final long serialVersionUID = 1;
- private List<LocaleEncodingMetaData> mappings = Collections.emptyList();
+ private List<LocaleEncodingMetaData> mappings;
public List<LocaleEncodingMetaData> getMappings()
{
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-09 03:49:41 UTC (rev 65955)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebMetaData.java 2007-10-09 03:49:54 UTC (rev 65956)
@@ -26,26 +26,33 @@
import javax.xml.bind.annotation.XmlElement;
+import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
+import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
+import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.EmptyMetaData;
+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.EnvironmentRefsGroupMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferenceMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationReferencesMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
import org.jboss.metadata.javaee.spec.ParamValueMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceContextReferencesMetaData;
import org.jboss.metadata.javaee.spec.PersistenceUnitReferenceMetaData;
import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
-import org.jboss.metadata.javaee.spec.RemoteEnvironment;
-import org.jboss.metadata.javaee.spec.RemoteEnvironmentRefsGroupMetaData;
import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferenceMetaData;
import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData;
import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ResourceReferencesMetaData;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+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.IdMetaDataImplWithDescriptionGroup;
@@ -55,30 +62,30 @@
* @version $Revision$
*/
public class WebMetaData extends IdMetaDataImplWithDescriptionGroup
- implements RemoteEnvironment
+ implements Environment
{
private static final long serialVersionUID = 1;
private EmptyMetaData distributable;
- private List<ParamValueMetaData> contextParams = Collections.emptyList();
+ private List<ParamValueMetaData> contextParams;
private SessionConfigMetaData sessionConfig;
private FiltersMetaData filters;
private FilterMappingsMetaData filterMappings;
- private List<ErrorPageMetaData> errorPages = Collections.emptyList();
- private List<JspConfigMetaData> jspConfig = Collections.emptyList();
- private List<ListenerMetaData> listeners = Collections.emptyList();
- private List<LoginConfigMetaData> loginConfig = Collections.emptyList();
- private List<MimeMappingMetaData> mimeMappings = Collections.emptyList();
+ private List<ErrorPageMetaData> errorPages;
+ private List<JspConfigMetaData> jspConfig;
+ private List<ListenerMetaData> listeners;
+ private List<LoginConfigMetaData> loginConfig;
+ private List<MimeMappingMetaData> mimeMappings;
private ServletsMetaData servlets;
private ServletMappingsMetaData servletMappings;
- private List<SecurityConstraintMetaData> securityContraints = Collections.emptyList();
+ private List<SecurityConstraintMetaData> securityContraints;
private SecurityRolesMetaData securityRoles;
private WelcomeFileListMetaData welcomeFileList;
private LocaleEncodingsMetaData localEncodings;
/** The environment */
- private RemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup;
-
+ private EnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup;
+
/** The message destinations */
private MessageDestinationsMetaData messageDestinations;
@@ -235,6 +242,41 @@
this.welcomeFileList = welcomeFileList;
}
+ /**
+ * Get the jndiEnvironmentRefsGroup.
+ *
+ * @return the jndiEnvironmentRefsGroup.
+ */
+ public EnvironmentRefsGroupMetaData getJndiEnvironmentRefsGroup()
+ {
+ return jndiEnvironmentRefsGroup;
+ }
+
+ /**
+ * Set the jndiEnvironmentRefsGroup.
+ *
+ * @param jndiEnvironmentRefsGroup the jndiEnvironmentRefsGroup.
+ * @throws IllegalArgumentException for a null jndiEnvironmentRefsGroup
+ */
+ public void setJndiEnvironmentRefsGroup(EnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup)
+ {
+ if (jndiEnvironmentRefsGroup == null)
+ throw new IllegalArgumentException("Null jndiEnvironmentRefsGroup");
+ this.jndiEnvironmentRefsGroup = jndiEnvironmentRefsGroup;
+ }
+
+ public EJBLocalReferenceMetaData getEjbLocalReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getEjbLocalReferences());
+ }
+
+ public EJBLocalReferencesMetaData getEjbLocalReferences()
+ {
+ if (jndiEnvironmentRefsGroup != null)
+ return jndiEnvironmentRefsGroup.getEjbLocalReferences();
+ return null;
+ }
+
public EJBReferenceMetaData getEjbReferenceByName(String name)
{
return AbstractMappedMetaData.getByName(name, getEjbReferences());
@@ -259,24 +301,6 @@
return AbstractMappedMetaData.getByName(name, getEnvironmentEntries());
}
- protected RemoteEnvironmentRefsGroupMetaData getJndiEnvironmentRefsGroup()
- {
- return jndiEnvironmentRefsGroup;
- }
-
- /**
- * Get a message destination
- *
- * @param name the name of the destination
- * @return the destination or null if not found
- */
- public MessageDestinationMetaData getMessageDestinationByName(String name)
- {
- if (messageDestinations == null)
- return null;
- return messageDestinations.get(name);
- }
-
public MessageDestinationReferenceMetaData getMessageDestinationReferenceByName(String name)
{
return AbstractMappedMetaData.getByName(name, getMessageDestinationReferences());
@@ -289,33 +313,30 @@
return null;
}
- /**
- * Get the messageDestinations.
- *
- * @return the messageDestinations.
- */
- public MessageDestinationsMetaData getMessageDestinations()
+ public PersistenceContextReferenceMetaData getPersistenceContextReferenceByName(String name)
{
- return messageDestinations;
+ return AbstractMappedMetaData.getByName(name, getPersistenceContextRefs());
}
- public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
+ public PersistenceContextReferencesMetaData getPersistenceContextRefs()
{
- return AbstractMappedMetaData.getByName(name, getResourceEnvironmentReferences());
+ if (jndiEnvironmentRefsGroup != null)
+ return jndiEnvironmentRefsGroup.getPersistenceContextRefs();
+ return null;
}
public PersistenceUnitReferenceMetaData getPersistenceUnitReferenceByName(String name)
{
return AbstractMappedMetaData.getByName(name, getPersistenceUnitRefs());
}
-
+
public PersistenceUnitReferencesMetaData getPersistenceUnitRefs()
{
- if(jndiEnvironmentRefsGroup != null)
+ if (jndiEnvironmentRefsGroup != null)
return jndiEnvironmentRefsGroup.getPersistenceUnitRefs();
return null;
}
-
+
public LifecycleCallbacksMetaData getPostConstructs()
{
if (jndiEnvironmentRefsGroup != null)
@@ -329,7 +350,12 @@
return jndiEnvironmentRefsGroup.getPreDestroys();
return null;
}
-
+
+ public ResourceEnvironmentReferenceMetaData getResourceEnvironmentReferenceByName(String name)
+ {
+ return AbstractMappedMetaData.getByName(name, getResourceEnvironmentReferences());
+ }
+
public ResourceEnvironmentReferencesMetaData getResourceEnvironmentReferences()
{
if (jndiEnvironmentRefsGroup != null)
@@ -349,24 +375,25 @@
return null;
}
- public void setJndiEnvironmentRefsGroup(RemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup)
+ public ServiceReferenceMetaData getServiceReferenceByName(String name)
{
- if (jndiEnvironmentRefsGroup == null)
- throw new IllegalArgumentException("Null jndiEnvironmentRefsGroup");
- this.jndiEnvironmentRefsGroup = jndiEnvironmentRefsGroup;
+ return AbstractMappedMetaData.getByName(name, getServiceReferences());
}
-
- /**
- * Set the messageDestinations.
- *
- * @param messageDestinations the messageDestinations.
- * @throws IllegalArgumentException for a null messageDestinations
- */
+
+ public ServiceReferencesMetaData getServiceReferences()
+ {
+ if (jndiEnvironmentRefsGroup != null)
+ return jndiEnvironmentRefsGroup.getServiceReferences();
+ return null;
+ }
+
+ public MessageDestinationsMetaData getMessageDestinations()
+ {
+ return messageDestinations;
+ }
@XmlElement(name="message-destination")
public void setMessageDestinations(MessageDestinationsMetaData messageDestinations)
{
- if (messageDestinations == null)
- throw new IllegalArgumentException("Null messageDestinations");
this.messageDestinations = messageDestinations;
}
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebResourceCollectionMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebResourceCollectionMetaData.java 2007-10-09 03:49:41 UTC (rev 65955)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WebResourceCollectionMetaData.java 2007-10-09 03:49:54 UTC (rev 65956)
@@ -36,8 +36,8 @@
{
private static final long serialVersionUID = 1;
- protected List<String> urlPatterns = Collections.emptyList();
- protected List<String> httpMethods = Collections.emptyList();
+ protected List<String> urlPatterns;
+ protected List<String> httpMethods;
public String getWebResourceName()
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WelcomeFileListMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WelcomeFileListMetaData.java 2007-10-09 03:49:41 UTC (rev 65955)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/WelcomeFileListMetaData.java 2007-10-09 03:49:54 UTC (rev 65956)
@@ -37,7 +37,7 @@
{
private static final long serialVersionUID = 1;
- private List<String> welcomeFiles = Collections.emptyList();
+ private List<String> welcomeFiles;
public List<String> getWelcomeFiles()
{
More information about the jboss-cvs-commits
mailing list