jboynes 2003/09/07 23:08:04
Modified: modules/core/src/java/org/apache/geronimo/deployment/model/web
WebApp.java
modules/core/src/java/org/apache/geronimo/xml/deployment
AppClientLoader.java LoaderUtil.java
Added:
modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/web
WebApp.java
modules/core/src/java/org/apache/geronimo/deployment/model/web
AbstractWebApp.java
modules/core/src/java/org/apache/geronimo/xml/deployment
AbstractWebAppLoader.java GeronimoWebAppLoader.java
WebAppLoader.java
Log:
Simple XML loader for geronimo-web.xml
Still need to do some (most) common elements but the vendor-specifics are
there
Revision Changes Path
1.1
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/web/WebApp.java
Index: WebApp.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Geronimo" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Geronimo", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* ====================================================================
*/
package org.apache.geronimo.deployment.model.geronimo.web;
import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbLocalRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.MessageDestination;
import
org.apache.geronimo.deployment.model.geronimo.j2ee.MessageDestinationRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceEnvRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ServiceRef;
import org.apache.geronimo.deployment.model.web.AbstractWebApp;
/**
* JavaBean for the root web.xml tag web-app
*
* @version $Revision: 1.1 $
*/
public class WebApp extends AbstractWebApp {
private EjbRef[] ejbRef = new EjbRef[0];
private EjbLocalRef[] ejbLocalRef = new EjbLocalRef[0];
private ResourceRef[] resourceRef = new ResourceRef[0];
private ResourceEnvRef[] resourceEnvRef = new ResourceEnvRef[0];
private MessageDestinationRef[] messageDestinationRef = new
MessageDestinationRef[0];
private ServiceRef[] serviceRef = new ServiceRef[0];
private MessageDestination[] messageDestination = new
MessageDestination[0];
public EjbLocalRef[] getEjbLocalRef() {
return ejbLocalRef;
}
public EjbLocalRef getEjbLocalRef(int i) {
return ejbLocalRef[i];
}
public void setEjbLocalRef(EjbLocalRef[] ejbLocalRef) {
this.ejbLocalRef = ejbLocalRef;
}
public void setEjbLocalRef(int i, EjbLocalRef ejbLocalRef) {
this.ejbLocalRef[i] = ejbLocalRef;
}
public EjbRef[] getEjbRef() {
return ejbRef;
}
public EjbRef getEjbRef(int i) {
return ejbRef[i];
}
public void setEjbRef(EjbRef[] ejbRef) {
this.ejbRef = ejbRef;
}
public void setEjbRef(int i, EjbRef ejbRef) {
this.ejbRef[i] = ejbRef;
}
public MessageDestinationRef[] getMessageDestinationRef() {
return messageDestinationRef;
}
public MessageDestinationRef getMessageDestinationRef(int i) {
return messageDestinationRef[i];
}
public void setMessageDestinationRef(MessageDestinationRef[]
messageDestinationRef) {
this.messageDestinationRef = messageDestinationRef;
}
public void setMessageDestinationRef(int i, MessageDestinationRef
messageDestinationRef) {
this.messageDestinationRef[i] = messageDestinationRef;
}
public ResourceRef[] getResourceRef() {
return resourceRef;
}
public ResourceRef getResourceRef(int i) {
return resourceRef[i];
}
public void setResourceRef(ResourceRef[] resourceRef) {
this.resourceRef = resourceRef;
}
public void setResourceRef(int i, ResourceRef resourceRef) {
this.resourceRef[i] = resourceRef;
}
public ResourceEnvRef[] getResourceEnvRef() {
return resourceEnvRef;
}
public ResourceEnvRef getResourceEnvRef(int i) {
return resourceEnvRef[i];
}
public void setResourceEnvRef(ResourceEnvRef[] resourceEnvRef) {
this.resourceEnvRef = resourceEnvRef;
}
public void setResourceEnvRef(int i, ResourceEnvRef resourceEnvRef) {
this.resourceEnvRef[i] = resourceEnvRef;
}
public ServiceRef[] getServiceRef() {
return serviceRef;
}
public ServiceRef getServiceRef(int i) {
return serviceRef[i];
}
public void setServiceRef(ServiceRef[] serviceRef) {
this.serviceRef = serviceRef;
}
public void setServiceRef(int i, ServiceRef serviceRef) {
this.serviceRef[i] = serviceRef;
}
public MessageDestination[] getMessageDestination() {
return messageDestination;
}
public MessageDestination getMessageDestination(int i) {
return messageDestination[i];
}
public void setMessageDestination(MessageDestination[]
messageDestination) {
this.messageDestination = messageDestination;
}
public void setMessageDestination(int i, MessageDestination
messageDestination) {
this.messageDestination[i] = messageDestination;
}
}
1.2 +6 -299
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/web/WebApp.java
Index: WebApp.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/web/WebApp.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebApp.java 7 Sep 2003 23:20:06 -0000 1.1
+++ WebApp.java 8 Sep 2003 06:08:04 -0000 1.2
@@ -55,304 +55,27 @@
*/
package org.apache.geronimo.deployment.model.web;
-import org.apache.geronimo.deployment.model.j2ee.SecurityRole;
-import org.apache.geronimo.deployment.model.j2ee.EJBRef;
import org.apache.geronimo.deployment.model.j2ee.EJBLocalRef;
-import org.apache.geronimo.deployment.model.j2ee.ResourceRef;
-import org.apache.geronimo.deployment.model.j2ee.ResourceEnvRef;
+import org.apache.geronimo.deployment.model.j2ee.EJBRef;
+import org.apache.geronimo.deployment.model.j2ee.MessageDestination;
import org.apache.geronimo.deployment.model.j2ee.MessageDestinationRef;
-import org.apache.geronimo.deployment.model.j2ee.EnvEntry;
+import org.apache.geronimo.deployment.model.j2ee.ResourceEnvRef;
+import org.apache.geronimo.deployment.model.j2ee.ResourceRef;
import org.apache.geronimo.deployment.model.j2ee.ServiceRef;
-import org.apache.geronimo.deployment.model.j2ee.MessageDestination;
-import org.apache.geronimo.deployment.model.j2ee.Displayable;
/**
* JavaBean for the root web.xml tag web-app
*
- * @version $Revision$
+ * @version $Revision$ $Date$
*/
-public class WebApp extends Displayable {
- private String version;
- private boolean distributable = false;
- private ContextParam[] contextParam = new ContextParam[0];
- private Filter[] filter = new Filter[0];
- private FilterMapping[] filterMapping = new FilterMapping[0];
- private Listener[] listener = new Listener[0];
- private Servlet[] servlet = new Servlet[0];
- private ServletMapping[] servletMapping = new ServletMapping[0];
- private SessionConfig[] sessionConfig = new SessionConfig[0];
- private MimeMapping[] mimeMapping = new MimeMapping[0];
- private WelcomeFileList[] welcomeFileList = new WelcomeFileList[0];
- private ErrorPage[] errorPage = new ErrorPage[0];
- private JSPConfig[] jspConfig = new JSPConfig[0];
- private SecurityConstraint[] securityConstraint = new
SecurityConstraint[0];
- private LoginConfig[] loginConfig = new LoginConfig[0];
- private SecurityRole[] securityRole = new SecurityRole[0];
+public class WebApp extends AbstractWebApp {
private EJBRef[] ejbRef = new EJBRef[0];
private EJBLocalRef[] ejbLocalRef = new EJBLocalRef[0];
private ResourceRef[] resourceRef = new ResourceRef[0];
private ResourceEnvRef[] resourceEnvRef = new ResourceEnvRef[0];
private MessageDestinationRef[] messageDestinationRef = new
MessageDestinationRef[0];
- private EnvEntry[] envEntry = new EnvEntry[0];
private ServiceRef[] serviceRef = new ServiceRef[0];
private MessageDestination[] messageDestination = new
MessageDestination[0];
- private LocaleEncodingMappingList[] localeEncodingMappingList = new
LocaleEncodingMappingList[0];
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public boolean isDistributable() {
- return distributable;
- }
-
- public void setDistributable(boolean distributable) {
- this.distributable = distributable;
- }
-
- public ContextParam[] getContextParam() {
- return contextParam;
- }
-
- public ContextParam getContextParam(int i) {
- return contextParam[i];
- }
-
- public void setContextParam(ContextParam[] contextParam) {
- this.contextParam = contextParam;
- }
-
- public void setContextParam(int i, ContextParam contextParam) {
- this.contextParam[i] = contextParam;
- }
-
- public ErrorPage[] getErrorPage() {
- return errorPage;
- }
-
- public ErrorPage getErrorPage(int i) {
- return errorPage[i];
- }
-
- public void setErrorPage(ErrorPage[] errorPage) {
- this.errorPage = errorPage;
- }
-
- public void setErrorPage(int i, ErrorPage errorPage) {
- this.errorPage[i] = errorPage;
- }
-
- public Filter[] getFilter() {
- return filter;
- }
-
- public Filter getFilter(int i) {
- return filter[i];
- }
-
- public void setFilter(Filter[] filter) {
- this.filter = filter;
- }
-
- public void setFilter(int i, Filter filter) {
- this.filter[i] = filter;
- }
-
- public FilterMapping[] getFilterMapping() {
- return filterMapping;
- }
-
- public FilterMapping getFilterMapping(int i) {
- return filterMapping[i];
- }
-
- public void setFilterMapping(FilterMapping[] filterMapping) {
- this.filterMapping = filterMapping;
- }
-
- public void setFilterMapping(int i, FilterMapping filterMapping) {
- this.filterMapping[i] = filterMapping;
- }
-
- public JSPConfig[] getJspConfig() {
- return jspConfig;
- }
-
- public JSPConfig getJspConfig(int i) {
- return jspConfig[i];
- }
-
- public void setJspConfig(JSPConfig[] jspConfig) {
- this.jspConfig = jspConfig;
- }
-
- public void setJspConfig(int i, JSPConfig jspConfig) {
- this.jspConfig[i] = jspConfig;
- }
-
- public Listener[] getListener() {
- return listener;
- }
-
- public Listener getListener(int i) {
- return listener[i];
- }
-
- public void setListener(Listener[] listener) {
- this.listener = listener;
- }
-
- public void setListener(int i, Listener listener) {
- this.listener[i] = listener;
- }
-
- public LocaleEncodingMappingList[] getLocaleEncodingMappingList() {
- return localeEncodingMappingList;
- }
-
- public LocaleEncodingMappingList getLocaleEncodingMappingList(int i) {
- return localeEncodingMappingList[i];
- }
-
- public void setLocaleEncodingMappingList(LocaleEncodingMappingList[]
localeEncodingMappingList) {
- this.localeEncodingMappingList = localeEncodingMappingList;
- }
-
- public void setLocaleEncodingMappingList(int i,
LocaleEncodingMappingList localeEncodingMappingList) {
- this.localeEncodingMappingList[i] = localeEncodingMappingList;
- }
-
- public LoginConfig[] getLoginConfig() {
- return loginConfig;
- }
-
- public LoginConfig getLoginConfig(int i) {
- return loginConfig[i];
- }
-
- public void setLoginConfig(LoginConfig[] loginConfig) {
- this.loginConfig = loginConfig;
- }
-
- public void setLoginConfig(int i, LoginConfig loginConfig) {
- this.loginConfig[i] = loginConfig;
- }
-
- public MimeMapping[] getMimeMapping() {
- return mimeMapping;
- }
-
- public MimeMapping getMimeMapping(int i) {
- return mimeMapping[i];
- }
-
- public void setMimeMapping(MimeMapping[] mimeMapping) {
- this.mimeMapping = mimeMapping;
- }
-
- public void setMimeMapping(int i, MimeMapping mimeMapping) {
- this.mimeMapping[i] = mimeMapping;
- }
-
- public SecurityConstraint[] getSecurityConstraint() {
- return securityConstraint;
- }
-
- public SecurityConstraint getSecurityConstraint(int i) {
- return securityConstraint[i];
- }
-
- public void setSecurityConstraint(SecurityConstraint[]
securityConstraint) {
- this.securityConstraint = securityConstraint;
- }
-
- public void setSecurityConstraint(int i, SecurityConstraint
securityConstraint) {
- this.securityConstraint[i] = securityConstraint;
- }
-
- public SecurityRole[] getSecurityRole() {
- return securityRole;
- }
-
- public SecurityRole getSecurityRole(int i) {
- return securityRole[i];
- }
-
- public void setSecurityRole(SecurityRole[] securityRole) {
- this.securityRole = securityRole;
- }
-
- public void setSecurityRole(int i, SecurityRole securityRole) {
- this.securityRole[i] = securityRole;
- }
-
- public Servlet[] getServlet() {
- return servlet;
- }
-
- public Servlet getServlet(int i) {
- return servlet[i];
- }
-
- public void setServlet(Servlet[] servlet) {
- this.servlet = servlet;
- }
-
- public void setServlet(int i, Servlet servlet) {
- this.servlet[i] = servlet;
- }
-
- public ServletMapping[] getServletMapping() {
- return servletMapping;
- }
-
- public ServletMapping getServletMapping(int i) {
- return servletMapping[i];
- }
-
- public void setServletMapping(ServletMapping[] servletMapping) {
- this.servletMapping = servletMapping;
- }
-
- public void setServletMapping(int i, ServletMapping servletMapping) {
- this.servletMapping[i] = servletMapping;
- }
-
- public SessionConfig[] getSessionConfig() {
- return sessionConfig;
- }
-
- public SessionConfig getSessionConfig(int i) {
- return sessionConfig[i];
- }
-
- public void setSessionConfig(SessionConfig[] sessionConfig) {
- this.sessionConfig = sessionConfig;
- }
-
- public void setSessionConfig(int i, SessionConfig sessionConfig) {
- this.sessionConfig[i] = sessionConfig;
- }
-
- public WelcomeFileList[] getWelcomeFileList() {
- return welcomeFileList;
- }
-
- public WelcomeFileList getWelcomeFileList(int i) {
- return welcomeFileList[i];
- }
-
- public void setWelcomeFileList(WelcomeFileList[] welcomeFileList) {
- this.welcomeFileList = welcomeFileList;
- }
-
- public void setWelcomeFileList(int i, WelcomeFileList welcomeFileList) {
- this.welcomeFileList[i] = welcomeFileList;
- }
public EJBLocalRef[] getEjbLocalRef() {
return ejbLocalRef;
@@ -384,22 +107,6 @@
public void setEjbRef(int i, EJBRef ejbRef) {
this.ejbRef[i] = ejbRef;
- }
-
- public EnvEntry[] getEnvEntry() {
- return envEntry;
- }
-
- public EnvEntry getEnvEntry(int i) {
- return envEntry[i];
- }
-
- public void setEnvEntry(EnvEntry[] envEntry) {
- this.envEntry = envEntry;
- }
-
- public void setEnvEntry(int i, EnvEntry envEntry) {
- this.envEntry[i] = envEntry;
}
public MessageDestinationRef[] getMessageDestinationRef() {
1.1
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/web/AbstractWebApp.java
Index: AbstractWebApp.java
===================================================================
/***************************************
* *
* (c) Core Developers Network *
* All Rights Reserved *
* *
***************************************/
package org.apache.geronimo.deployment.model.web;
import org.apache.geronimo.deployment.model.j2ee.Displayable;
import org.apache.geronimo.deployment.model.j2ee.SecurityRole;
import org.apache.geronimo.deployment.model.j2ee.EnvEntry;
/**
*
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jeremy Boynes</a>
*/
public class AbstractWebApp extends Displayable {
private String version;
private boolean distributable = false;
private ContextParam[] contextParam = new ContextParam[0];
private Filter[] filter = new Filter[0];
private FilterMapping[] filterMapping = new FilterMapping[0];
private Listener[] listener = new Listener[0];
private Servlet[] servlet = new Servlet[0];
private ServletMapping[] servletMapping = new ServletMapping[0];
private SessionConfig[] sessionConfig = new SessionConfig[0];
private MimeMapping[] mimeMapping = new MimeMapping[0];
private WelcomeFileList[] welcomeFileList = new WelcomeFileList[0];
private ErrorPage[] errorPage = new ErrorPage[0];
private JSPConfig[] jspConfig = new JSPConfig[0];
private SecurityConstraint[] securityConstraint = new
SecurityConstraint[0];
private LoginConfig[] loginConfig = new LoginConfig[0];
private SecurityRole[] securityRole = new SecurityRole[0];
private EnvEntry[] envEntry = new EnvEntry[0];
private LocaleEncodingMappingList[] localeEncodingMappingList = new
LocaleEncodingMappingList[0];
public String getVersion() {
return version;
}
public void setVersion(String version) {
this.version = version;
}
public boolean isDistributable() {
return distributable;
}
public void setDistributable(boolean distributable) {
this.distributable = distributable;
}
public ContextParam[] getContextParam() {
return contextParam;
}
public ContextParam getContextParam(int i) {
return contextParam[i];
}
public void setContextParam(ContextParam[] contextParam) {
this.contextParam = contextParam;
}
public void setContextParam(int i, ContextParam contextParam) {
this.contextParam[i] = contextParam;
}
public ErrorPage[] getErrorPage() {
return errorPage;
}
public ErrorPage getErrorPage(int i) {
return errorPage[i];
}
public void setErrorPage(ErrorPage[] errorPage) {
this.errorPage = errorPage;
}
public void setErrorPage(int i, ErrorPage errorPage) {
this.errorPage[i] = errorPage;
}
public Filter[] getFilter() {
return filter;
}
public Filter getFilter(int i) {
return filter[i];
}
public void setFilter(Filter[] filter) {
this.filter = filter;
}
public void setFilter(int i, Filter filter) {
this.filter[i] = filter;
}
public FilterMapping[] getFilterMapping() {
return filterMapping;
}
public FilterMapping getFilterMapping(int i) {
return filterMapping[i];
}
public void setFilterMapping(FilterMapping[] filterMapping) {
this.filterMapping = filterMapping;
}
public void setFilterMapping(int i, FilterMapping filterMapping) {
this.filterMapping[i] = filterMapping;
}
public JSPConfig[] getJspConfig() {
return jspConfig;
}
public JSPConfig getJspConfig(int i) {
return jspConfig[i];
}
public void setJspConfig(JSPConfig[] jspConfig) {
this.jspConfig = jspConfig;
}
public void setJspConfig(int i, JSPConfig jspConfig) {
this.jspConfig[i] = jspConfig;
}
public Listener[] getListener() {
return listener;
}
public Listener getListener(int i) {
return listener[i];
}
public void setListener(Listener[] listener) {
this.listener = listener;
}
public void setListener(int i, Listener listener) {
this.listener[i] = listener;
}
public LocaleEncodingMappingList[] getLocaleEncodingMappingList() {
return localeEncodingMappingList;
}
public LocaleEncodingMappingList getLocaleEncodingMappingList(int i) {
return localeEncodingMappingList[i];
}
public void setLocaleEncodingMappingList(LocaleEncodingMappingList[]
localeEncodingMappingList) {
this.localeEncodingMappingList = localeEncodingMappingList;
}
public void setLocaleEncodingMappingList(int i, LocaleEncodingMappingList
localeEncodingMappingList) {
this.localeEncodingMappingList[i] = localeEncodingMappingList;
}
public LoginConfig[] getLoginConfig() {
return loginConfig;
}
public LoginConfig getLoginConfig(int i) {
return loginConfig[i];
}
public void setLoginConfig(LoginConfig[] loginConfig) {
this.loginConfig = loginConfig;
}
public void setLoginConfig(int i, LoginConfig loginConfig) {
this.loginConfig[i] = loginConfig;
}
public MimeMapping[] getMimeMapping() {
return mimeMapping;
}
public MimeMapping getMimeMapping(int i) {
return mimeMapping[i];
}
public void setMimeMapping(MimeMapping[] mimeMapping) {
this.mimeMapping = mimeMapping;
}
public void setMimeMapping(int i, MimeMapping mimeMapping) {
this.mimeMapping[i] = mimeMapping;
}
public SecurityConstraint[] getSecurityConstraint() {
return securityConstraint;
}
public SecurityConstraint getSecurityConstraint(int i) {
return securityConstraint[i];
}
public void setSecurityConstraint(SecurityConstraint[]
securityConstraint) {
this.securityConstraint = securityConstraint;
}
public void setSecurityConstraint(int i, SecurityConstraint
securityConstraint) {
this.securityConstraint[i] = securityConstraint;
}
public SecurityRole[] getSecurityRole() {
return securityRole;
}
public SecurityRole getSecurityRole(int i) {
return securityRole[i];
}
public void setSecurityRole(SecurityRole[] securityRole) {
this.securityRole = securityRole;
}
public void setSecurityRole(int i, SecurityRole securityRole) {
this.securityRole[i] = securityRole;
}
public Servlet[] getServlet() {
return servlet;
}
public Servlet getServlet(int i) {
return servlet[i];
}
public void setServlet(Servlet[] servlet) {
this.servlet = servlet;
}
public void setServlet(int i, Servlet servlet) {
this.servlet[i] = servlet;
}
public ServletMapping[] getServletMapping() {
return servletMapping;
}
public ServletMapping getServletMapping(int i) {
return servletMapping[i];
}
public void setServletMapping(ServletMapping[] servletMapping) {
this.servletMapping = servletMapping;
}
public void setServletMapping(int i, ServletMapping servletMapping) {
this.servletMapping[i] = servletMapping;
}
public SessionConfig[] getSessionConfig() {
return sessionConfig;
}
public SessionConfig getSessionConfig(int i) {
return sessionConfig[i];
}
public void setSessionConfig(SessionConfig[] sessionConfig) {
this.sessionConfig = sessionConfig;
}
public void setSessionConfig(int i, SessionConfig sessionConfig) {
this.sessionConfig[i] = sessionConfig;
}
public WelcomeFileList[] getWelcomeFileList() {
return welcomeFileList;
}
public WelcomeFileList getWelcomeFileList(int i) {
return welcomeFileList[i];
}
public void setWelcomeFileList(WelcomeFileList[] welcomeFileList) {
this.welcomeFileList = welcomeFileList;
}
public void setWelcomeFileList(int i, WelcomeFileList welcomeFileList) {
this.welcomeFileList[i] = welcomeFileList;
}
public EnvEntry[] getEnvEntry() {
return envEntry;
}
public EnvEntry getEnvEntry(int i) {
return envEntry[i];
}
public void setEnvEntry(EnvEntry[] envEntry) {
this.envEntry = envEntry;
}
public void setEnvEntry(int i, EnvEntry envEntry) {
this.envEntry[i] = envEntry;
}
}
1.3 +3 -3
incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/AppClientLoader.java
Index: AppClientLoader.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/AppClientLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AppClientLoader.java 5 Sep 2003 20:18:03 -0000 1.2
+++ AppClientLoader.java 8 Sep 2003 06:08:04 -0000 1.3
@@ -72,10 +72,10 @@
* @version $Revision$ $Date$
*/
public class AppClientLoader {
- J2EELoader j2eeLoader = new J2EELoader();
+ private J2EELoader j2eeLoader = new J2EELoader();
public ApplicationClient load(Document doc) {
Element root = doc.getDocumentElement();
- if (!"application-client".equals(root.getTagName())) {
+ if (!"application-client".equals(root.getLocalName())) {
throw new IllegalArgumentException("Document is not an
application-client instance");
}
ApplicationClient appClient = new ApplicationClient();
1.4 +10 -1
incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/LoaderUtil.java
Index: LoaderUtil.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/LoaderUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoaderUtil.java 5 Sep 2003 20:18:03 -0000 1.3
+++ LoaderUtil.java 8 Sep 2003 06:08:04 -0000 1.4
@@ -160,6 +160,15 @@
return result;
}
+ public static boolean getBoolean(Element element, String child) {
+ String value = getChildContent(element, child);
+ if (value == null) {
+ return false;
+ } else {
+ return Boolean.getBoolean(value);
+ }
+ }
+
/**
* Utility method to parse the contents of a Reader into a DOM Document.
* NOTE: closes the reader when finished!
1.1
incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/AbstractWebAppLoader.java
Index: AbstractWebAppLoader.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Geronimo" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Geronimo", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* ====================================================================
*/
package org.apache.geronimo.xml.deployment;
import org.apache.geronimo.deployment.model.web.AbstractWebApp;
import org.apache.geronimo.deployment.model.web.ContextParam;
import org.w3c.dom.Element;
/**
*
*
* @version $Revision: 1.1 $ $Date: 2003/09/08 06:08:04 $
*/
public abstract class AbstractWebAppLoader {
protected final J2EELoader j2eeLoader;
public AbstractWebAppLoader(J2EELoader j2eeLoader) {
this.j2eeLoader = j2eeLoader;
}
protected void loadCommonElements(AbstractWebApp webApp, Element root) {
webApp.setVersion(LoaderUtil.getAttribute(root, "version"));
webApp.setDistributable(LoaderUtil.getBoolean(root, "distributable"));
loadContextParams(webApp, root);
// @todo the other common elements
}
private void loadContextParams(AbstractWebApp webApp, Element root) {
Element[] elements = LoaderUtil.getChildren(root, "context-param");
ContextParam[] params = new ContextParam[elements.length];
for (int i=0; i < elements.length; i++) {
Element e = elements[i];
ContextParam param = new ContextParam();
param.setParamName(LoaderUtil.getChildContent(e, "param-name"));
param.setParamValue(LoaderUtil.getChildContent(e, "param-value"));
params[i] = param;
}
webApp.setContextParam(params);
}
}
1.1
incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/GeronimoWebAppLoader.java
Index: GeronimoWebAppLoader.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Geronimo" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Geronimo", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* ====================================================================
*/
package org.apache.geronimo.xml.deployment;
import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbLocalRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.MessageDestination;
import
org.apache.geronimo.deployment.model.geronimo.j2ee.MessageDestinationRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceEnvRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ServiceRef;
import org.apache.geronimo.deployment.model.geronimo.web.WebApp;
import org.apache.geronimo.deployment.model.j2ee.EnvEntry;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
/**
*
*
* @version $Revision: 1.1 $ $Date: 2003/09/08 06:08:04 $
*/
public class GeronimoWebAppLoader extends AbstractWebAppLoader {
public GeronimoWebAppLoader() {
super(new GeronimoJ2EELoader());
}
public WebApp load(Document doc) {
Element root = doc.getDocumentElement();
if (!"web-app".equals(root.getLocalName())) {
throw new IllegalArgumentException("Document is not a web-app
instance");
}
WebApp webApp = new WebApp();
loadCommonElements(webApp, root);
webApp.setEnvEntry(j2eeLoader.loadEnvEntries(root, new EnvEntry[0]));
webApp.setEjbRef((EjbRef[]) j2eeLoader.loadEJBRefs(root, new
EjbRef[0]));
webApp.setEjbLocalRef((EjbLocalRef[])
j2eeLoader.loadEJBLocalRefs(root, new EjbLocalRef[0]));
webApp.setServiceRef((ServiceRef[])j2eeLoader.loadServiceRefs(root,
new ServiceRef[0]));
webApp.setResourceRef((ResourceRef[])
j2eeLoader.loadResourceRefs(root, new ResourceRef[0]));
webApp.setResourceEnvRef((ResourceEnvRef[])
j2eeLoader.loadResourceEnvRefs(root, new ResourceEnvRef[0]));
webApp.setMessageDestinationRef((MessageDestinationRef[])
j2eeLoader.loadMessageDestinationRefs(root, new MessageDestinationRef[0]));
webApp.setMessageDestination((MessageDestination[])
j2eeLoader.loadMessageDestinations(root, new MessageDestination[0]));
return webApp;
}
}
1.1
incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/WebAppLoader.java
Index: WebAppLoader.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Geronimo" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Geronimo", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* ====================================================================
*/
package org.apache.geronimo.xml.deployment;
import org.apache.geronimo.deployment.model.web.WebApp;
import org.apache.geronimo.deployment.model.j2ee.EnvEntry;
import org.apache.geronimo.deployment.model.j2ee.EJBRef;
import org.apache.geronimo.deployment.model.j2ee.EJBLocalRef;
import org.apache.geronimo.deployment.model.j2ee.ServiceRef;
import org.apache.geronimo.deployment.model.j2ee.ResourceRef;
import org.apache.geronimo.deployment.model.j2ee.ResourceEnvRef;
import org.apache.geronimo.deployment.model.j2ee.MessageDestinationRef;
import org.apache.geronimo.deployment.model.j2ee.MessageDestination;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
/**
*
*
* @version $Revision: 1.1 $ $Date: 2003/09/08 06:08:04 $
*/
public class WebAppLoader extends AbstractWebAppLoader {
public WebAppLoader() {
super(new J2EELoader());
}
public WebApp load(Document doc) {
Element root = doc.getDocumentElement();
if (!"web-app".equals(root.getLocalName())) {
throw new IllegalArgumentException("Document is not a web-app
instance");
}
WebApp webApp = new WebApp();
loadCommonElements(webApp, root);
webApp.setEnvEntry(j2eeLoader.loadEnvEntries(root, new EnvEntry[0]));
webApp.setEjbRef(j2eeLoader.loadEJBRefs(root, new EJBRef[0]));
webApp.setEjbLocalRef(j2eeLoader.loadEJBLocalRefs(root, new
EJBLocalRef[0]));
webApp.setServiceRef(j2eeLoader.loadServiceRefs(root, new
ServiceRef[0]));
webApp.setResourceRef(j2eeLoader.loadResourceRefs(root, new
ResourceRef[0]));
webApp.setResourceEnvRef(j2eeLoader.loadResourceEnvRefs(root, new
ResourceEnvRef[0]));
webApp.setMessageDestinationRef(j2eeLoader.loadMessageDestinationRefs(root, new
MessageDestinationRef[0]));
webApp.setMessageDestination(j2eeLoader.loadMessageDestinations(root,
new MessageDestination[0]));
return webApp;
}
}
