[jboss-cvs] JBossAS SVN: r92431 - in projects/metadata/web/trunk/src: test/resources/org/jboss/test/metadata/web and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 17 11:12:22 EDT 2009
Author: remy.maucherat at jboss.com
Date: 2009-08-17 11:12:21 -0400 (Mon, 17 Aug 2009)
New Revision: 92431
Added:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/NameMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/OthersMetaData.java
Modified:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AbsoluteOrderingMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/RelativeOrderingMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Web30MetaData.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragment30MetaData.java
projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp6Everything_testEverything.xml
projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp6Fragment_testEverything.xml
Log:
- Map the ordering (thanks to David Lloyd).
- Fix the tests.
- Do a trick to map the main choice: the (absolute-)ordering element can apparently be either before or after the other web.xml elements.
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AbsoluteOrderingMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AbsoluteOrderingMetaData.java 2009-08-17 14:53:52 UTC (rev 92430)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/AbsoluteOrderingMetaData.java 2009-08-17 15:12:21 UTC (rev 92431)
@@ -25,6 +25,7 @@
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.support.IdMetaDataImpl;
@@ -38,21 +39,18 @@
{
private static final long serialVersionUID = 1;
- protected List<String> ordering = new ArrayList<String>();
-
- public List<String> getOrdering() {
+ public List<Object> ordering = new ArrayList<Object>();
+
+ public List<Object> getOrdering() {
return ordering;
}
- @XmlElement(name="name")
- public void addName(String name)
- {
- ordering.add(name);
+ @XmlElements({
+ @XmlElement(name="name", type=NameMetaData.class),
+ @XmlElement(name="others", type=OthersMetaData.class)
+ })
+ public void setOrdering(List<Object> ordering) {
+ this.ordering = ordering;
}
- @XmlElement(name="others")
- public void addOthers()
- {
- ordering.add("*");
- }
}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java 2009-08-17 14:53:52 UTC (rev 92430)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMetaData.java 2009-08-17 15:12:21 UTC (rev 92431)
@@ -34,7 +34,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision: 83549 $
*/
- at XmlType(name="filterType", propOrder={"descriptionGroup", "filterName", "filterClass", "initParam"})
+ at XmlType(name="filterType", propOrder={"descriptionGroup", "filterName", "filterClass", "asyncSupported", "initParam"})
public class FilterMetaData extends NamedMetaDataWithDescriptionGroup
{
private static final long serialVersionUID = 1;
Added: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/NameMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/NameMetaData.java (rev 0)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/NameMetaData.java 2009-08-17 15:12:21 UTC (rev 92431)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.web.spec;
+
+import javax.xml.bind.annotation.XmlValue;
+
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 83549 $
+ */
+public class NameMetaData extends IdMetaDataImpl
+{
+ private static final long serialVersionUID = 1;
+
+ private String name;
+
+ public String getName()
+ {
+ return name;
+ }
+ @XmlValue
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+}
Added: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/OthersMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/OthersMetaData.java (rev 0)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/OthersMetaData.java 2009-08-17 15:12:21 UTC (rev 92431)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.web.spec;
+
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 83549 $
+ */
+public class OthersMetaData extends IdMetaDataImpl
+{
+ private static final long serialVersionUID = 1;
+}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/RelativeOrderingMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/RelativeOrderingMetaData.java 2009-08-17 14:53:52 UTC (rev 92430)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/RelativeOrderingMetaData.java 2009-08-17 15:12:21 UTC (rev 92431)
@@ -25,6 +25,7 @@
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.support.IdMetaDataImpl;
@@ -38,21 +39,18 @@
{
private static final long serialVersionUID = 1;
- protected List<String> ordering = new ArrayList<String>();
-
- public List<String> getOrdering() {
+ public List<Object> ordering = new ArrayList<Object>();
+
+ public List<Object> getOrdering() {
return ordering;
}
- @XmlElement(name="name")
- public void addName(String name)
- {
- ordering.add(name);
+ @XmlElements({
+ @XmlElement(name="name", type=NameMetaData.class),
+ @XmlElement(name="others", type=OthersMetaData.class)
+ })
+ public void setOrdering(List<Object> ordering) {
+ this.ordering = ordering;
}
- @XmlElement(name="others")
- public void addOthers()
- {
- ordering.add("*");
- }
}
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java 2009-08-17 14:53:52 UTC (rev 92430)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/ServletMetaData.java 2009-08-17 15:12:21 UTC (rev 92431)
@@ -39,7 +39,7 @@
* @version $Revision: 84989 $
*/
@XmlType(name="servletType", propOrder={"descriptionGroup", "servletName", "servletClass", "jspFile", "initParam", "loadOnStartup",
- "runAs", "securityRoleRefs", "asyncSupported", "enabled"})
+ "enabled", "asyncSupported", "runAs", "securityRoleRefs"})
public class ServletMetaData extends NamedMetaDataWithDescriptionGroup
implements MergeableMetaData<ServletMetaData>
{
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Web30MetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Web30MetaData.java 2009-08-17 14:53:52 UTC (rev 92430)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Web30MetaData.java 2009-08-17 15:12:21 UTC (rev 92431)
@@ -25,7 +25,7 @@
normalizeSpace=true)
@XmlType(name="web-appType",
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
- propOrder={"descriptionGroup", "name", "distributable", "contextParams", "filters", "filterMappings", "listeners", "servlets",
+ propOrder={"absoluteOrdering", "descriptionGroup", "name", "distributable", "contextParams", "filters", "filterMappings", "listeners", "servlets",
"servletMappings", "sessionConfig", "mimeMappings", "welcomeFileList", "errorPages", "jspConfig", "securityContraints",
"loginConfig", "securityRoles", "jndiEnvironmentRefsGroup", "messageDestinations", "localEncodings", "absoluteOrdering"})
public class Web30MetaData extends WebMetaData
Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragment30MetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragment30MetaData.java 2009-08-17 14:53:52 UTC (rev 92430)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragment30MetaData.java 2009-08-17 15:12:21 UTC (rev 92431)
@@ -24,7 +24,7 @@
normalizeSpace=true)
@XmlType(name="web-fragmentType",
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
- propOrder={"descriptionGroup", "name", "distributable", "contextParams", "filters", "filterMappings", "listeners", "servlets",
+ propOrder={"ordering", "descriptionGroup", "name", "distributable", "contextParams", "filters", "filterMappings", "listeners", "servlets",
"servletMappings", "sessionConfig", "mimeMappings", "welcomeFileList", "errorPages", "jspConfig", "securityContraints",
"loginConfig", "securityRoles", "jndiEnvironmentRefsGroup", "messageDestinations", "localEncodings", "ordering"})
public class WebFragment30MetaData extends WebFragmentMetaData
Modified: projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp6Everything_testEverything.xml
===================================================================
--- projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp6Everything_testEverything.xml 2009-08-17 14:53:52 UTC (rev 92430)
+++ projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp6Everything_testEverything.xml 2009-08-17 15:12:21 UTC (rev 92431)
@@ -4,8 +4,6 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0" id="web-app-everything" metadata-complete="true">
- <name>foo</name>
-
<absolute-ordering>
<name>foo1</name>
<name>foo2</name>
@@ -13,10 +11,6 @@
<name>foo3</name>
</absolute-ordering>
- <icon>
- <small-icon>en-web-app-small-icon</small-icon>
- <large-icon>en-web-app-large-icon</large-icon>
- </icon>
<!-- description group -->
<description>en-web-app-desc</description>
<description xml:lang="fr">fr-web-app-desc</description>
@@ -24,6 +18,10 @@
<display-name>en-web-app-disp</display-name>
<display-name xml:lang="fr">fr-web-app-disp</display-name>
<display-name xml:lang="de">de-web-app-disp</display-name>
+ <icon>
+ <small-icon>en-web-app-small-icon</small-icon>
+ <large-icon>en-web-app-large-icon</large-icon>
+ </icon>
<icon id="en-web-app-icon-id">
<small-icon>en-web-app-small-icon</small-icon>
<large-icon>en-web-app-large-icon</large-icon>
@@ -37,6 +35,8 @@
<large-icon>de-web-app-large-icon</large-icon>
</icon>
+ <name>foo</name>
+
<distributable/>
<context-param id="context-param0">
@@ -590,4 +590,5 @@
<encoding>en</encoding>
</locale-encoding-mapping>
</locale-encoding-mapping-list>
- </web-app>
+
+</web-app>
Modified: projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp6Fragment_testEverything.xml
===================================================================
--- projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp6Fragment_testEverything.xml 2009-08-17 14:53:52 UTC (rev 92430)
+++ projects/metadata/web/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp6Fragment_testEverything.xml 2009-08-17 15:12:21 UTC (rev 92431)
@@ -16,10 +16,6 @@
</before>
</ordering>
- <icon>
- <small-icon>en-web-app-small-icon</small-icon>
- <large-icon>en-web-app-large-icon</large-icon>
- </icon>
<!-- description group -->
<description>en-web-app-desc</description>
<description xml:lang="fr">fr-web-app-desc</description>
@@ -27,6 +23,10 @@
<display-name>en-web-app-disp</display-name>
<display-name xml:lang="fr">fr-web-app-disp</display-name>
<display-name xml:lang="de">de-web-app-disp</display-name>
+ <icon>
+ <small-icon>en-web-app-small-icon</small-icon>
+ <large-icon>en-web-app-large-icon</large-icon>
+ </icon>
<icon id="en-web-app-icon-id">
<small-icon>en-web-app-small-icon</small-icon>
<large-icon>en-web-app-large-icon</large-icon>
@@ -577,4 +577,5 @@
<encoding>en</encoding>
</locale-encoding-mapping>
</locale-encoding-mapping-list>
+
</web-fragment>
More information about the jboss-cvs-commits
mailing list