[jboss-cvs] JBossAS SVN: r79269 - 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 8 09:13:17 EDT 2008
Author: remy.maucherat at jboss.com
Date: 2008-10-08 09:13:17 -0400 (Wed, 08 Oct 2008)
New Revision: 79269
Added:
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/AnyXmlMetaData.java
Modified:
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/ExecutorMetaData.java
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/HostMetaData.java
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ListenerMetaData.java
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/LoaderMetaData.java
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ManagerMetaData.java
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ParameterMetaData.java
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/RealmMetaData.java
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ResourcesMetaData.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
trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ValveMetaData.java
Log:
- Update the skeleton web metadata.
- Missing the "any attribute" feature.
Added: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/AnyXmlMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/AnyXmlMetaData.java (rev 0)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/AnyXmlMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.web.tomcat.metadata;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlAttribute;
+
+public class AnyXmlMetaData implements Serializable
+{
+ private String className;
+ private Map<String, Object> attributes;
+
+ @XmlAttribute(name = "className")
+ public String getClassName()
+ {
+ return className;
+ }
+ public void setClassName(String className)
+ {
+ this.className = className;
+ }
+
+ //@XmlAnyAttribute
+ public Map<String, Object> getAttributes()
+ {
+ return attributes;
+ }
+ public void setAttributes(Map<String, 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-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ConnectorMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -21,16 +21,11 @@
*/
package org.jboss.web.tomcat.metadata;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class ConnectorMetaData
+public class ConnectorMetaData extends AnyXmlMetaData
{
- // FIXME: add any attribute map
}
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-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ContextMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -30,7 +30,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class ContextMetaData
+public class ContextMetaData extends AnyXmlMetaData
{
private String name;
private String docBase;
@@ -45,7 +45,6 @@
private SessionCookieMetaData sessionCookie;
// FIXME: no support for the naming elements (which might be the right thing to do)
// FIXME: no WatchedResource, WrapperLifecycle, WrapperListener
- // FIXME: add any attribute map
@XmlAttribute(name = "name")
public String getName()
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-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/EngineMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -30,7 +30,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class EngineMetaData
+public class EngineMetaData extends AnyXmlMetaData
{
private String name;
private String jvmRoute;
@@ -39,7 +39,6 @@
private List<ListenerMetaData> listeners;
private List<ValveMetaData> valves;
private RealmMetaData realm;
- // FIXME: add any attribute map
@XmlAttribute(name = "name")
public String getName()
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ExecutorMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ExecutorMetaData.java 2008-10-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ExecutorMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -21,16 +21,11 @@
*/
package org.jboss.web.tomcat.metadata;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class ExecutorMetaData
+public class ExecutorMetaData extends AnyXmlMetaData
{
- // FIXME: add any attribute map
}
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-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/HostMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -30,7 +30,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class HostMetaData
+public class HostMetaData extends AnyXmlMetaData
{
private String name;
private String appBase;
@@ -44,7 +44,6 @@
private List<ContextMetaData> contexts;
private RealmMetaData realm;
private List<String> aliases;
- // FIXME: add any attribute map
@XmlAttribute(name = "name")
public String getName()
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ListenerMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ListenerMetaData.java 2008-10-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ListenerMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -21,16 +21,11 @@
*/
package org.jboss.web.tomcat.metadata;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class ListenerMetaData
+public class ListenerMetaData extends AnyXmlMetaData
{
- // FIXME: add any attribute map
}
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/LoaderMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/LoaderMetaData.java 2008-10-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/LoaderMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -21,16 +21,11 @@
*/
package org.jboss.web.tomcat.metadata;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class LoaderMetaData
+public class LoaderMetaData extends AnyXmlMetaData
{
- // FIXME: add any attribute map
}
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ManagerMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ManagerMetaData.java 2008-10-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ManagerMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -21,16 +21,11 @@
*/
package org.jboss.web.tomcat.metadata;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class ManagerMetaData
+public class ManagerMetaData extends AnyXmlMetaData
{
- // FIXME: add any attribute map
}
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ParameterMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ParameterMetaData.java 2008-10-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ParameterMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -21,16 +21,11 @@
*/
package org.jboss.web.tomcat.metadata;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class ParameterMetaData
+public class ParameterMetaData extends AnyXmlMetaData
{
- // FIXME: add any attribute map
}
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/RealmMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/RealmMetaData.java 2008-10-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/RealmMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -21,16 +21,11 @@
*/
package org.jboss.web.tomcat.metadata;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class RealmMetaData
+public class RealmMetaData extends AnyXmlMetaData
{
- // FIXME: add any attribute map
}
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ResourcesMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ResourcesMetaData.java 2008-10-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ResourcesMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -21,16 +21,11 @@
*/
package org.jboss.web.tomcat.metadata;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class ResourcesMetaData
+public class ResourcesMetaData extends AnyXmlMetaData
{
- // FIXME: add any attribute map
}
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-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -30,12 +30,11 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class ServerMetaData
+public class ServerMetaData extends AnyXmlMetaData
{
private String name;
private List<ServiceMetaData> services;
private List<ListenerMetaData> listeners;
- // FIXME: add any attribute map
@XmlAttribute(name = "name")
public String getName()
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-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServiceMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -30,14 +30,13 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class ServiceMetaData
+public class ServiceMetaData extends AnyXmlMetaData
{
private String name;
private EngineMetaData engine;
private ExecutorMetaData executor;
private List<ConnectorMetaData> connectors;
private List<ListenerMetaData> listeners;
- // FIXME: add any attribute map
@XmlAttribute(name = "name")
public String getName()
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-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/SessionCookieMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -21,16 +21,70 @@
*/
package org.jboss.web.tomcat.metadata;
-import java.util.List;
+import java.io.Serializable;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class SessionCookieMetaData
+public class SessionCookieMetaData implements Serializable
{
- // FIXME: add any attribute map
+ private String domain = null;
+ private String path = null;
+ private String comment = null;
+ private boolean httpOnly = false;
+ private boolean secure = false;
+
+ @XmlAttribute(name = "domain")
+ public String getDomain()
+ {
+ return domain;
+ }
+ public void setDomain(String domain)
+ {
+ this.domain = domain;
+ }
+
+ @XmlAttribute(name = "path")
+ public String getPath()
+ {
+ return path;
+ }
+ public void setPath(String path)
+ {
+ this.path = path;
+ }
+
+ @XmlAttribute(name = "comment")
+ public String getComment()
+ {
+ return comment;
+ }
+ public void setComment(String comment)
+ {
+ this.comment = comment;
+ }
+
+ @XmlAttribute(name = "httpOnly")
+ public boolean getHttpOnly()
+ {
+ return httpOnly;
+ }
+ public void setHttpOnly(boolean httpOnly)
+ {
+ this.httpOnly = httpOnly;
+ }
+
+ @XmlAttribute(name = "secure")
+ public boolean getSecure()
+ {
+ return secure;
+ }
+ public void setSecure(boolean secure)
+ {
+ this.secure = secure;
+ }
+
}
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ValveMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ValveMetaData.java 2008-10-08 12:38:15 UTC (rev 79268)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ValveMetaData.java 2008-10-08 13:13:17 UTC (rev 79269)
@@ -21,16 +21,11 @@
*/
package org.jboss.web.tomcat.metadata;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class ValveMetaData
+public class ValveMetaData extends AnyXmlMetaData
{
- // FIXME: add any attribute map
}
More information about the jboss-cvs-commits
mailing list