[jboss-cvs] JBossAS SVN: r91025 - projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 9 16:31:28 EDT 2009
Author: david.lloyd at jboss.com
Date: 2009-07-09 16:31:27 -0400 (Thu, 09 Jul 2009)
New Revision: 91025
Added:
projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/BooleanAdapter.java
projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/package-info.java
Modified:
projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractLoggerMetaData.java
projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractMultiFilterMetaData.java
projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/ErrorManagerMetaData.java
projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/FilterMetaData.java
projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaData.java
projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/SimpleFilterMetaData.java
Log:
Several jaxb/jbossxb fixups
Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractLoggerMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractLoggerMetaData.java 2009-07-09 20:19:51 UTC (rev 91024)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractLoggerMetaData.java 2009-07-09 20:31:27 UTC (rev 91025)
@@ -26,6 +26,7 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlElementWrapper;
public abstract class AbstractLoggerMetaData {
private RefMetaData levelMetaData;
@@ -54,6 +55,7 @@
return handlerMetaDataList;
}
+ @XmlElementWrapper(name = "handlers")
@XmlElements({
@XmlElement(name = "handler", type = HandlerMetaData.class),
@XmlElement(name = "log4j-appender", type = Log4jAppenderMetaData.class),
Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractMultiFilterMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractMultiFilterMetaData.java 2009-07-09 20:19:51 UTC (rev 91024)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractMultiFilterMetaData.java 2009-07-09 20:31:27 UTC (rev 91025)
@@ -29,8 +29,11 @@
import javax.xml.bind.annotation.XmlType;
import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.xb.annotations.JBossXmlType;
+import org.jboss.xb.annotations.JBossXmlConstants;
@XmlType(name = "multiFilterType", propOrder = {})
+ at JBossXmlType(modelGroup = JBossXmlConstants.MODEL_GROUP_CHOICE)
public abstract class AbstractMultiFilterMetaData {
private List<Object> filterMetaDataList;
Added: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/BooleanAdapter.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/BooleanAdapter.java (rev 0)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/BooleanAdapter.java 2009-07-09 20:31:27 UTC (rev 91025)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.logging.metadata;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+public final class BooleanAdapter extends XmlAdapter<String, Boolean> {
+
+ public Boolean unmarshal(final String v) throws Exception {
+ return Boolean.TRUE;
+ }
+
+ public String marshal(final Boolean v) throws Exception {
+ return "";
+ }
+}
Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/ErrorManagerMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/ErrorManagerMetaData.java 2009-07-09 20:19:51 UTC (rev 91024)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/ErrorManagerMetaData.java 2009-07-09 20:31:27 UTC (rev 91025)
@@ -26,6 +26,7 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@XmlType(name = "errorManagerType", propOrder = {})
public class ErrorManagerMetaData {
@@ -46,6 +47,7 @@
}
@XmlElement(name="only-once")
+ @XmlJavaTypeAdapter(BooleanAdapter.class)
public void setOnlyOnce(final boolean onlyOnce) {
this.onlyOnce = onlyOnce;
}
Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/FilterMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/FilterMetaData.java 2009-07-09 20:19:51 UTC (rev 91024)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/FilterMetaData.java 2009-07-09 20:31:27 UTC (rev 91025)
@@ -22,10 +22,14 @@
package org.jboss.logging.metadata;
+import org.jboss.xb.annotations.JBossXmlType;
+import org.jboss.xb.annotations.JBossXmlConstants;
+
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlAttribute;
@XmlType(name="filterType", propOrder = {})
+ at JBossXmlType(modelGroup = JBossXmlConstants.MODEL_GROUP_CHOICE)
public class FilterMetaData extends SimpleFilterMetaData {
private String name;
Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaData.java 2009-07-09 20:19:51 UTC (rev 91024)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaData.java 2009-07-09 20:31:27 UTC (rev 91025)
@@ -43,8 +43,8 @@
*
*/
@JBossXmlSchema(namespace = "urn:jboss:logging:6.0", elementFormDefault = XmlNsForm.QUALIFIED)
- at XmlRootElement(name = "jboss-logging")
- at XmlType(name = "jboss-logging", propOrder = {})
+ at XmlRootElement(name = "logging")
+ at XmlType(name = "logging", propOrder = {})
@JBossXmlType(modelGroup = JBossXmlConstants.MODEL_GROUP_CHOICE)
public class LoggingMetaData implements BeanMetaDataFactory {
private List<AbstractLoggerMetaData> loggerMetaDataList;
Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/SimpleFilterMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/SimpleFilterMetaData.java 2009-07-09 20:19:51 UTC (rev 91024)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/SimpleFilterMetaData.java 2009-07-09 20:31:27 UTC (rev 91025)
@@ -23,12 +23,15 @@
package org.jboss.logging.metadata;
import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.xb.annotations.JBossXmlType;
+import org.jboss.xb.annotations.JBossXmlConstants;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
@XmlType(name = "simpleFilterType")
+ at JBossXmlType(modelGroup = JBossXmlConstants.MODEL_GROUP_CHOICE)
public class SimpleFilterMetaData {
private Object value;
Added: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/package-info.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/package-info.java (rev 0)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/package-info.java 2009-07-09 20:31:27 UTC (rev 91025)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.
+ */
+
+ at JBossXmlAdaptedTypes
+({
+ @JBossXmlAdaptedType(type= Cardinality.class, valueAdapter= CardinalityValueAdapter.class),
+ @JBossXmlAdaptedType(type= ControllerState.class, valueAdapter= ControllerStateValueAdapter.class),
+ @JBossXmlAdaptedType(type= SearchInfo.class, valueAdapter= SearchInfoValueAdapter.class)
+})
+package org.jboss.logging.metadata;
+
+import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
+import org.jboss.xb.annotations.JBossXmlAdaptedType;
+import org.jboss.dependency.spi.Cardinality;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.graph.SearchInfo;
+import org.jboss.beans.metadata.plugins.CardinalityValueAdapter;
+import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
+import org.jboss.beans.metadata.plugins.SearchInfoValueAdapter;
More information about the jboss-cvs-commits
mailing list