[jboss-cvs] JBossAS SVN: r79919 - trunk/tomcat/src/main/org/jboss/web/tomcat/metadata.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 22 08:14:12 EDT 2008
Author: remy.maucherat at jboss.com
Date: 2008-10-22 08:14:12 -0400 (Wed, 22 Oct 2008)
New Revision: 79919
Modified:
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/AnyXmlMetaData.java
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ConnectorMetaData.java
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ContextMetaData.java
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/EngineMetaData.java
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/HostMetaData.java
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerMetaData.java
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServiceMetaData.java
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/SessionCookieMetaData.java
Log:
- Fix annotations and types for use with XB (without a factory).
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/AnyXmlMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/AnyXmlMetaData.java 2008-10-22 11:27:49 UTC (rev 79918)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/AnyXmlMetaData.java 2008-10-22 12:14:12 UTC (rev 79919)
@@ -24,29 +24,31 @@
import java.io.Serializable;
import java.util.Map;
+import javax.xml.bind.annotation.XmlAnyAttribute;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.namespace.QName;
public class AnyXmlMetaData implements Serializable
{
private String className;
- private Map<String, Object> attributes;
+ private Map<QName, Object> attributes;
- @XmlAttribute(name = "className")
public String getClassName()
{
return className;
}
+ @XmlAttribute(name = "className")
public void setClassName(String className)
{
this.className = className;
}
- //@XmlAnyAttribute
- public Map<String, Object> getAttributes()
+ public Map<QName, Object> getAttributes()
{
return attributes;
}
- public void setAttributes(Map<String, Object> attributes)
+ @XmlAnyAttribute
+ public void setAttributes(Map<QName, Object> attributes)
{
this.attributes = attributes;
}
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ConnectorMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ConnectorMetaData.java 2008-10-22 11:27:49 UTC (rev 79918)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ConnectorMetaData.java 2008-10-22 12:14:12 UTC (rev 79919)
@@ -33,21 +33,21 @@
private String executor;
private String protocol;
- @XmlAttribute(name = "executor")
public String getExecutor()
{
return executor;
}
+ @XmlAttribute(name = "executor")
public void setExecutor(String executor)
{
this.executor = executor;
}
- @XmlAttribute(name = "protocol")
public String getProtocol()
{
return protocol;
}
+ @XmlAttribute(name = "protocol")
public void setProtocol(String protocol)
{
this.protocol = protocol;
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ContextMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ContextMetaData.java 2008-10-22 11:27:49 UTC (rev 79918)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ContextMetaData.java 2008-10-22 12:14:12 UTC (rev 79919)
@@ -25,11 +25,13 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
+ at XmlRootElement(name="Context")
public class ContextMetaData extends AnyXmlMetaData
{
private String name;
@@ -46,111 +48,111 @@
// FIXME: no support for the naming elements (which might be the right thing to do)
// FIXME: no WatchedResource, WrapperLifecycle, WrapperListener
- @XmlAttribute(name = "name")
public String getName()
{
return name;
}
+ @XmlAttribute(name = "name")
public void setName(String name)
{
this.name = name;
}
- @XmlAttribute(name = "docBase")
public String getDocBase()
{
return docBase;
}
+ @XmlAttribute(name = "docBase")
public void setDocBase(String docBase)
{
this.docBase = docBase;
}
- @XmlElement(name = "Listener")
public List<ListenerMetaData> getListeners()
{
return listeners;
}
+ @XmlElement(name = "Listener")
public void setListeners(List<ListenerMetaData> listeners)
{
this.listeners = listeners;
}
- @XmlElement(name = "Realm")
public RealmMetaData getRealm()
{
return realm;
}
+ @XmlElement(name = "Realm")
public void setRealm(RealmMetaData realm)
{
this.realm = realm;
}
- @XmlElement(name = "Valve")
public List<ValveMetaData> getValves()
{
return valves;
}
+ @XmlElement(name = "Valve")
public void setValves(List<ValveMetaData> valves)
{
this.valves = valves;
}
- @XmlElement(name = "InstanceListener")
public List<String> getInstanceListeners()
{
return instanceListeners;
}
+ @XmlElement(name = "InstanceListener")
public void setInstanceListeners(List<String> instanceListeners)
{
this.instanceListeners = instanceListeners;
}
- @XmlElement(name = "Loader")
public LoaderMetaData getLoader()
{
return loader;
}
+ @XmlElement(name = "Loader")
public void setLoader(LoaderMetaData loader)
{
this.loader = loader;
}
- @XmlElement(name = "Manager")
public ManagerMetaData getManager()
{
return manager;
}
+ @XmlElement(name = "Manager")
public void setManager(ManagerMetaData manager)
{
this.manager = manager;
}
- @XmlElement(name = "Parameters")
public List<ParameterMetaData> getParameters()
{
return parameters;
}
+ @XmlElement(name = "Parameters")
public void setParameters(List<ParameterMetaData> parameters)
{
this.parameters = parameters;
}
- @XmlElement(name = "Resources")
public ResourcesMetaData getResources()
{
return resources;
}
+ @XmlElement(name = "Resources")
public void setResources(ResourcesMetaData resources)
{
this.resources = resources;
}
- @XmlElement(name = "SessionCookie")
public SessionCookieMetaData getSessionCookie()
{
return sessionCookie;
}
+ @XmlElement(name = "SessionCookie")
public void setSessionCookie(SessionCookieMetaData sessionCookie)
{
this.sessionCookie = sessionCookie;
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/EngineMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/EngineMetaData.java 2008-10-22 11:27:49 UTC (rev 79918)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/EngineMetaData.java 2008-10-22 12:14:12 UTC (rev 79919)
@@ -40,71 +40,71 @@
private List<ValveMetaData> valves;
private RealmMetaData realm;
- @XmlAttribute(name = "name")
public String getName()
{
return name;
}
+ @XmlAttribute(name = "name")
public void setName(String name)
{
this.name = name;
}
- @XmlAttribute(name = "jvmRoute")
public String getJvmRoute()
{
return jvmRoute;
}
+ @XmlAttribute(name = "jvmRoute")
public void setJvmRoute(String jvmRoute)
{
this.jvmRoute = jvmRoute;
}
- @XmlAttribute(name = "defaultHost")
public String getDefaultHost()
{
return defaultHost;
}
+ @XmlAttribute(name = "defaultHost")
public void setDefaultHost(String defaultHost)
{
this.defaultHost = defaultHost;
}
- @XmlElement(name = "Host")
public List<HostMetaData> getHosts()
{
return hosts;
}
+ @XmlElement(name = "Host")
public void setHosts(List<HostMetaData> hosts)
{
this.hosts = hosts;
}
- @XmlElement(name = "Listener")
public List<ListenerMetaData> getListeners()
{
return listeners;
}
+ @XmlElement(name = "Listener")
public void setListeners(List<ListenerMetaData> listeners)
{
this.listeners = listeners;
}
- @XmlElement(name = "Realm")
public RealmMetaData getRealm()
{
return realm;
}
+ @XmlElement(name = "Realm")
public void setRealm(RealmMetaData realm)
{
this.realm = realm;
}
- @XmlElement(name = "Valve")
public List<ValveMetaData> getValves()
{
return valves;
}
+ @XmlElement(name = "Valve")
public void setValves(List<ValveMetaData> valves)
{
this.valves = valves;
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/HostMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/HostMetaData.java 2008-10-22 11:27:49 UTC (rev 79918)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/HostMetaData.java 2008-10-22 12:14:12 UTC (rev 79919)
@@ -40,63 +40,63 @@
private RealmMetaData realm;
private List<String> aliases;
- @XmlAttribute(name = "name")
public String getName()
{
return name;
}
+ @XmlAttribute(name = "name")
public void setName(String name)
{
this.name = name;
}
- @XmlElement(name = "Alias")
public List<String> getAliases()
{
return aliases;
}
+ @XmlElement(name = "Alias")
public void setAliases(List<String> aliases)
{
this.aliases = aliases;
}
/*
- @XmlElement(name = "Context")
public List<ContextMetaData> getContexts()
{
return contexts;
}
+ @XmlElement(name = "Context")
public void setContexts(List<ContextMetaData> contexts)
{
this.contexts = contexts;
}
*/
- @XmlElement(name = "Listener")
public List<ListenerMetaData> getListeners()
{
return listeners;
}
+ @XmlElement(name = "Listener")
public void setListeners(List<ListenerMetaData> listeners)
{
this.listeners = listeners;
}
- @XmlElement(name = "Realm")
public RealmMetaData getRealm()
{
return realm;
}
+ @XmlElement(name = "Realm")
public void setRealm(RealmMetaData realm)
{
this.realm = realm;
}
- @XmlElement(name = "Valve")
public List<ValveMetaData> getValves()
{
return valves;
}
+ @XmlElement(name = "Valve")
public void setValves(List<ValveMetaData> valves)
{
this.valves = valves;
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerMetaData.java 2008-10-22 11:27:49 UTC (rev 79918)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerMetaData.java 2008-10-22 12:14:12 UTC (rev 79919)
@@ -23,34 +23,34 @@
import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
+ at XmlRootElement(name="Server")
public class ServerMetaData extends AnyXmlMetaData
{
- private String name;
private List<ServiceMetaData> services;
private List<ListenerMetaData> listeners;
- @XmlElement(name = "Service")
public List<ServiceMetaData> getServices()
{
return services;
}
+ @XmlElement(name = "Service")
public void setServices(List<ServiceMetaData> services)
{
this.services = services;
}
- @XmlElement(name = "Listener")
public List<ListenerMetaData> getListeners()
{
return listeners;
}
+ @XmlElement(name = "Listener")
public void setListeners(List<ListenerMetaData> listeners)
{
this.listeners = listeners;
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServiceMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServiceMetaData.java 2008-10-22 11:27:49 UTC (rev 79918)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServiceMetaData.java 2008-10-22 12:14:12 UTC (rev 79919)
@@ -38,51 +38,51 @@
private List<ConnectorMetaData> connectors;
private List<ListenerMetaData> listeners;
- @XmlAttribute(name = "name")
public String getName()
{
return name;
}
+ @XmlAttribute(name = "name")
public void setName(String name)
{
this.name = name;
}
- @XmlElement(name = "Engine")
public EngineMetaData getEngine()
{
return engine;
}
+ @XmlElement(name = "Engine")
public void setEngine(EngineMetaData engine)
{
this.engine = engine;
}
- @XmlElement(name = "Executor")
public ExecutorMetaData getExecutor()
{
return executor;
}
+ @XmlElement(name = "Executor")
public void setExecutor(ExecutorMetaData executor)
{
this.executor = executor;
}
- @XmlElement(name = "Connector")
public List<ConnectorMetaData> getConnectors()
{
return connectors;
}
+ @XmlElement(name = "Connector")
public void setConnectors(List<ConnectorMetaData> connectors)
{
this.connectors = connectors;
}
- @XmlElement(name = "Listener")
public List<ListenerMetaData> getListeners()
{
return listeners;
}
+ @XmlElement(name = "Listener")
public void setListeners(List<ListenerMetaData> listeners)
{
this.listeners = listeners;
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/SessionCookieMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/SessionCookieMetaData.java 2008-10-22 11:27:49 UTC (rev 79918)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/SessionCookieMetaData.java 2008-10-22 12:14:12 UTC (rev 79919)
@@ -37,51 +37,51 @@
private boolean httpOnly = false;
private boolean secure = false;
- @XmlAttribute(name = "domain")
public String getDomain()
{
return domain;
}
+ @XmlAttribute(name = "domain")
public void setDomain(String domain)
{
this.domain = domain;
}
- @XmlAttribute(name = "path")
public String getPath()
{
return path;
}
+ @XmlAttribute(name = "path")
public void setPath(String path)
{
this.path = path;
}
- @XmlAttribute(name = "comment")
public String getComment()
{
return comment;
}
+ @XmlAttribute(name = "comment")
public void setComment(String comment)
{
this.comment = comment;
}
- @XmlAttribute(name = "httpOnly")
public boolean getHttpOnly()
{
return httpOnly;
}
+ @XmlAttribute(name = "httpOnly")
public void setHttpOnly(boolean httpOnly)
{
this.httpOnly = httpOnly;
}
- @XmlAttribute(name = "secure")
public boolean getSecure()
{
return secure;
}
+ @XmlAttribute(name = "secure")
public void setSecure(boolean secure)
{
this.secure = secure;
More information about the jboss-cvs-commits
mailing list