[jboss-cvs] JBossAS SVN: r102351 - 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
Fri Mar 12 11:26:39 EST 2010


Author: david.lloyd at jboss.com
Date: 2010-03-12 11:26:37 -0500 (Fri, 12 Mar 2010)
New Revision: 102351

Removed:
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/PropertyReplaceAdapter.java
Modified:
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractHandlerBeanMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractHandlerMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractLoggerRefMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AsyncHandlerMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/ConsoleHandlerMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/DefineContextMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/FileHandlerMetaData.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/LevelChangeFilterMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LevelFilterMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LevelRangeFilterMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggerMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggerRefMetaData.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/MatchFilterMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/PatternFormatterMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/PeriodicRotatingFileHandlerMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/RefMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/ReplaceFilterMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/SizeRotatingFileHandlerMetaData.java
Log:
Remove property replacer

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractHandlerBeanMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractHandlerBeanMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractHandlerBeanMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -23,7 +23,6 @@
 package org.jboss.logging.metadata;
 
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 public abstract class AbstractHandlerBeanMetaData extends AbstractHandlerMetaData {
 
@@ -34,7 +33,6 @@
     }
 
     @XmlAttribute(name = "class", required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setClassName(final String className) {
         this.className = className;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractHandlerMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractHandlerMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractHandlerMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -28,10 +28,8 @@
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.jboss.beans.metadata.spi.PropertyMetaData;
-import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
 
 public abstract class AbstractHandlerMetaData {
     private RefMetaData levelMetaData;
@@ -118,7 +116,6 @@
     }
 
     @XmlElementWrapper(name="properties")
-    @XmlElement(name="property", type=AbstractPropertyMetaData.class)
     public void setPropertyMetaDataList(final List<PropertyMetaData> propertyMetaDataList) {
         this.propertyMetaDataList = propertyMetaDataList;
     }
@@ -128,7 +125,6 @@
     }
 
     @XmlAttribute
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setName(final String name) {
         this.name = name;
     }
@@ -138,7 +134,6 @@
     }
 
     @XmlAttribute
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setEncoding(final String encoding) {
         this.encoding = encoding;
     }
@@ -148,7 +143,6 @@
     }
 
     @XmlAttribute
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setAutoflush(final boolean autoflush) {
         this.autoflush = autoflush;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractLoggerRefMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractLoggerRefMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractLoggerRefMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -23,7 +23,6 @@
 package org.jboss.logging.metadata;
 
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 public abstract class AbstractLoggerRefMetaData {
     private String context;
@@ -33,7 +32,6 @@
     }
 
     @XmlAttribute
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setContext(final String context) {
         this.context = context;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AsyncHandlerMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AsyncHandlerMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AsyncHandlerMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -26,7 +26,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "asyncHandlerType", propOrder = {})
 public class AsyncHandlerMetaData extends AbstractHandlerMetaData {
@@ -38,7 +37,6 @@
     }
 
     @XmlAttribute(name = "queue-length")
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setQueueLength(final int queueLength) {
         this.queueLength = queueLength;
     }
@@ -48,7 +46,6 @@
     }
 
     @XmlAttribute(name = "overflow-action")
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setOverflowAction(final OverflowAction overflowAction) {
         this.overflowAction = overflowAction;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/ConsoleHandlerMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/ConsoleHandlerMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/ConsoleHandlerMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -26,7 +26,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "consoleHandlerType", propOrder = {})
 public class ConsoleHandlerMetaData extends AbstractHandlerMetaData {
@@ -37,7 +36,6 @@
     }
 
     @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setTarget(final Target target) {
         this.target = target;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/DefineContextMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/DefineContextMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/DefineContextMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -24,7 +24,6 @@
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "defineContextType", propOrder = {})
 public class DefineContextMetaData {
@@ -35,7 +34,6 @@
     }
 
     @XmlAttribute
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setName(final String name) {
         this.name = name;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/FileHandlerMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/FileHandlerMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/FileHandlerMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -24,7 +24,6 @@
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "fileHandlerType", propOrder = {})
 public class FileHandlerMetaData extends AbstractHandlerMetaData {
@@ -36,7 +35,6 @@
     }
 
     @XmlAttribute(name = "file-name", required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setFileName(final String fileName) {
         this.fileName = fileName;
     }
@@ -46,7 +44,6 @@
     }
 
     @XmlAttribute
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setAppend(final boolean append) {
         this.append = append;
     }

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	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/FilterMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -27,7 +27,6 @@
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name="filterType", propOrder = {})
 @JBossXmlType(modelGroup = JBossXmlConstants.MODEL_GROUP_CHOICE)
@@ -39,7 +38,6 @@
     }
 
     @XmlAttribute
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setName(final String name) {
         this.name = name;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LevelChangeFilterMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LevelChangeFilterMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LevelChangeFilterMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -24,7 +24,6 @@
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "levelChangeFilterType")
 public class LevelChangeFilterMetaData extends AbstractSimpleFilterMetaData {
@@ -35,7 +34,6 @@
     }
 
     @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setLevel(final String level) {
         this.level = level;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LevelFilterMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LevelFilterMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LevelFilterMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -24,7 +24,6 @@
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "levelFilterType")
 public class LevelFilterMetaData extends AbstractSimpleFilterMetaData {
@@ -35,7 +34,6 @@
     }
 
     @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setLevel(final String level) {
         this.level = level;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LevelRangeFilterMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LevelRangeFilterMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LevelRangeFilterMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -24,7 +24,6 @@
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "levelRangeFilterType")
 public class LevelRangeFilterMetaData extends AbstractSimpleFilterMetaData {
@@ -38,7 +37,6 @@
     }
 
     @XmlAttribute(name = "min-level", required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setMinLevel(final String minLevel) {
         this.minLevel = minLevel;
     }
@@ -48,7 +46,6 @@
     }
 
     @XmlAttribute(name = "min-inclusive")
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setMinInclusive(final boolean minInclusive) {
         this.minInclusive = minInclusive;
     }
