[exo-jcr-commits] exo-jcr SVN: r1210 - in kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform: container/management and 2 other directories.

Author: julien_viet Date: 2009-12-28 08:03:06 -0500 (Mon, 28 Dec 2009) New Revision: 1210 Added: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMetaData.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMethodMetaData.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMethodParameterMetaData.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedParameterMetaData.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedPropertyMetaData.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedTypeMetaData.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagementProvider.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagementProviderContext.java Removed: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMetaData.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMethodMetaData.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMethodParameterMetaData.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedParameterMetaData.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedPropertyMetaData.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedTypeMetaData.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/spi/ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagementProvider.java Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/ExoMBeanInfoBuilder.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/ExoModelMBean.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/JMXManagementProvider.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/ManagementContextImpl.java kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/MetaDataBuilder.java Log: EXOJCR-350 : Enable plugability of management layer : created SPI in dedicated management package Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/ExoMBeanInfoBuilder.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/ExoMBeanInfoBuilder.java 2009-12-28 12:50:33 UTC (rev 1209) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/ExoMBeanInfoBuilder.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -18,10 +18,10 @@ */ package org.exoplatform.container.jmx; -import org.exoplatform.container.management.ManagedMethodMetaData; -import org.exoplatform.container.management.ManagedMethodParameterMetaData; -import org.exoplatform.container.management.ManagedPropertyMetaData; -import org.exoplatform.container.management.ManagedTypeMetaData; +import org.exoplatform.management.spi.ManagedMethodMetaData; +import org.exoplatform.management.spi.ManagedMethodParameterMetaData; +import org.exoplatform.management.spi.ManagedPropertyMetaData; +import org.exoplatform.management.spi.ManagedTypeMetaData; import org.exoplatform.container.management.MetaDataBuilder; import java.lang.reflect.Method; Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/ExoModelMBean.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/ExoModelMBean.java 2009-12-28 12:50:33 UTC (rev 1209) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/ExoModelMBean.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -18,7 +18,7 @@ */ package org.exoplatform.container.jmx; -import org.exoplatform.container.management.spi.ManagementProviderContext; +import org.exoplatform.management.spi.ManagementProviderContext; import org.exoplatform.management.ManagementAware; import org.exoplatform.management.ManagementContext; import org.exoplatform.management.jmx.annotations.NamingContext; Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/JMXManagementProvider.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/JMXManagementProvider.java 2009-12-28 12:50:33 UTC (rev 1209) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/JMXManagementProvider.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -16,9 +16,9 @@ */ package org.exoplatform.container.jmx; -import org.exoplatform.container.management.ManagedTypeMetaData; -import org.exoplatform.container.management.spi.ManagementProvider; -import org.exoplatform.container.management.spi.ManagementProviderContext; +import org.exoplatform.management.spi.ManagedTypeMetaData; +import org.exoplatform.management.spi.ManagementProvider; +import org.exoplatform.management.spi.ManagementProviderContext; import org.exoplatform.management.jmx.annotations.NameTemplate; import javax.management.InstanceAlreadyExistsException; Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/ManagementContextImpl.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/ManagementContextImpl.java 2009-12-28 12:50:33 UTC (rev 1209) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/ManagementContextImpl.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -20,9 +20,9 @@ import org.exoplatform.container.ExoContainer; import org.exoplatform.container.component.RequestLifeCycle; -import org.exoplatform.container.management.ManagedTypeMetaData; +import org.exoplatform.management.spi.ManagedTypeMetaData; import org.exoplatform.container.management.MetaDataBuilder; -import org.exoplatform.container.management.spi.ManagementProviderContext; +import org.exoplatform.management.spi.ManagementProviderContext; import org.exoplatform.management.ManagementContext; import org.exoplatform.management.annotations.ManagedBy; Deleted: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMetaData.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMetaData.java 2009-12-28 12:50:33 UTC (rev 1209) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMetaData.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * 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.exoplatform.container.management; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class ManagedMetaData -{ - - /** . */ - private String description; - - public String getDescription() - { - return description; - } - - public void setDescription(String description) - { - this.description = description; - } -} Deleted: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMethodMetaData.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMethodMetaData.java 2009-12-28 12:50:33 UTC (rev 1209) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMethodMetaData.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -1,76 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * 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.exoplatform.container.management; - -import java.lang.reflect.Method; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class ManagedMethodMetaData extends ManagedMetaData -{ - - /** . */ - private final Method method; - - /** . */ - private final Map<Integer, ManagedMethodParameterMetaData> parameters; - - /** - * Build a new instance. - * - * @param method the method - * @throws NullPointerException if the method is null - */ - public ManagedMethodMetaData(Method method) throws NullPointerException - { - if (method == null) - { - throw new NullPointerException(); - } - - // - this.method = method; - this.parameters = new HashMap<Integer, ManagedMethodParameterMetaData>(); - } - - public Method getMethod() - { - return method; - } - - public void addParameter(ManagedMethodParameterMetaData parameter) - { - if (parameter == null) - { - throw new NullPointerException("No null parameter accepted"); - } - parameters.put(parameter.getIndex(), parameter); - } - - public Collection<ManagedMethodParameterMetaData> getParameters() - { - return Collections.unmodifiableCollection(parameters.values()); - } -} Deleted: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMethodParameterMetaData.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMethodParameterMetaData.java 2009-12-28 12:50:33 UTC (rev 1209) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMethodParameterMetaData.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * 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.exoplatform.container.management; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class ManagedMethodParameterMetaData extends ManagedParameterMetaData -{ - - /** . */ - private final int index; - - /** - * Build a managed method parameter meta data. - * - * @param index the parameter index - * @throws IllegalArgumentException if the index is negative - */ - public ManagedMethodParameterMetaData(int index) throws IllegalArgumentException - { - if (index < 0) - { - throw new IllegalArgumentException("Non negative index value accepted " + index); - } - this.index = index; - } - - public int getIndex() - { - return index; - } -} Deleted: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedParameterMetaData.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedParameterMetaData.java 2009-12-28 12:50:33 UTC (rev 1209) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedParameterMetaData.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * 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.exoplatform.container.management; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class ManagedParameterMetaData extends ManagedMetaData -{ - - /** . */ - private String name; - - public ManagedParameterMetaData() - { - } - - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } -} Deleted: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedPropertyMetaData.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedPropertyMetaData.java 2009-12-28 12:50:33 UTC (rev 1209) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedPropertyMetaData.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -1,116 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * 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.exoplatform.container.management; - -import java.lang.reflect.Method; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class ManagedPropertyMetaData extends ManagedMetaData -{ - - /** . */ - private final String name; - - /** . */ - private final Method getter; - - /** . */ - private final String getterDescription; - - /** . */ - private final Method setter; - - /** . */ - private final String setterDescription; - - /** . */ - private final ManagedParameterMetaData setterParameter; - - public ManagedPropertyMetaData(String name, Method getter, String getterDescription, Method setter, - String setterDescription, ManagedParameterMetaData setterParameter) throws NullPointerException, - IllegalArgumentException - { - if (name == null) - { - throw new NullPointerException("No null name accepted"); - } - if (setter != null) - { - if (setterParameter == null) - { - throw new IllegalArgumentException("No setter parameter provided"); - } - } - else - { - if (setterParameter != null) - { - throw new IllegalArgumentException("No setter provided but a setter parameter was provided"); - } - } - - // - this.name = name; - this.getter = getter; - this.getterDescription = getterDescription; - this.setter = setter; - this.setterDescription = setterDescription; - this.setterParameter = setterParameter; - } - - public String getName() - { - return name; - } - - public Method getGetter() - { - return getter; - } - - public Method getSetter() - { - return setter; - } - - public String getGetterDescription() - { - return getterDescription; - } - - public String getSetterDescription() - { - return setterDescription; - } - - public ManagedParameterMetaData getSetterParameter() - { - return setterParameter; - } - - @Override - public String toString() - { - return "ManagedPropertyMetaData[" + "name=" + name + "getter=" + getter.getName() + "setter=" + setter.getName() - + "]"; - } -} Deleted: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedTypeMetaData.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedTypeMetaData.java 2009-12-28 12:50:33 UTC (rev 1209) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedTypeMetaData.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -1,126 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * 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.exoplatform.container.management; - -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class ManagedTypeMetaData extends ManagedMetaData -{ - - /** . */ - private final Class type; - - /** . */ - private final Map<String, ManagedPropertyMetaData> properties; - - /** . */ - private final Map<MethodKey, ManagedMethodMetaData> methods; - - public ManagedTypeMetaData(Class type) throws NullPointerException - { - if (type == null) - { - throw new NullPointerException(); - } - - // - this.type = type; - this.properties = new HashMap<String, ManagedPropertyMetaData>(); - this.methods = new HashMap<MethodKey, ManagedMethodMetaData>(); - } - - public Class getType() - { - return type; - } - - public ManagedPropertyMetaData getProperty(String propertyName) - { - return properties.get(propertyName); - } - - public void addProperty(ManagedPropertyMetaData property) - { - properties.put(property.getName(), property); - } - - public void addMethod(ManagedMethodMetaData method) - { - methods.put(new MethodKey(method.getMethod()), method); - } - - public Collection<ManagedMethodMetaData> getMethods() - { - return methods.values(); - } - - public Collection<ManagedPropertyMetaData> getProperties() - { - return properties.values(); - } - - private static class MethodKey - { - - private final String name; - - private final List<Class<?>> types; - - private MethodKey(Method method) - { - this.name = method.getName(); - this.types = Arrays.asList(method.getParameterTypes()); - } - - @Override - public int hashCode() - { - int hashCode = name.hashCode(); - for (Class<?> type : types) - { - hashCode = hashCode * 41 + type.hashCode(); - } - return hashCode; - } - - @Override - public boolean equals(Object obj) - { - if (obj == this) - { - return true; - } - if (obj instanceof MethodKey) - { - MethodKey that = (MethodKey)obj; - return this.name.equals(that.name) && this.types.equals(that.types); - } - return false; - } - } -} Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/MetaDataBuilder.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/MetaDataBuilder.java 2009-12-28 12:50:33 UTC (rev 1209) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/MetaDataBuilder.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -22,6 +22,11 @@ import org.exoplatform.management.annotations.Managed; import org.exoplatform.management.annotations.ManagedDescription; import org.exoplatform.management.annotations.ManagedName; +import org.exoplatform.management.spi.ManagedMethodMetaData; +import org.exoplatform.management.spi.ManagedMethodParameterMetaData; +import org.exoplatform.management.spi.ManagedParameterMetaData; +import org.exoplatform.management.spi.ManagedPropertyMetaData; +import org.exoplatform.management.spi.ManagedTypeMetaData; import java.lang.annotation.Annotation; import java.lang.reflect.Method; Copied: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi (from rev 1207, kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/spi) Copied: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMetaData.java (from rev 1204, kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMetaData.java) =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMetaData.java (rev 0) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMetaData.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2009 eXo Platform SAS. + * + * 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.exoplatform.management.spi; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class ManagedMetaData +{ + + /** . */ + private String description; + + public String getDescription() + { + return description; + } + + public void setDescription(String description) + { + this.description = description; + } +} Copied: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMethodMetaData.java (from rev 1204, kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMethodMetaData.java) =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMethodMetaData.java (rev 0) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMethodMetaData.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2009 eXo Platform SAS. + * + * 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.exoplatform.management.spi; + +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class ManagedMethodMetaData extends ManagedMetaData +{ + + /** . */ + private final Method method; + + /** . */ + private final Map<Integer, ManagedMethodParameterMetaData> parameters; + + /** + * Build a new instance. + * + * @param method the method + * @throws NullPointerException if the method is null + */ + public ManagedMethodMetaData(Method method) throws NullPointerException + { + if (method == null) + { + throw new NullPointerException(); + } + + // + this.method = method; + this.parameters = new HashMap<Integer, ManagedMethodParameterMetaData>(); + } + + public Method getMethod() + { + return method; + } + + public void addParameter(ManagedMethodParameterMetaData parameter) + { + if (parameter == null) + { + throw new NullPointerException("No null parameter accepted"); + } + parameters.put(parameter.getIndex(), parameter); + } + + public Collection<ManagedMethodParameterMetaData> getParameters() + { + return Collections.unmodifiableCollection(parameters.values()); + } +} Copied: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMethodParameterMetaData.java (from rev 1204, kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedMethodParameterMetaData.java) =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMethodParameterMetaData.java (rev 0) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedMethodParameterMetaData.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2009 eXo Platform SAS. + * + * 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.exoplatform.management.spi; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class ManagedMethodParameterMetaData extends ManagedParameterMetaData +{ + + /** . */ + private final int index; + + /** + * Build a managed method parameter meta data. + * + * @param index the parameter index + * @throws IllegalArgumentException if the index is negative + */ + public ManagedMethodParameterMetaData(int index) throws IllegalArgumentException + { + if (index < 0) + { + throw new IllegalArgumentException("Non negative index value accepted " + index); + } + this.index = index; + } + + public int getIndex() + { + return index; + } +} Copied: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedParameterMetaData.java (from rev 1204, kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedParameterMetaData.java) =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedParameterMetaData.java (rev 0) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedParameterMetaData.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2009 eXo Platform SAS. + * + * 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.exoplatform.management.spi; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class ManagedParameterMetaData extends ManagedMetaData +{ + + /** . */ + private String name; + + public ManagedParameterMetaData() + { + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } +} Copied: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedPropertyMetaData.java (from rev 1204, kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedPropertyMetaData.java) =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedPropertyMetaData.java (rev 0) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedPropertyMetaData.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2009 eXo Platform SAS. + * + * 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.exoplatform.management.spi; + +import java.lang.reflect.Method; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class ManagedPropertyMetaData extends ManagedMetaData +{ + + /** . */ + private final String name; + + /** . */ + private final Method getter; + + /** . */ + private final String getterDescription; + + /** . */ + private final Method setter; + + /** . */ + private final String setterDescription; + + /** . */ + private final ManagedParameterMetaData setterParameter; + + public ManagedPropertyMetaData(String name, Method getter, String getterDescription, Method setter, + String setterDescription, ManagedParameterMetaData setterParameter) throws NullPointerException, + IllegalArgumentException + { + if (name == null) + { + throw new NullPointerException("No null name accepted"); + } + if (setter != null) + { + if (setterParameter == null) + { + throw new IllegalArgumentException("No setter parameter provided"); + } + } + else + { + if (setterParameter != null) + { + throw new IllegalArgumentException("No setter provided but a setter parameter was provided"); + } + } + + // + this.name = name; + this.getter = getter; + this.getterDescription = getterDescription; + this.setter = setter; + this.setterDescription = setterDescription; + this.setterParameter = setterParameter; + } + + public String getName() + { + return name; + } + + public Method getGetter() + { + return getter; + } + + public Method getSetter() + { + return setter; + } + + public String getGetterDescription() + { + return getterDescription; + } + + public String getSetterDescription() + { + return setterDescription; + } + + public ManagedParameterMetaData getSetterParameter() + { + return setterParameter; + } + + @Override + public String toString() + { + return "ManagedPropertyMetaData[" + "name=" + name + "getter=" + getter.getName() + "setter=" + setter.getName() + + "]"; + } +} Copied: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedTypeMetaData.java (from rev 1204, kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManagedTypeMetaData.java) =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedTypeMetaData.java (rev 0) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagedTypeMetaData.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2009 eXo Platform SAS. + * + * 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.exoplatform.management.spi; + +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class ManagedTypeMetaData extends ManagedMetaData +{ + + /** . */ + private final Class type; + + /** . */ + private final Map<String, ManagedPropertyMetaData> properties; + + /** . */ + private final Map<MethodKey, ManagedMethodMetaData> methods; + + public ManagedTypeMetaData(Class type) throws NullPointerException + { + if (type == null) + { + throw new NullPointerException(); + } + + // + this.type = type; + this.properties = new HashMap<String, ManagedPropertyMetaData>(); + this.methods = new HashMap<MethodKey, ManagedMethodMetaData>(); + } + + public Class getType() + { + return type; + } + + public ManagedPropertyMetaData getProperty(String propertyName) + { + return properties.get(propertyName); + } + + public void addProperty(ManagedPropertyMetaData property) + { + properties.put(property.getName(), property); + } + + public void addMethod(ManagedMethodMetaData method) + { + methods.put(new MethodKey(method.getMethod()), method); + } + + public Collection<ManagedMethodMetaData> getMethods() + { + return methods.values(); + } + + public Collection<ManagedPropertyMetaData> getProperties() + { + return properties.values(); + } + + private static class MethodKey + { + + private final String name; + + private final List<Class<?>> types; + + private MethodKey(Method method) + { + this.name = method.getName(); + this.types = Arrays.asList(method.getParameterTypes()); + } + + @Override + public int hashCode() + { + int hashCode = name.hashCode(); + for (Class<?> type : types) + { + hashCode = hashCode * 41 + type.hashCode(); + } + return hashCode; + } + + @Override + public boolean equals(Object obj) + { + if (obj == this) + { + return true; + } + if (obj instanceof MethodKey) + { + MethodKey that = (MethodKey)obj; + return this.name.equals(that.name) && this.types.equals(that.types); + } + return false; + } + } +} Deleted: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagementProvider.java =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/spi/ManagementProvider.java 2009-12-28 11:48:25 UTC (rev 1207) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagementProvider.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2003-2007 eXo Platform SAS. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License - * as published by the Free Software Foundation; either version 3 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see<http://www.gnu.org/licenses/>;. - */ -package org.exoplatform.container.management.spi; - -import org.exoplatform.container.jmx.ManagementContextImpl; -import org.exoplatform.container.management.ManagedTypeMetaData; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public interface ManagementProvider -{ - - Object manage(ManagementContextImpl context, Object managedResource, ManagedTypeMetaData metaData); - - void unmanage(Object key); - -} Copied: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagementProvider.java (from rev 1209, kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/spi/ManagementProvider.java) =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagementProvider.java (rev 0) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagementProvider.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2003-2007 eXo Platform SAS. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see<http://www.gnu.org/licenses/>;. + */ +package org.exoplatform.management.spi; + +import org.exoplatform.management.spi.ManagedTypeMetaData; + +/** + * This interface is implemented by a management provider such a JMX. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public interface ManagementProvider +{ + + /** + * Instruct the management provider to manage the provided resource with the specified meta data. + * + * @param context the context + * @param managedResource the managed resource + * @param metaData the meta data describing the management interface + * @return the key under which the resource is registered + */ + Object manage(ManagementProviderContext context, Object managedResource, ManagedTypeMetaData metaData); + + /** + * Instruct the management provider to remove the specifed resource from management. + * + * @param key the key under which the resource is registered + */ + void unmanage(Object key); + +} Copied: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagementProviderContext.java (from rev 1209, kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/spi/ManagementProviderContext.java) =================================================================== --- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagementProviderContext.java (rev 0) +++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/spi/ManagementProviderContext.java 2009-12-28 13:03:06 UTC (rev 1210) @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2003-2007 eXo Platform SAS. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see<http://www.gnu.org/licenses/>;. + */ +package org.exoplatform.management.spi; + +import org.exoplatform.management.ManagementContext; + +import java.util.Map; + +/** + * The contract between a management provider and the kernel. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public interface ManagementProviderContext extends ManagementContext +{ + + /** + * Returns the scoping properties of the context; + * + * @return the scoping properties + */ + Map<String, String> getScopingProperties(); + + /** + * Before a managed resource is invoked by the management layer. + * + * @param managedResource the managed resource + */ + void beforeInvoke(Object managedResource); + + /** + * After a managed resource is invoked by the management layer. + * + * @param managedResource the managed resource + */ + void afterInvoke(Object managedResource); + + /** + * Callback to obtain a management provider context for the specified managed resource scoped with + * the provided properties. + * + * @param managedResource the managed resource + * @param scopingProperties the scoping properties + * @return the context + */ + ManagementProviderContext createContext(Object managedResource, Map<String, String> scopingProperties); + +}