[jboss-cvs] JBossAS SVN: r90996 - in projects/kernel/trunk: dependency/src/main/java/org/jboss/dependency/spi and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 9 08:03:53 EDT 2009
Author: alesj
Date: 2009-07-09 08:03:53 -0400 (Thu, 09 Jul 2009)
New Revision: 90996
Added:
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/CardinalityValueAdapter.java
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerStateValueAdapter.java
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/graph/SearchInfoValueAdapter.java
Removed:
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/CardinalityValueAdapter.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/ControllerStateValueAdapter.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/SearchInfoValueAdapter.java
Modified:
projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/package-info.java
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/Cardinality.java
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerState.java
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/graph/SearchInfo.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/package-info.java
projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/package-info.java
Log:
[JBKERNEL-45]; apply JBXB-125.
Modified: projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/package-info.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/package-info.java 2009-07-09 11:48:48 UTC (rev 90995)
+++ projects/kernel/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/package-info.java 2009-07-09 12:03:53 UTC (rev 90996)
@@ -21,15 +21,15 @@
*/
@JBossXmlAdaptedTypes
({
- @JBossXmlAdaptedType(type=Cardinality.class, valueAdapter=CardinalityValueAdapter.class),
- @JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class),
+ @JBossXmlAdaptedType(type=Cardinality.class, valueAdapter= CardinalityValueAdapter.class),
+ @JBossXmlAdaptedType(type=ControllerState.class, valueAdapter= ControllerStateValueAdapter.class),
@JBossXmlAdaptedType(type=SearchInfo.class, valueAdapter=SearchInfoValueAdapter.class)
})
package org.jboss.aop.microcontainer.beans.metadata;
-import org.jboss.beans.metadata.plugins.CardinalityValueAdapter;
-import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
-import org.jboss.beans.metadata.plugins.SearchInfoValueAdapter;
+import org.jboss.dependency.spi.CardinalityValueAdapter;
+import org.jboss.dependency.spi.ControllerStateValueAdapter;
+import org.jboss.dependency.spi.graph.SearchInfoValueAdapter;
import org.jboss.dependency.spi.Cardinality;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.graph.SearchInfo;
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/Cardinality.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/Cardinality.java 2009-07-09 11:48:48 UTC (rev 90995)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/Cardinality.java 2009-07-09 12:03:53 UTC (rev 90996)
@@ -22,9 +22,11 @@
package org.jboss.dependency.spi;
import java.io.Serializable;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.util.JBossObject;
import org.jboss.util.JBossStringBuilder;
+import org.jboss.xb.annotations.JBossXmlAdaptedType;
/**
* Used to specify the number of beans as a range of a certain type that must have been registered
@@ -33,6 +35,8 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
+ at XmlType
+ at JBossXmlAdaptedType(valueAdapter=CardinalityValueAdapter.class)
public class Cardinality extends JBossObject implements Serializable
{
private static final long serialVersionUID = 2L;
Copied: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/CardinalityValueAdapter.java (from rev 90514, projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/CardinalityValueAdapter.java)
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/CardinalityValueAdapter.java (rev 0)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/CardinalityValueAdapter.java 2009-07-09 12:03:53 UTC (rev 90996)
@@ -0,0 +1,40 @@
+/*
+* 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.dependency.spi;
+
+import org.jboss.xb.binding.sunday.unmarshalling.ValueAdapter;
+
+/**
+ * CardinalityValueAdapter.
+ *
+ * @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 CardinalityValueAdapter implements ValueAdapter
+{
+ @SuppressWarnings("unchecked")
+ public Object cast(Object o, Class c)
+ {
+ return Cardinality.toCardinality((String)o);
+ }
+}
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerState.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerState.java 2009-07-09 11:48:48 UTC (rev 90995)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerState.java 2009-07-09 12:03:53 UTC (rev 90996)
@@ -26,8 +26,11 @@
import java.util.HashMap;
import java.util.Map;
+import javax.xml.bind.annotation.XmlType;
+
import org.jboss.util.JBossObject;
import org.jboss.util.JBossStringBuilder;
+import org.jboss.xb.annotations.JBossXmlAdaptedType;
/**
* Description of the state of a {@link ControllerContext} in the controller.
@@ -35,11 +38,12 @@
* how they are used. The default states used when running in full kernel mode
* are constant ControllerState fields in this class.
*
- *
* @see ControllerContextActions
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
+ at XmlType
+ at JBossXmlAdaptedType(valueAdapter=ControllerStateValueAdapter.class)
public class ControllerState extends JBossObject implements Serializable
{
private static final long serialVersionUID = 2L;
Copied: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerStateValueAdapter.java (from rev 90514, projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/ControllerStateValueAdapter.java)
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerStateValueAdapter.java (rev 0)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerStateValueAdapter.java 2009-07-09 12:03:53 UTC (rev 90996)
@@ -0,0 +1,41 @@
+/*
+* 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.dependency.spi;
+
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.xb.binding.sunday.unmarshalling.ValueAdapter;
+
+/**
+ * ControllerStateValueAdapter.
+ *
+ * @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 ControllerStateValueAdapter implements ValueAdapter
+{
+ @SuppressWarnings("unchecked")
+ public Object cast(Object o, Class c)
+ {
+ return new ControllerState((String)o);
+ }
+}
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/graph/SearchInfo.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/graph/SearchInfo.java 2009-07-09 11:48:48 UTC (rev 90995)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/graph/SearchInfo.java 2009-07-09 12:03:53 UTC (rev 90996)
@@ -23,7 +23,10 @@
import java.util.Map;
import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+import org.jboss.xb.annotations.JBossXmlAdaptedType;
+
/**
* Search info.
*
@@ -31,6 +34,8 @@
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
+ at XmlType
+ at JBossXmlAdaptedType(valueAdapter=SearchInfoValueAdapter.class)
public interface SearchInfo
{
/**
Copied: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/graph/SearchInfoValueAdapter.java (from rev 90514, projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/SearchInfoValueAdapter.java)
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/graph/SearchInfoValueAdapter.java (rev 0)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/graph/SearchInfoValueAdapter.java 2009-07-09 12:03:53 UTC (rev 90996)
@@ -0,0 +1,39 @@
+/*
+* 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.dependency.spi.graph;
+
+import org.jboss.dependency.plugins.graph.Search;
+import org.jboss.xb.binding.sunday.unmarshalling.ValueAdapter;
+
+/**
+ * SearchInfoValueAdapter.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class SearchInfoValueAdapter implements ValueAdapter
+{
+ @SuppressWarnings("unchecked")
+ public Object cast(Object o, Class c)
+ {
+ return Search.getInstance((String)o);
+ }
+}
\ No newline at end of file
Property changes on: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/graph/SearchInfoValueAdapter.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/CardinalityValueAdapter.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/CardinalityValueAdapter.java 2009-07-09 11:48:48 UTC (rev 90995)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/CardinalityValueAdapter.java 2009-07-09 12:03:53 UTC (rev 90996)
@@ -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.xb.binding.sunday.unmarshalling.ValueAdapter;
-import org.jboss.dependency.spi.Cardinality;
-
-/**
- * CardinalityValueAdapter.
- *
- * @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 CardinalityValueAdapter implements ValueAdapter
-{
- @SuppressWarnings("unchecked")
- public Object cast(Object o, Class c)
- {
- return Cardinality.toCardinality((String)o);
- }
-}
Deleted: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/ControllerStateValueAdapter.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/ControllerStateValueAdapter.java 2009-07-09 11:48:48 UTC (rev 90995)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/ControllerStateValueAdapter.java 2009-07-09 12:03:53 UTC (rev 90996)
@@ -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.ControllerState;
-import org.jboss.xb.binding.sunday.unmarshalling.ValueAdapter;
-
-/**
- * ControllerStateValueAdapter.
- *
- * @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 ControllerStateValueAdapter implements ValueAdapter
-{
- @SuppressWarnings("unchecked")
- public Object cast(Object o, Class c)
- {
- return new ControllerState((String)o);
- }
-}
Deleted: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/SearchInfoValueAdapter.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/SearchInfoValueAdapter.java 2009-07-09 11:48:48 UTC (rev 90995)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/SearchInfoValueAdapter.java 2009-07-09 12:03:53 UTC (rev 90996)
@@ -1,39 +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.plugins.graph.Search;
-import org.jboss.xb.binding.sunday.unmarshalling.ValueAdapter;
-
-/**
- * SearchInfoValueAdapter.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- */
-public class SearchInfoValueAdapter implements ValueAdapter
-{
- @SuppressWarnings("unchecked")
- public Object cast(Object o, Class c)
- {
- return Search.getInstance((String)o);
- }
-}
\ No newline at end of file
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/package-info.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/package-info.java 2009-07-09 11:48:48 UTC (rev 90995)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/policy/package-info.java 2009-07-09 12:03:53 UTC (rev 90996)
@@ -21,15 +21,15 @@
*/
@JBossXmlAdaptedTypes
({
- @JBossXmlAdaptedType(type=Cardinality.class, valueAdapter=CardinalityValueAdapter.class),
+ @JBossXmlAdaptedType(type=Cardinality.class, valueAdapter= CardinalityValueAdapter.class),
@JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class),
- @JBossXmlAdaptedType(type=SearchInfo.class, valueAdapter=SearchInfoValueAdapter.class)
+ @JBossXmlAdaptedType(type=SearchInfo.class, valueAdapter= SearchInfoValueAdapter.class)
})
package org.jboss.beans.metadata.plugins.policy;
-import org.jboss.beans.metadata.plugins.CardinalityValueAdapter;
-import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
-import org.jboss.beans.metadata.plugins.SearchInfoValueAdapter;
+import org.jboss.dependency.spi.CardinalityValueAdapter;
+import org.jboss.dependency.spi.ControllerStateValueAdapter;
+import org.jboss.dependency.spi.graph.SearchInfoValueAdapter;
import org.jboss.dependency.spi.Cardinality;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.graph.SearchInfo;
Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/package-info.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/package-info.java 2009-07-09 11:48:48 UTC (rev 90995)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/deployment/package-info.java 2009-07-09 12:03:53 UTC (rev 90996)
@@ -27,9 +27,9 @@
})
package org.jboss.kernel.plugins.deployment;
-import org.jboss.beans.metadata.plugins.CardinalityValueAdapter;
-import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
-import org.jboss.beans.metadata.plugins.SearchInfoValueAdapter;
+import org.jboss.dependency.spi.CardinalityValueAdapter;
+import org.jboss.dependency.spi.ControllerStateValueAdapter;
+import org.jboss.dependency.spi.graph.SearchInfoValueAdapter;
import org.jboss.dependency.spi.Cardinality;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.graph.SearchInfo;
More information about the jboss-cvs-commits
mailing list