@@ -58,7 +55,6 @@
     }
 
     @XmlAttribute(name = "max-level", required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setMaxLevel(final String maxLevel) {
         this.maxLevel = maxLevel;
     }
@@ -68,7 +64,6 @@
     }
 
     @XmlAttribute(name = "max-inclusive")
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setMaxInclusive(final boolean maxInclusive) {
         this.maxInclusive = maxInclusive;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggerMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggerMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggerMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -24,7 +24,6 @@
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "loggerType", propOrder = {})
 public class LoggerMetaData extends AbstractLoggerMetaData {
@@ -36,7 +35,6 @@
     }
 
     @XmlAttribute(name = "use-parent-handlers")
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setUseParentHandlers(final boolean useParentHandlers) {
         this.useParentHandlers = useParentHandlers;
     }
@@ -46,7 +44,6 @@
     }
 
     @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setCategory(final String category) {
         this.category = category;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggerRefMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggerRefMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggerRefMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -24,7 +24,6 @@
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "loggerRefType", propOrder = {})
 public class LoggerRefMetaData extends AbstractLoggerRefMetaData {
@@ -35,7 +34,6 @@
     }
 
     @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setCategory(final String category) {
         this.category = category;
     }

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	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -35,7 +35,6 @@
 import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -107,7 +106,6 @@
     }
 
     @XmlAttribute(name = "context")
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setContext(final String context) {
         this.context = context;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/MatchFilterMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/MatchFilterMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/MatchFilterMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -24,7 +24,6 @@
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "regexFilterType", propOrder = {})
 public class MatchFilterMetaData extends AbstractSimpleFilterMetaData {
@@ -35,7 +34,6 @@
     }
 
     @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setPattern(final String pattern) {
         this.pattern = pattern;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/PatternFormatterMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/PatternFormatterMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/PatternFormatterMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -24,7 +24,6 @@
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "patternFormatterType", propOrder = {})
 public class PatternFormatterMetaData {
@@ -35,7 +34,6 @@
     }
 
     @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setPattern(final String pattern) {
         this.pattern = pattern;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/PeriodicRotatingFileHandlerMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/PeriodicRotatingFileHandlerMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/PeriodicRotatingFileHandlerMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -24,7 +24,6 @@
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "periodicFileHandlerType", propOrder = {})
 public class PeriodicRotatingFileHandlerMetaData extends FileHandlerMetaData {
@@ -35,7 +34,6 @@
     }
 
     @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setSuffix(final String suffix) {
         this.suffix = suffix;
     }

Deleted: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/PropertyReplaceAdapter.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/PropertyReplaceAdapter.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/PropertyReplaceAdapter.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -1,38 +0,0 @@
-/*
- * 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 org.jboss.util.StringPropertyReplacer;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-public final class PropertyReplaceAdapter extends XmlAdapter<String, String> {
-
-    public String unmarshal(final String v) throws Exception {
-        return StringPropertyReplacer.replaceProperties(v);
-    }
-
-    public String marshal(final String v) throws Exception {
-        return v;
-    }
-}

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/RefMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/RefMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/RefMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -24,7 +24,6 @@
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "refType", propOrder = {})
 public class RefMetaData {
@@ -35,7 +34,6 @@
     }
 
     @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setName(final String name) {
         this.name = name;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/ReplaceFilterMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/ReplaceFilterMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/ReplaceFilterMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -24,7 +24,6 @@
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "replaceFilterType")
 public class ReplaceFilterMetaData extends AbstractSimpleFilterMetaData {
@@ -37,7 +36,6 @@
     }
 
     @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setPattern(final String pattern) {
         this.pattern = pattern;
     }
@@ -47,7 +45,6 @@
     }
 
     @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setReplacement(final String replacement) {
         this.replacement = replacement;
     }
@@ -57,7 +54,6 @@
     }
 
     @XmlAttribute(name = "replace-all")
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setReplaceAll(final boolean replaceAll) {
         this.replaceAll = replaceAll;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/SizeRotatingFileHandlerMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/SizeRotatingFileHandlerMetaData.java	2010-03-12 16:08:31 UTC (rev 102350)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/SizeRotatingFileHandlerMetaData.java	2010-03-12 16:26:37 UTC (rev 102351)
@@ -24,7 +24,6 @@
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlType(name = "sizeFileHandlerType", propOrder = {})
 public class SizeRotatingFileHandlerMetaData extends FileHandlerMetaData {
@@ -36,7 +35,6 @@
     }
 
     @XmlAttribute(name = "rotate-size", required = true)
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setRotateSizeString(final String rotateSizeString) {
         this.rotateSizeString = rotateSizeString;
     }
@@ -46,7 +44,6 @@
     }
 
     @XmlAttribute(name = "max-backup-index")
-    @XmlJavaTypeAdapter(PropertyReplaceAdapter.class)
     public void setMaxBackupIndex(final int maxBackupIndex) {
         this.maxBackupIndex = maxBackupIndex;
     }




More information about the jboss-cvs-commits mailing list