[jboss-cvs] JBossAS SVN: r66523 - in trunk: server/src/main/org/jboss/web and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Oct 28 16:39:53 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-28 16:39:53 -0400 (Sun, 28 Oct 2007)
New Revision: 66523
Modified:
trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java
trunk/server/src/main/org/jboss/web/WebPermissionMapping.java
trunk/tomcat/src/main/org/jboss/web/tomcat/security/RunAsListener.java
trunk/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/DataWebConstraintsUnitTestCase.java
trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/ExcludedPrefixWebConstraintsUnitTestCase.java
trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/QualifiedPatternUnitTestCase.java
trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/UncheckedExactWebConstraintsUnitTestCase.java
trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/UncheckedPrefixWebConstraintsUnitTestCase.java
trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/WebConstraintsUnitTestCase.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java
Log:
Update for the jboss specific web metadata view changes
Modified: trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -31,6 +31,8 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.common.jboss.LoaderRepositoryConfigMetaData;
import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
+import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+import org.jboss.metadata.ear.spec.EarMetaData;
import org.jboss.metadata.web.jboss.ClassLoadingMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.WebMetaData;
@@ -79,24 +81,33 @@
setName(webXmlPath);
}
- /**
- * Overriden to indicate we expect to run the parse even if an existing
- * WebMetaData attachment is found.
- * @return true.
- */
@Override
- protected boolean allowsReparse()
+ protected void createMetaData(DeploymentUnit unit, String name, String suffix) throws DeploymentException
{
- return true;
+ super.createMetaData(unit, name, suffix);
+ // Merge the spec metadata
+ WebMetaData specMetaData = unit.getAttachment(WebMetaData.class);
+ JBossWebMetaData metaData = unit.getAttachment(JBossWebMetaData.class);
+ if(specMetaData == null && metaData == null)
+ return;
+
+ // If there no JBossWebMetaData was created from a jboss-web.xml, create one
+ if (metaData == null)
+ {
+ metaData = new JBossWebMetaData();
+ }
+ // Create a merged view
+ JBossWebMetaData mergedMetaData = new JBossWebMetaData();
+ mergedMetaData.merge(metaData, specMetaData);
+ // Set the merged as the output
+ unit.getTransientManagedObjects().addAttachment(JBossWebMetaData.class, mergedMetaData);
+ // Keep the raw parsed metadata as well
+ unit.addAttachment("Raw"+JBossWebMetaData.class.getName(), metaData, JBossWebMetaData.class);
}
@Override
protected void init(VFSDeploymentUnit unit, JBossWebMetaData metaData, VirtualFile file) throws Exception
{
- // Set the spec metadata
- WebMetaData specMetaData = unit.getAttachment(WebMetaData.class);
- metaData.setOverridenMetaData(specMetaData);
-
// Add the loader repository config
ClassLoadingMetaData classLoading = metaData.getClassLoading();
LoaderRepositoryMetaData lrmd = null;
@@ -133,7 +144,7 @@
if (result == null && wmd != null)
{
result = new JBossWebMetaData();
- result.setOverridenMetaData(wmd);
+ result.merge(null, wmd);
unit.getTransientManagedObjects().addAttachment(key, result, getOutput());
}
}
Modified: trunk/server/src/main/org/jboss/web/WebPermissionMapping.java
===================================================================
--- trunk/server/src/main/org/jboss/web/WebPermissionMapping.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/server/src/main/org/jboss/web/WebPermissionMapping.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -39,6 +39,8 @@
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleRefMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
+import org.jboss.metadata.web.jboss.JBossServletMetaData;
+import org.jboss.metadata.web.jboss.JBossServletsMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
@@ -255,8 +257,8 @@
are not referenced via a security-role-ref as described in JACC section
3.1.3.2
*/
- ServletsMetaData servlets = metaData.getMergedServlets();
- for(ServletMetaData servlet : servlets)
+ JBossServletsMetaData servlets = metaData.getServlets();
+ for(JBossServletMetaData servlet : servlets)
{
String servletName = servlet.getServletName();
SecurityRoleRefsMetaData roleRefs = servlet.getSecurityRoleRefs();
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/security/RunAsListener.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/security/RunAsListener.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/security/RunAsListener.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -22,15 +22,13 @@
package org.jboss.web.tomcat.security;
import java.security.PrivilegedActionException;
-import java.util.Set;
import org.apache.catalina.InstanceEvent;
import org.apache.catalina.InstanceListener;
import org.apache.catalina.Wrapper;
import org.jboss.logging.Logger;
-import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
+import org.jboss.metadata.javaee.jboss.RunAsIdentityMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.security.RunAsIdentity;
import org.jboss.security.SecurityConstants;
import org.jboss.security.SecurityContext;
@@ -72,21 +70,12 @@
{
boolean trace = log.isTraceEnabled();
String name = servlet.getName();
- ServletMetaData servletMD = metaData.getServlets().get(name);
- SecurityRoleMetaData identity = metaData.getRunAsIdentity(name);
+ RunAsIdentityMetaData identity = metaData.getRunAsIdentity(name);
RunAsIdentity runAsIdentity = null;
if(identity != null)
{
- String principalName = null; // TODO: servletMD.getRunAsPrincipal();
- if (principalName != null)
- {
- Set<String> extraRoles = identity.getPrincipals();
- runAsIdentity = new RunAsIdentity(identity.getRoleName(), principalName, extraRoles);
- }
- else
- {
- runAsIdentity = new RunAsIdentity(identity.getRoleName(), null);
- }
+ runAsIdentity = new RunAsIdentity(identity.getRoleName(),
+ identity.getPrincipalName(), identity.getRunAsRoles());
}
if (trace)
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -23,27 +23,25 @@
import java.io.IOException;
import java.security.Principal;
-import java.util.Set;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.security.auth.Subject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpSession;
-import javax.security.auth.Subject;
+import org.apache.catalina.Manager;
import org.apache.catalina.Session;
import org.apache.catalina.Wrapper;
-import org.apache.catalina.Manager;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
-import org.apache.catalina.valves.ValveBase;
+import org.apache.catalina.valves.ValveBase;
import org.jboss.logging.Logger;
-import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
+import org.jboss.metadata.javaee.jboss.RunAsIdentityMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.security.AuthenticationManager;
-import org.jboss.security.RunAsIdentity;
-import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
+import org.jboss.security.RunAsIdentity;
+import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
/**
* A Valve that sets/clears the SecurityAssociation information associated with
@@ -57,11 +55,11 @@
public class SecurityAssociationValve extends ValveBase
{
private static Logger log = Logger.getLogger(SecurityAssociationValve.class);
- public static ThreadLocal userPrincipal = new ThreadLocal();
+ public static ThreadLocal<Principal> userPrincipal = new ThreadLocal<Principal>();
/** Maintain the active WebMetaData for request security checks */
public static ThreadLocal<JBossWebMetaData> activeWebMetaData = new ThreadLocal<JBossWebMetaData>();
/** Maintain the Catalina Request for programmatic web login */
- public static ThreadLocal activeRequest = new ThreadLocal();
+ public static ThreadLocal<Request> activeRequest = new ThreadLocal<Request>();
/** The web app metadata */
private JBossWebMetaData metaData;
@@ -117,23 +115,14 @@
if (servlet != null)
{
String name = servlet.getName();
- ServletMetaData servletMD = metaData.getServlets().get(name);
- SecurityRoleMetaData identity = metaData.getRunAsIdentity(name);
+ RunAsIdentityMetaData identity = metaData.getRunAsIdentity(name);
RunAsIdentity runAsIdentity = null;
if(identity != null)
{
if (trace)
log.trace(name + ", runAs: " + identity);
- String principalName = null; // TODO: servletMD.getRunAsPrincipal();
- if (principalName != null)
- {
- Set<String> extraRoles = identity.getPrincipals();
- runAsIdentity = new RunAsIdentity(identity.getRoleName(), principalName, extraRoles);
- }
- else
- {
- runAsIdentity = new RunAsIdentity(identity.getRoleName(), null);
- }
+ runAsIdentity = new RunAsIdentity(identity.getRoleName(),
+ identity.getPrincipalName(), identity.getRunAsRoles());
}
SecurityAssociationActions.pushRunAsIdentity(runAsIdentity);
}
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -32,6 +32,8 @@
import org.jboss.metadata.javaee.spec.SecurityRoleRefMetaData;
import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.metadata.web.jboss.JBossServletMetaData;
+import org.jboss.metadata.web.jboss.JBossServletsMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.AuthConstraintMetaData;
import org.jboss.metadata.web.spec.DispatcherType;
@@ -80,20 +82,16 @@
protected void processWebMetaData(JBossWebMetaData metaData)
{
- WebMetaData stdMetaData = metaData.getOverridenMetaData();
- if (context instanceof StandardContext) {
+ if (context instanceof StandardContext)
+ {
((StandardContext) context).setReplaceWelcomeFiles(true);
}
// Metadata complete
- if (stdMetaData instanceof Web25MetaData)
- {
- Web25MetaData std5xMetaData = (Web25MetaData) stdMetaData;
- context.setIgnoreAnnotations(std5xMetaData.isMetadataComplete());
- }
+ context.setIgnoreAnnotations(metaData.isMetadataComplete());
// Context params
- List<ParamValueMetaData> params = stdMetaData.getContextParams();
+ List<ParamValueMetaData> params = metaData.getContextParams();
if(params != null)
{
for(ParamValueMetaData param : params)
@@ -103,7 +101,7 @@
}
// Display name
- DescriptionGroupMetaData dg = stdMetaData.getDescriptionGroup();
+ DescriptionGroupMetaData dg = metaData.getDescriptionGroup();
if(dg != null)
{
String displayName = dg.getDisplayName();
@@ -114,11 +112,11 @@
}
// Distributable
- if (metaData.getDistributable())
+ if (metaData.getDistributable() != null)
context.setDistributable(true);
// Error pages
- List<ErrorPageMetaData> errorPages = stdMetaData.getErrorPages();
+ List<ErrorPageMetaData> errorPages = metaData.getErrorPages();
if(errorPages != null)
{
for(ErrorPageMetaData value : errorPages)
@@ -133,7 +131,7 @@
}
// Filter definitions
- FiltersMetaData filters = stdMetaData.getFilters();
+ FiltersMetaData filters = metaData.getFilters();
if(filters != null)
{
for(FilterMetaData value : filters)
@@ -152,7 +150,7 @@
}
// Filter mappings
- List<FilterMappingMetaData> filtersMappings = stdMetaData.getFilterMappings();
+ List<FilterMappingMetaData> filtersMappings = metaData.getFilterMappings();
if(filtersMappings != null)
{
for(FilterMappingMetaData value : filtersMappings)
@@ -183,7 +181,7 @@
}
// Listeners
- List<ListenerMetaData> listeners = stdMetaData.getListeners();
+ List<ListenerMetaData> listeners = metaData.getListeners();
if(listeners != null)
{
for (ListenerMetaData value : listeners)
@@ -193,7 +191,7 @@
}
// Login configuration
- List<LoginConfigMetaData> loginConfigs = stdMetaData.getLoginConfig();
+ List<LoginConfigMetaData> loginConfigs = metaData.getLoginConfig();
if(loginConfigs != null)
{
for (LoginConfigMetaData loginConfig : loginConfigs)
@@ -211,7 +209,7 @@
}
// MIME mappings
- List<MimeMappingMetaData> mimes = stdMetaData.getMimeMappings();
+ List<MimeMappingMetaData> mimes = metaData.getMimeMappings();
if(mimes != null)
{
for (MimeMappingMetaData value : mimes)
@@ -281,10 +279,10 @@
}
// Servlet
- ServletsMetaData servlets = metaData.getMergedServlets();
+ JBossServletsMetaData servlets = metaData.getServlets();
if(servlets != null)
{
- for (ServletMetaData value : servlets)
+ for (JBossServletMetaData value : servlets)
{
org.apache.catalina.Wrapper wrapper = context.createWrapper();
wrapper.setName(value.getName());
@@ -332,7 +330,7 @@
}
// JSP mappings
- List<JspConfigMetaData> jsps = stdMetaData.getJspConfig();
+ List<JspConfigMetaData> jsps = metaData.getJspConfig();
if(jsps != null)
{
for (JspConfigMetaData config : jsps)
@@ -361,7 +359,7 @@
}
// Locale encoding mapping
- LocaleEncodingsMetaData locales = stdMetaData.getLocalEncodings();
+ LocaleEncodingsMetaData locales = metaData.getLocalEncodings();
if (locales != null)
{
for(LocaleEncodingMetaData value : locales.getMappings())
@@ -371,7 +369,7 @@
}
// Welcome files
- WelcomeFileListMetaData welcomeFiles = stdMetaData.getWelcomeFileList();
+ WelcomeFileListMetaData welcomeFiles = metaData.getWelcomeFileList();
if (welcomeFiles != null)
{
for(String value : welcomeFiles.getWelcomeFiles())
@@ -379,7 +377,7 @@
}
// Session timeout
- SessionConfigMetaData scmd = stdMetaData.getSessionConfig();
+ SessionConfigMetaData scmd = metaData.getSessionConfig();
if (scmd != null)
{
context.setSessionTimeout(scmd.getSessionTimeout());
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -537,7 +537,7 @@
SchemaBinding schema = JBossXBBuilder.build(Web25MetaData.class);
Web25MetaData confWebMD = (Web25MetaData) unmarshaller.unmarshal(webXml.toString(), schema);
sharedMetaData = new JBoss50WebMetaData();
- sharedMetaData.setOverridenMetaData(confWebMD);
+ sharedMetaData.merge(null, confWebMD);
// If we are hot-deployed *after* the overall server is started
// we'll never receive Server.START_NOTIFICATION_TYPE, so check
@@ -766,7 +766,7 @@
config.setSecurityManagement(securityManagement);
// Inject our defaults into the JBossWebMetaData
- if (metaData.getDistributable())
+ if (metaData.getDistributable() != null)
{
ReplicationConfig repCfg = metaData.getReplicationConfig();
repCfg.setDefaultCacheName(this.cacheName);
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -321,7 +321,7 @@
}
// Clustering
- if (metaData.getDistributable())
+ if (metaData.getDistributable() != null)
{
// Try to initate clustering, fallback to standard if no clustering is
// available
Modified: trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/DataWebConstraintsUnitTestCase.java
===================================================================
--- trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/DataWebConstraintsUnitTestCase.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/DataWebConstraintsUnitTestCase.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -71,7 +71,7 @@
PolicyConfiguration pc;
JBossWebMetaData metaData = new JBossWebMetaData();
WebMetaData specMetaData = new WebMetaData();
- metaData.setOverridenMetaData(specMetaData);
+ metaData.merge(null, specMetaData);
SecurityConstraintMetaData sc = new SecurityConstraintMetaData();
addSC(sc);
List<SecurityConstraintMetaData> securityContraints = new ArrayList<SecurityConstraintMetaData>();
Modified: trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/ExcludedPrefixWebConstraintsUnitTestCase.java
===================================================================
--- trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/ExcludedPrefixWebConstraintsUnitTestCase.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/ExcludedPrefixWebConstraintsUnitTestCase.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -157,7 +157,7 @@
{
JBossWebMetaData metaData = new JBossWebMetaData();
WebMetaData specMetaData = new WebMetaData();
- metaData.setOverridenMetaData(specMetaData);
+ metaData.merge(null, specMetaData);
List<SecurityConstraintMetaData> securityContraints = new ArrayList<SecurityConstraintMetaData>();
addSC(securityContraints);
specMetaData.setSecurityContraints(securityContraints);
Modified: trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/QualifiedPatternUnitTestCase.java
===================================================================
--- trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/QualifiedPatternUnitTestCase.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/QualifiedPatternUnitTestCase.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -93,7 +93,7 @@
{
JBossWebMetaData metaData = new JBossWebMetaData();
WebMetaData specMetaData = new WebMetaData();
- metaData.setOverridenMetaData(specMetaData);
+ metaData.merge(null, specMetaData);
List<SecurityConstraintMetaData> securityContraints = new ArrayList<SecurityConstraintMetaData>();
addSC1(securityContraints);
Modified: trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/UncheckedExactWebConstraintsUnitTestCase.java
===================================================================
--- trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/UncheckedExactWebConstraintsUnitTestCase.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/UncheckedExactWebConstraintsUnitTestCase.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -81,7 +81,7 @@
{
JBossWebMetaData metaData = new JBossWebMetaData();
WebMetaData specMetaData = new WebMetaData();
- metaData.setOverridenMetaData(specMetaData);
+ metaData.merge(null, specMetaData);
List<SecurityConstraintMetaData> securityContraints = new ArrayList<SecurityConstraintMetaData>();
addProtectedASC(securityContraints);
Modified: trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/UncheckedPrefixWebConstraintsUnitTestCase.java
===================================================================
--- trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/UncheckedPrefixWebConstraintsUnitTestCase.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/UncheckedPrefixWebConstraintsUnitTestCase.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -147,7 +147,7 @@
{
JBossWebMetaData metaData = new JBossWebMetaData();
WebMetaData specMetaData = new WebMetaData();
- metaData.setOverridenMetaData(specMetaData);
+ metaData.merge(null, specMetaData);
List<SecurityConstraintMetaData> securityContraints = new ArrayList<SecurityConstraintMetaData>();
addSC(securityContraints);
specMetaData.setSecurityContraints(securityContraints);
Modified: trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/WebConstraintsUnitTestCase.java
===================================================================
--- trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/WebConstraintsUnitTestCase.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/tomcat/src/tests/org/jboss/test/web/security/jacc/WebConstraintsUnitTestCase.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -406,7 +406,7 @@
{
JBossWebMetaData metaData = new JBossWebMetaData();
WebMetaData specMetaData = new WebMetaData();
- metaData.setOverridenMetaData(specMetaData);
+ metaData.merge(null, specMetaData);
List<SecurityConstraintMetaData> securityContraints = new ArrayList<SecurityConstraintMetaData>();
addExcluded(securityContraints);
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -25,6 +25,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.metadata.serviceref.VirtualFileAdaptor;
@@ -100,7 +101,7 @@
private ServletMetaData getServletForName(JBossWebMetaData wmd, String servletLink)
{
- for (ServletMetaData servlet : wmd.getMergedServlets())
+ for (JBossServletMetaData servlet : wmd.getServlets())
{
if (servletLink.equals(servlet.getName()))
{
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -109,7 +109,7 @@
private List<ServletMetaData> getRelevantServletMetaDatas(JBossWebMetaData webMetaData, ClassLoader loader)
{
List<ServletMetaData> servlets = new ArrayList<ServletMetaData>();
- for (ServletMetaData servlet : webMetaData.getMergedServlets())
+ for (ServletMetaData servlet : webMetaData.getServlets())
{
String servletClassName = servlet.getServletClass();
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java 2007-10-28 20:33:49 UTC (rev 66522)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java 2007-10-28 20:39:53 UTC (rev 66523)
@@ -30,6 +30,7 @@
import org.jboss.metadata.ear.spec.ModuleMetaData;
import org.jboss.metadata.ear.spec.WebModuleMetaData;
import org.jboss.metadata.javaee.spec.ParamValueMetaData;
+import org.jboss.metadata.web.jboss.JBossServletsMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
import org.jboss.metadata.web.spec.ServletMappingMetaData;
@@ -175,7 +176,7 @@
private Map<String, String> getServletClassMap(JBossWebMetaData wmd)
{
Map<String, String> mappings = new HashMap<String, String>();
- ServletsMetaData servlets = wmd.getMergedServlets();
+ JBossServletsMetaData servlets = wmd.getServlets();
if (servlets != null)
{
for (ServletMetaData servlet : servlets)
More information about the jboss-cvs-commits
mailing list