From 691feaee810b20d6ad76ba52c385f41cbafd21e9 Mon Sep 17 00:00:00 2001 From: bjl23 Date: Tue, 13 Jul 2010 18:30:08 +0000 Subject: [PATCH] resolves NIHVIVO-711 re: DAO factory methods on VitroHttpServlet --- .../vitro/webapp/controller/JSONServlet.java | 4 +- .../webapp/controller/MailUsersServlet.java | 3 +- .../webapp/controller/SparqlQueryServlet.java | 2 +- .../webapp/controller/VitroHttpServlet.java | 38 ------------------ .../vitro/webapp/controller/VitroRequest.java | 39 +++++++++++++++++-- .../Classes2ClassesOperationController.java | 4 +- .../edit/Classes2ClassesRetryController.java | 4 +- .../edit/ClassgroupRetryController.java | 2 +- .../controller/edit/CloneEntityServlet.java | 2 +- .../DataPropertyStatementRetryController.java | 13 ++++--- .../edit/DatapropEditController.java | 17 ++++---- .../edit/DatapropRetryController.java | 19 ++++----- .../edit/DatatypeRetryController.java | 2 +- .../controller/edit/EntityEditController.java | 32 +++++++-------- .../edit/EntityRetryController.java | 4 +- .../edit/ExternalIdRetryController.java | 6 +-- .../IndividualTypeOperationController.java | 2 +- .../edit/IndividualTypeRetryController.java | 5 ++- .../edit/Keys2EntsRetryController.java | 8 ++-- .../edit/KeywordEditController.java | 2 +- .../edit/KeywordRetryController.java | 4 +- .../controller/edit/LinkRetryController.java | 4 +- .../controller/edit/N3MultiPartUpload.java | 7 ++-- .../edit/NamespaceRetryController.java | 4 +- ...bjectPropertyStatementRetryController.java | 8 ++-- .../edit/OntologyEditController.java | 6 +-- .../edit/OntologyRetryController.java | 4 +- .../controller/edit/PortalEditController.java | 2 +- .../edit/PortalRetryController.java | 9 +++-- .../controller/edit/PrimitiveDelete.java | 2 +- ...perties2PropertiesOperationController.java | 2 +- .../Properties2PropertiesRetryController.java | 4 +- .../edit/PropertyEditController.java | 15 +++---- .../edit/PropertyGroupRetryController.java | 2 +- .../edit/PropertyRetryController.java | 18 ++++----- .../edit/RefactorOperationController.java | 2 +- .../edit/RefactorRetryController.java | 8 ++-- .../edit/RestrictionOperationController.java | 4 +- .../edit/RestrictionRetryController.java | 20 +++++----- .../controller/edit/SiteAdminController.java | 8 ++-- .../controller/edit/TabEditController.java | 12 +++--- .../edit/TabHierarchyOperationController.java | 2 +- ...IndividualRelationOperationController.java | 2 +- .../controller/edit/TabRetryController.java | 2 +- .../edit/Tabs2EntsRetryController.java | 6 +-- .../edit/Tabs2TabsRetryController.java | 2 +- .../edit/Tabs2TypesOperationController.java | 2 +- .../edit/Tabs2TypesRetryController.java | 6 +-- .../controller/edit/UserEditController.java | 4 +- .../controller/edit/UserRetryController.java | 4 +- .../controller/edit/VclassEditController.java | 15 +++---- .../edit/VclassRetryController.java | 14 +++---- .../AllClassGroupsListingController.java | 6 ++- .../AllTabsForPortalListingController.java | 2 +- .../ClassHierarchyListingController.java | 25 ++++++------ ...ataPropertyHierarchyListingController.java | 8 ++-- ...ataPropertyStatementListingController.java | 6 +-- .../DatatypePropertiesListingController.java | 8 ++-- .../listing/IndividualsListingController.java | 4 +- ...ectPropertyHierarchyListingController.java | 6 +-- ...ectPropertyStatementListingController.java | 10 ++--- .../listing/OntologiesListingController.java | 2 +- .../listing/PortalsListingController.java | 2 +- .../PropertyGroupsListingController.java | 6 ++- .../PropertyWebappsListingController.java | 10 ++--- .../edit/listing/UsersListingController.java | 2 +- ...sWebappWithInstancesListingController.java | 4 +- .../VClassWebappsListingController.java | 8 ++-- .../jena/RestrictionsListingController.java | 18 ++++----- .../StatementChangeListingController.java | 2 +- .../freemarker/ImageUploadController.java | 10 ++--- .../controller/jena/JenaIngestController.java | 6 +-- .../controller/jena/RDFUploadController.java | 9 +++-- .../serving/FileServingServlet.java | 2 +- 74 files changed, 290 insertions(+), 278 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JSONServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JSONServlet.java index f1ebeaf5f..e38779a83 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JSONServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JSONServlet.java @@ -84,7 +84,7 @@ public class JSONServlet extends VitroHttpServlet { if( log.isDebugEnabled() ) log.debug(" attempting to get option list for field '" + field + "'"); - Map options = SelectListGenerator.getOptions(editConfig, field, getWebappDaoFactory()); + Map options = SelectListGenerator.getOptions(editConfig, field, (new VitroRequest(req)).getFullWebappDaoFactory()); resp.setContentType("application/json"); ServletOutputStream out = resp.getOutputStream(); @@ -187,7 +187,7 @@ public class JSONServlet extends VitroHttpServlet { log.debug("in getEntitiesByVClass()"); VitroRequest vreq = new VitroRequest(req); String vclassURI = vreq.getParameter("vclassURI"); - WebappDaoFactory daos = getWebappDaoFactory(); + WebappDaoFactory daos = (new VitroRequest(req)).getFullWebappDaoFactory(); resp.setCharacterEncoding("UTF-8"); // ServletOutputStream doesn't support UTF-8 diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java index 826978e8a..8b8ceecab 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java @@ -105,8 +105,7 @@ public class MailUsersServlet extends VitroHttpServlet { int recipientCount = 0; String deliveryfrom = null; - - UserDao uDao = getWebappDaoFactory().getUserDao(); + UserDao uDao = vreq.getFullWebappDaoFactory().getUserDao(); // get Individuals that the User mayEditAs deliverToArray = uDao.getUserAccountEmails(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java index 15cad6784..da03a6039 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java @@ -325,7 +325,7 @@ public class SparqlQueryServlet extends BaseEditController { /* @author ass92 */ - OntologyDao daoObj = getWebappDaoFactory().getOntologyDao(); + OntologyDao daoObj = vreq.getFullWebappDaoFactory().getOntologyDao(); List ontologiesObj = daoObj.getAllOntologies(); ArrayList prefixList = new ArrayList(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java index 7590dc4f8..a8191ef50 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java @@ -24,10 +24,6 @@ public class VitroHttpServlet extends HttpServlet protected static DateFormat publicDateFormat = new SimpleDateFormat("M/dd/yyyy"); private static final Log log = LogFactory.getLog(VitroHttpServlet.class.getName()); - - private WebappDaoFactory myWebappDaoFactory = null; - private WebappDaoFactory myAssertionsWebappDaoFactory = null; - private WebappDaoFactory myDeductionsWebappDaoFactory = null; public final static String XHTML_MIMETYPE ="application/xhtml+xml"; public final static String HTML_MIMETYPE ="text/html"; @@ -49,21 +45,6 @@ public class VitroHttpServlet extends HttpServlet protected final void setup(HttpServletRequest request) { - if (request.getSession() != null) { - Object webappDaoFactoryAttr = request.getSession().getAttribute("webappDaoFactory"); - if (webappDaoFactoryAttr != null && webappDaoFactoryAttr instanceof WebappDaoFactory) { - myWebappDaoFactory = (WebappDaoFactory) webappDaoFactoryAttr; - } - webappDaoFactoryAttr = request.getSession().getAttribute("assertionsWebappDaoFactory"); - if (webappDaoFactoryAttr != null && webappDaoFactoryAttr instanceof WebappDaoFactory) { - myAssertionsWebappDaoFactory = (WebappDaoFactory) webappDaoFactoryAttr; - } - webappDaoFactoryAttr = request.getSession().getAttribute("deductionsWebappDaoFactory"); - if (webappDaoFactoryAttr != null && webappDaoFactoryAttr instanceof WebappDaoFactory) { - myDeductionsWebappDaoFactory = (WebappDaoFactory) webappDaoFactoryAttr; - } - } - //check to see if VitroRequestPrep filter was run if( request.getAttribute("appBean") == null || request.getAttribute("webappDaoFactory") == null ){ @@ -82,23 +63,4 @@ public class VitroHttpServlet extends HttpServlet doGet( request,response ); } - - /** gets WebappDaoFactory with no filtering */ - public WebappDaoFactory getWebappDaoFactory(){ - return (myWebappDaoFactory != null) ? myWebappDaoFactory : - (WebappDaoFactory) getServletContext().getAttribute("webappDaoFactory"); - } - - /** gets assertions-only WebappDaoFactory with no filtering */ - public WebappDaoFactory getAssertionsWebappDaoFactory() { - return (myAssertionsWebappDaoFactory != null) ? myAssertionsWebappDaoFactory : - (WebappDaoFactory) getServletContext().getAttribute("assertionsWebappDaoFactory"); - } - - /** gets inferences-only WebappDaoFactory with no filtering */ - public WebappDaoFactory getDeductionsWebappDaoFactory() { - return (myDeductionsWebappDaoFactory != null) ? myDeductionsWebappDaoFactory : - (WebappDaoFactory) getServletContext().getAttribute("deductionsWebappDaoFactory"); - } - } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java index 83d22ab4a..74e8e4a00 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java @@ -58,13 +58,46 @@ public class VitroRequest implements HttpServletRequest { this._req = _req; } - public WebappDaoFactory getWebappDaoFactory(){ - return( WebappDaoFactory) getAttribute("webappDaoFactory"); - } + public void setWebappDaoFactory( WebappDaoFactory wdf){ setAttribute("webappDaoFactory",wdf); } + /** gets WebappDaoFactory with appropriate filtering for the request */ + public WebappDaoFactory getWebappDaoFactory(){ + return (WebappDaoFactory) getAttribute("webappDaoFactory"); + } + + /** gets assertions + inferences WebappDaoFactory with no filtering **/ + public WebappDaoFactory getFullWebappDaoFactory() { + Object webappDaoFactoryAttr = _req.getSession().getAttribute("webappDaoFactory"); + if (webappDaoFactoryAttr instanceof WebappDaoFactory) { + return (WebappDaoFactory) webappDaoFactoryAttr; + } else { + return (WebappDaoFactory) _req.getSession().getServletContext().getAttribute("webappDaoFactory"); + } + } + + /** gets assertions-only WebappDaoFactory with no filtering */ + public WebappDaoFactory getAssertionsWebappDaoFactory() { + Object webappDaoFactoryAttr = _req.getSession().getAttribute("assertionsWebappDaoFactory"); + if (webappDaoFactoryAttr instanceof WebappDaoFactory) { + return (WebappDaoFactory) webappDaoFactoryAttr; + } else { + return (WebappDaoFactory) _req.getSession().getServletContext().getAttribute("assertionsWebappDaoFactory"); + } + } + + /** gets inferences-only WebappDaoFactory with no filtering */ + public WebappDaoFactory getDeductionsWebappDaoFactory() { + Object webappDaoFactoryAttr = _req.getSession().getAttribute("deductionsWebappDaoFactory"); + if (webappDaoFactoryAttr instanceof WebappDaoFactory) { + return (WebappDaoFactory) webappDaoFactoryAttr; + } else { + return (WebappDaoFactory) _req.getSession().getServletContext().getAttribute("deductionsWebappDaoFactory"); + } + } + public OntModel getJenaOntModel() { OntModel jenaOntModel = (OntModel)_req.getSession().getAttribute( JenaBaseDao.JENA_ONT_MODEL_ATTRIBUTE_NAME ); if ( jenaOntModel == null ) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java index 0922f5eef..2a1770265 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java @@ -62,8 +62,8 @@ public class Classes2ClassesOperationController extends BaseEditController { return; } - Classes2ClassesDao dao = getWebappDaoFactory().getClasses2ClassesDao(); - VClassDao vcDao = getWebappDaoFactory().getVClassDao(); + Classes2ClassesDao dao = request.getFullWebappDaoFactory().getClasses2ClassesDao(); + VClassDao vcDao = request.getFullWebappDaoFactory().getVClassDao(); String modeStr = request.getParameter("opMode"); modeStr = (modeStr == null) ? "" : modeStr; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java index 0581afc31..48b5c3581 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java @@ -48,8 +48,8 @@ public class Classes2ClassesRetryController extends BaseEditController { action = epo.getAction(); } - Classes2ClassesDao c2cDao = getWebappDaoFactory().getClasses2ClassesDao(); - VClassDao vcDao = getWebappDaoFactory().getVClassDao(); + Classes2ClassesDao c2cDao = request.getFullWebappDaoFactory().getClasses2ClassesDao(); + VClassDao vcDao = request.getFullWebappDaoFactory().getVClassDao(); epo.setDataAccessObject(c2cDao); Classes2Classes objectForEditing = new Classes2Classes(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java index 525f81fb0..7d8146816 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java @@ -53,7 +53,7 @@ public class ClassgroupRetryController extends BaseEditController { action = epo.getAction(); } - VClassGroupDao cgDao = getWebappDaoFactory().getVClassGroupDao(); + VClassGroupDao cgDao = request.getFullWebappDaoFactory().getVClassGroupDao(); epo.setDataAccessObject(cgDao); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/CloneEntityServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/CloneEntityServlet.java index 409157a72..6ea8d2b78 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/CloneEntityServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/CloneEntityServlet.java @@ -80,7 +80,7 @@ public class CloneEntityServlet extends BaseEditController { } LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler"); - WebappDaoFactory myWebappDaoFactory = getWebappDaoFactory().getUserAwareDaoFactory(loginBean.getUserURI()); + WebappDaoFactory myWebappDaoFactory = request.getFullWebappDaoFactory().getUserAwareDaoFactory(loginBean.getUserURI()); IndividualDao individualDao = myWebappDaoFactory.getIndividualDao(); PropertyInstanceDao propertyInstanceDao = myWebappDaoFactory.getPropertyInstanceDao(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java index 8fb1f8c0d..cd6acacfb 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java @@ -49,13 +49,14 @@ public class DataPropertyStatementRetryController extends BaseEditController { String action = "insert"; - DataPropertyStatementDao dataPropertyStatementDao = getWebappDaoFactory().getDataPropertyStatementDao(); - epo.setDataAccessObject(dataPropertyStatementDao); - DataPropertyDao dpDao = getWebappDaoFactory().getDataPropertyDao(); - IndividualDao eDao = getWebappDaoFactory().getIndividualDao(); - epo.setBeanClass(DataPropertyStatement.class); - VitroRequest vreq = new VitroRequest(request); + + DataPropertyStatementDao dataPropertyStatementDao = + vreq.getFullWebappDaoFactory().getDataPropertyStatementDao(); + epo.setDataAccessObject(dataPropertyStatementDao); + DataPropertyDao dpDao = vreq.getFullWebappDaoFactory().getDataPropertyDao(); + IndividualDao eDao = vreq.getFullWebappDaoFactory().getIndividualDao(); + epo.setBeanClass(DataPropertyStatement.class); DataPropertyStatement objectForEditing = null; if (!epo.getUseRecycledBean()){ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java index bcb3ee556..defe35105 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java @@ -34,7 +34,10 @@ public class DatapropEditController extends BaseEditController { private static final Log log = LogFactory.getLog(DatapropEditController.class.getName()); - public void doPost (HttpServletRequest request, HttpServletResponse response) { + public void doPost (HttpServletRequest request, HttpServletResponse response) { + + VitroRequest vreq = new VitroRequest(request); + final int NUM_COLS=15; if (!checkLoginStatus(request,response,(String)request.getAttribute("fetchURI"))) @@ -48,9 +51,9 @@ public class DatapropEditController extends BaseEditController { String datapropURI = request.getParameter("uri"); - DataPropertyDao dpDao = getWebappDaoFactory().getDataPropertyDao(); + DataPropertyDao dpDao = vreq.getFullWebappDaoFactory().getDataPropertyDao(); DataProperty dp = dpDao.getDataPropertyByURI(datapropURI); - PropertyGroupDao pgDao = getWebappDaoFactory().getPropertyGroupDao(); + PropertyGroupDao pgDao = vreq.getFullWebappDaoFactory().getPropertyGroupDao(); ArrayList results = new ArrayList(); results.add("Data Property"); @@ -76,7 +79,7 @@ public class DatapropEditController extends BaseEditController { results.add(dp.getLocalNameWithPrefix()); String ontologyName = null; if (dp.getNamespace() != null) { - Ontology ont = getWebappDaoFactory().getOntologyDao().getOntologyByURI(dp.getNamespace()); + Ontology ont = vreq.getFullWebappDaoFactory().getOntologyDao().getOntologyByURI(dp.getNamespace()); if ( (ont != null) && (ont.getName() != null) ) { ontologyName = ont.getName(); } @@ -134,9 +137,9 @@ public class DatapropEditController extends BaseEditController { foo.setOptionLists(OptionMap); epo.setFormObject(foo); - DataPropertyDao assertionsDpDao = (getAssertionsWebappDaoFactory() != null) - ? getAssertionsWebappDaoFactory().getDataPropertyDao() - : getWebappDaoFactory().getDataPropertyDao(); + DataPropertyDao assertionsDpDao = (vreq.getAssertionsWebappDaoFactory() != null) + ? vreq.getAssertionsWebappDaoFactory().getDataPropertyDao() + : vreq.getFullWebappDaoFactory().getDataPropertyDao(); List superURIs = assertionsDpDao.getSuperPropertyURIs(dp.getURI(),false); List superProperties = new ArrayList(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java index 4b5e711c2..e86f18ac7 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java @@ -57,13 +57,15 @@ public class DatapropRetryController extends BaseEditController { //create an EditProcessObject for this and put it in the session EditProcessObject epo = super.createEpo(request); - epo.setBeanClass(DataProperty.class); + epo.setBeanClass(DataProperty.class); + + VitroRequest vreq = new VitroRequest(request); - DatatypeDao dDao = getWebappDaoFactory().getDatatypeDao(); - DataPropertyDao dpDao = getWebappDaoFactory().getDataPropertyDao(); + DatatypeDao dDao = vreq.getFullWebappDaoFactory().getDatatypeDao(); + DataPropertyDao dpDao = vreq.getFullWebappDaoFactory().getDataPropertyDao(); epo.setDataAccessObject(dpDao); - OntologyDao ontDao = getWebappDaoFactory().getOntologyDao(); - VClassDao vclassDao = getWebappDaoFactory().getVClassDao(); + OntologyDao ontDao = vreq.getFullWebappDaoFactory().getOntologyDao(); + VClassDao vclassDao = vreq.getFullWebappDaoFactory().getVClassDao(); DataProperty objectForEditing = null; String action = null; @@ -120,7 +122,6 @@ public class DatapropRetryController extends BaseEditController { log.error("DatapropRetryController could not find the getDataPropertyByURI method in the facade"); } - VitroRequest vreq = new VitroRequest(request); Portal currPortal = vreq.getPortal(); int currPortalId = 1; if (currPortal != null) { @@ -146,10 +147,10 @@ public class DatapropRetryController extends BaseEditController { HashMap optionMap = new HashMap(); List namespaceList = FormUtils.makeOptionListFromBeans(ontDao.getAllOntologies(),"URI","Name", ((objectForEditing.getNamespace()==null) ? "" : objectForEditing.getNamespace()), null, (objectForEditing.getNamespace()!=null)); - namespaceList.add(new Option(getWebappDaoFactory().getDefaultNamespace(),"default")); + namespaceList.add(new Option(vreq.getFullWebappDaoFactory().getDefaultNamespace(),"default")); optionMap.put("Namespace", namespaceList); - List