[jboss-cvs] JBossAS SVN: r75432 - in projects/microcontainer/trunk: dependency/src/main/org/jboss/dependency/spi and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 7 06:34:27 EDT 2008
Author: alesj
Date: 2008-07-07 06:34:27 -0400 (Mon, 07 Jul 2008)
New Revision: 75432
Removed:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ControllerModeValueAdapter.java
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/package-info.java
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerMode.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/AutowireType.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/package-info.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/package-info.java
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/inject/test/PropertyContextualInjection.xml
Log:
Remove ControllerMode enum adapter.
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/package-info.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/package-info.java 2008-07-07 09:54:16 UTC (rev 75431)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/metadata/package-info.java 2008-07-07 10:34:27 UTC (rev 75432)
@@ -22,16 +22,13 @@
@JBossXmlAdaptedTypes
({
@JBossXmlAdaptedType(type=Cardinality.class, valueAdapter=CardinalityValueAdapter.class),
- @JBossXmlAdaptedType(type=ControllerMode.class, valueAdapter= ControllerModeValueAdapter.class),
@JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class)
})
package org.jboss.aop.microcontainer.beans.metadata;
import org.jboss.beans.metadata.plugins.CardinalityValueAdapter;
-import org.jboss.beans.metadata.plugins.ControllerModeValueAdapter;
import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
import org.jboss.dependency.spi.Cardinality;
-import org.jboss.dependency.spi.ControllerMode;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.xb.annotations.JBossXmlAdaptedType;
import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerMode.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerMode.java 2008-07-07 09:54:16 UTC (rev 75431)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerMode.java 2008-07-07 10:34:27 UTC (rev 75432)
@@ -23,6 +23,8 @@
import java.util.Arrays;
+import javax.xml.bind.annotation.XmlEnumValue;
+
import org.jboss.util.JBossStringBuilder;
import org.jboss.xb.annotations.JBossXmlEnum;
@@ -36,7 +38,7 @@
public enum ControllerMode
{
AUTOMATIC("Automatic"),
- ON_DEMAND("On Demand"),
+ @XmlEnumValue("On Demand") ON_DEMAND("On Demand"),
MANUAL("Manual"),
DISABLED("Disabled"),
ASYNCHRONOUS("Asynchronous");
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/AutowireType.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/AutowireType.java 2008-07-07 09:54:16 UTC (rev 75431)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/api/model/AutowireType.java 2008-07-07 10:34:27 UTC (rev 75432)
@@ -21,6 +21,8 @@
*/
package org.jboss.beans.metadata.api.model;
+import javax.xml.bind.annotation.XmlEnumValue;
+
import org.jboss.util.JBossStringBuilder;
import org.jboss.xb.annotations.JBossXmlEnum;
@@ -38,8 +40,8 @@
public enum AutowireType
{
NONE(MicrocontainerConstants.NONE),
- BY_CLASS(MicrocontainerConstants.BY_CLASS),
- BY_NAME(MicrocontainerConstants.BY_NAME),
+ @XmlEnumValue("ByClass") BY_CLASS(MicrocontainerConstants.BY_CLASS),
+ @XmlEnumValue("ByName") BY_NAME(MicrocontainerConstants.BY_NAME),
CONSTRUCTOR(MicrocontainerConstants.CONSTRUCTOR),
AUTO(MicrocontainerConstants.AUTO);
Deleted: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ControllerModeValueAdapter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ControllerModeValueAdapter.java 2008-07-07 09:54:16 UTC (rev 75431)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/ControllerModeValueAdapter.java 2008-07-07 10:34:27 UTC (rev 75432)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* 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.beans.metadata.plugins;
-
-import org.jboss.dependency.spi.ControllerMode;
-import org.jboss.xb.binding.sunday.unmarshalling.ValueAdapter;
-
-/**
- * ControllerModeValueAdapter.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public class ControllerModeValueAdapter implements ValueAdapter
-{
- @SuppressWarnings("unchecked")
- public Object cast(Object o, Class c)
- {
- return ControllerMode.getInstance((String)o);
- }
-}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/package-info.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/package-info.java 2008-07-07 09:54:16 UTC (rev 75431)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/package-info.java 2008-07-07 10:34:27 UTC (rev 75432)
@@ -22,16 +22,13 @@
@JBossXmlAdaptedTypes
({
@JBossXmlAdaptedType(type=Cardinality.class, valueAdapter=CardinalityValueAdapter.class),
- @JBossXmlAdaptedType(type=ControllerMode.class, valueAdapter= ControllerModeValueAdapter.class),
@JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class)
})
package org.jboss.beans.metadata.plugins.policy;
import org.jboss.beans.metadata.plugins.CardinalityValueAdapter;
-import org.jboss.beans.metadata.plugins.ControllerModeValueAdapter;
import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
import org.jboss.dependency.spi.Cardinality;
-import org.jboss.dependency.spi.ControllerMode;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.xb.annotations.JBossXmlAdaptedType;
import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/package-info.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/package-info.java 2008-07-07 09:54:16 UTC (rev 75431)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/package-info.java 2008-07-07 10:34:27 UTC (rev 75432)
@@ -22,16 +22,13 @@
@JBossXmlAdaptedTypes
({
@JBossXmlAdaptedType(type=Cardinality.class, valueAdapter=CardinalityValueAdapter.class),
- @JBossXmlAdaptedType(type=ControllerMode.class, valueAdapter= ControllerModeValueAdapter.class),
@JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class)
})
package org.jboss.kernel.plugins.deployment;
import org.jboss.beans.metadata.plugins.CardinalityValueAdapter;
-import org.jboss.beans.metadata.plugins.ControllerModeValueAdapter;
import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
import org.jboss.dependency.spi.Cardinality;
-import org.jboss.dependency.spi.ControllerMode;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.xb.annotations.JBossXmlAdaptedType;
import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
Modified: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/inject/test/PropertyContextualInjection.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/inject/test/PropertyContextualInjection.xml 2008-07-07 09:54:16 UTC (rev 75431)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/inject/test/PropertyContextualInjection.xml 2008-07-07 10:34:27 UTC (rev 75432)
@@ -9,7 +9,7 @@
</bean>
<bean name="testObject2" class="org.jboss.test.kernel.inject.support.PropertyInjectTestObject">
- <property name="duplicateTester"><inject type="By_Name"/></property>
+ <property name="duplicateTester"><inject type="ByName"/></property>
</bean>
<bean name="testObject3" class="org.jboss.test.kernel.inject.support.PropertyInjectTestObject">
More information about the jboss-cvs-commits
mailing list