[jboss-cvs] JBossAS SVN: r86322 - in projects/jboss-man/branches/Branch_2_1/managed/src: main/java/org/jboss/managed/api/annotation and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 25 09:11:00 EDT 2009
Author: scott.stark at jboss.org
Date: 2009-03-25 09:11:00 -0400 (Wed, 25 Mar 2009)
New Revision: 86322
Added:
projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/support/ManagementPropertyReadOnly.java
Modified:
projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/Fields.java
projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedComponent.java
projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedObject.java
projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedProperty.java
projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/MutableManagedComponent.java
projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/annotation/ManagementProperty.java
projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/DelegateManagedCommonImpl.java
projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/ManagedComponentImpl.java
projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/ManagedPropertyImpl.java
projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractManagedObjectFactory.java
projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/factory/DeploymentTemplateInfoFactory.java
projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/ManagementPropertyUnitTestCase.java
Log:
JBMAN-64, add isReadOnly to ManagedProperty
JBMAN-67, expose underlying annotations in ManagedComponent
JBMAN-66, Add setProperties, setOperations to MutableManagedComponent
Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/Fields.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/Fields.java 2009-03-25 13:10:11 UTC (rev 86321)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/Fields.java 2009-03-25 13:11:00 UTC (rev 86322)
@@ -79,6 +79,8 @@
/** The modified flag */
String MODIFIED = "modified";
+ /** The modified flag */
+ String READ_ONLY = "readOnly";
// TODO other standard fields here
/**
Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedComponent.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedComponent.java 2009-03-25 13:10:11 UTC (rev 86321)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedComponent.java 2009-03-25 13:11:00 UTC (rev 86322)
@@ -21,6 +21,9 @@
*/
package org.jboss.managed.api;
+import java.lang.annotation.Annotation;
+import java.util.Map;
+
/**
* A runtime component associated with a deployment.
*
@@ -42,6 +45,18 @@
public RunState getRunState();
/**
+ * Update the component statistic properties
+ * @return
+ */
+ public boolean update();
+
+ /**
+ * Get the annotations associated with the managed component
+ * @return the annotations associated with the managed component
+ */
+ public Map<String, Annotation> getAnnotations();
+
+ /**
* The deployment the component is associated with.
* @return component deployment.
*/
Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedObject.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedObject.java 2009-03-25 13:10:11 UTC (rev 86321)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedObject.java 2009-03-25 13:11:00 UTC (rev 86322)
@@ -54,8 +54,8 @@
Object getAttachment();
/**
- * Get the annotations associated with the property
- * @return the annotations associated with the property
+ * Get the annotations associated with the managed object
+ * @return the annotations associated with the managed object
*/
public Map<String, Annotation> getAnnotations();
Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedProperty.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedProperty.java 2009-03-25 13:10:11 UTC (rev 86321)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedProperty.java 2009-03-25 13:11:00 UTC (rev 86322)
@@ -194,6 +194,12 @@
boolean isMandatory();
/**
+ * Whether the property is read only
+ * @return true when read only
+ */
+ boolean isReadOnly();
+
+ /**
* Whether the property has been edited/modified.
*
* @return true when modified
Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/MutableManagedComponent.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/MutableManagedComponent.java 2009-03-25 13:10:11 UTC (rev 86321)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/MutableManagedComponent.java 2009-03-25 13:11:00 UTC (rev 86322)
@@ -21,6 +21,9 @@
*/
package org.jboss.managed.api;
+import java.util.Map;
+import java.util.Set;
+
/**
* @author Scott.Stark at jboss.org
* @version $Revision$
@@ -28,8 +31,19 @@
public interface MutableManagedComponent extends ManagedComponent
{
/**
- *
+ * Set the component runtime state
* @param runState
*/
public void setRunState(RunState runState);
+
+ /**
+ * Set the ManagedObject ManagedProperty mapping.
+ * @param properties - the ManagedProperty mapping.
+ */
+ public void setProperties(Map<String, ManagedProperty> properties);
+ /**
+ * Set the ManagedOperation associated with the ManagedObject.
+ * @param operations - the ManagedOperations for the ManagedObject.
+ */
+ public void setOperations(Set<ManagedOperation> operations);
}
Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/annotation/ManagementProperty.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/annotation/ManagementProperty.java 2009-03-25 13:10:11 UTC (rev 86321)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/annotation/ManagementProperty.java 2009-03-25 13:11:00 UTC (rev 86322)
@@ -52,7 +52,10 @@
/** Whether this property is mandatory */
boolean mandatory() default false;
-
+
+ /** Whether this property is read only */
+ boolean readOnly() default false;
+
/** Whether to create a managed object for the property */
boolean managed() default false;
Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/DelegateManagedCommonImpl.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/DelegateManagedCommonImpl.java 2009-03-25 13:10:11 UTC (rev 86321)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/DelegateManagedCommonImpl.java 2009-03-25 13:11:00 UTC (rev 86322)
@@ -90,5 +90,13 @@
{
return delegate.getParent();
}
-
+
+ protected ManagedObject getDelegate()
+ {
+ return delegate;
+ }
+ protected void setDelegate(ManagedObject delegate)
+ {
+ this.delegate = delegate;
+ }
}
Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/ManagedComponentImpl.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/ManagedComponentImpl.java 2009-03-25 13:10:11 UTC (rev 86321)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/ManagedComponentImpl.java 2009-03-25 13:11:00 UTC (rev 86322)
@@ -22,14 +22,18 @@
package org.jboss.managed.plugins;
import java.io.Serializable;
+import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.util.Map;
+import java.util.Set;
import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.ManagedDeployment;
import org.jboss.managed.api.ManagedObject;
+import org.jboss.managed.api.ManagedOperation;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.api.MutableManagedComponent;
+import org.jboss.managed.api.MutableManagedObject;
import org.jboss.managed.api.RunState;
import org.jboss.managed.api.RunStateMapper;
import org.jboss.managed.api.annotation.RunStateProperty;
@@ -102,6 +106,11 @@
}
}
+ public Map<String, Annotation> getAnnotations()
+ {
+ return getDelegate().getAnnotations();
+ }
+
public RunStateMapper getStateMapper()
{
return stateMapper;
@@ -120,6 +129,25 @@
this.runState = runState;
}
+ public void setOperations(Set<ManagedOperation> operations)
+ {
+ ManagedObject mo = getDelegate();
+ if(mo instanceof MutableManagedObject)
+ {
+ MutableManagedObject mmo = MutableManagedObject.class.cast(mo);
+ mmo.setOperations(operations);
+ }
+ }
+ public void setProperties(Map<String, ManagedProperty> properties)
+ {
+ ManagedObject mo = getDelegate();
+ if(mo instanceof MutableManagedObject)
+ {
+ MutableManagedObject mmo = MutableManagedObject.class.cast(mo);
+ mmo.setProperties(properties);
+ }
+ }
+
/**
* Update the cached run state
* @return the updated cache state
@@ -136,6 +164,17 @@
return runState;
}
+ /**
+ * Update the component statistic property values. This needs to be
+ * overriden by a subclass in the runtime environment to provide a useful
+ * implementation.
+ * @return false always.
+ */
+ public boolean update()
+ {
+ return false;
+ }
+
public ManagedDeployment getDeployment()
{
return owner;
Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/ManagedPropertyImpl.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/ManagedPropertyImpl.java 2009-03-25 13:10:11 UTC (rev 86321)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/ManagedPropertyImpl.java 2009-03-25 13:11:00 UTC (rev 86322)
@@ -400,6 +400,21 @@
return result;
}
+ public boolean isReadOnly()
+ {
+ Boolean result = getField(Fields.READ_ONLY, Boolean.class);
+ if (result == null)
+ return false;
+ return result;
+ }
+ public void setReadOnly(boolean flag)
+ {
+ if (flag)
+ setField(Fields.READ_ONLY, flag);
+ else
+ setField(Fields.READ_ONLY, null);
+ }
+
public boolean isModified()
{
Boolean result = getField(Fields.MODIFIED, Boolean.class);
Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractManagedObjectFactory.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractManagedObjectFactory.java 2009-03-25 13:10:11 UTC (rev 86321)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/factory/AbstractManagedObjectFactory.java 2009-03-25 13:11:00 UTC (rev 86322)
@@ -646,6 +646,12 @@
if (mandatory)
fields.setField(Fields.MANDATORY, Boolean.TRUE);
+ boolean readOnly = propertyInfo.isWritable() == false;
+ if (readOnly == false && managementProperty != null)
+ readOnly = managementProperty.readOnly();
+ if (readOnly)
+ fields.setField(Fields.READ_ONLY, Boolean.TRUE);
+
boolean managed = false;
if (managementProperty != null)
managed = managementProperty.managed();
Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/factory/DeploymentTemplateInfoFactory.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/factory/DeploymentTemplateInfoFactory.java 2009-03-25 13:10:11 UTC (rev 86321)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/factory/DeploymentTemplateInfoFactory.java 2009-03-25 13:11:00 UTC (rev 86322)
@@ -242,6 +242,12 @@
if (mandatory)
fields.setField(Fields.MANDATORY, Boolean.TRUE);
+ boolean readOnly = false;
+ if (managementProperty != null)
+ readOnly = managementProperty.readOnly();
+ if (readOnly)
+ fields.setField(Fields.READ_ONLY, Boolean.TRUE);
+
boolean managed = false;
if (managementProperty != null)
managed = managementProperty.managed();
Copied: projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/support/ManagementPropertyReadOnly.java (from rev 86318, projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/support/ManagementPropertyReadOnly.java)
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/support/ManagementPropertyReadOnly.java (rev 0)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/support/ManagementPropertyReadOnly.java 2009-03-25 13:11:00 UTC (rev 86322)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * 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.test.managed.factory.support;
+
+import java.io.Serializable;
+
+import org.jboss.managed.api.annotation.ManagementObject;
+import org.jboss.managed.api.annotation.ManagementProperty;
+
+/**
+ * Test of read only properties
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+ at ManagementObject
+public class ManagementPropertyReadOnly
+ implements Serializable
+{
+ private static final long serialVersionUID = 1;
+
+ public String getReadOnly()
+ {
+ return null;
+ }
+
+ public String getReadOnly2()
+ {
+ return null;
+ }
+ @ManagementProperty(readOnly=true)
+ public void setReadOnly2(String x)
+ {
+
+ }
+ public String getReadWrite()
+ {
+ return null;
+ }
+ @ManagementProperty(readOnly=false)
+ public void setReadWrite(String x)
+ {
+
+ }
+ public String getReadWrite2()
+ {
+ return null;
+ }
+ @ManagementProperty()
+ public void setReadWrite2(String x)
+ {
+
+ }
+}
Modified: projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/ManagementPropertyUnitTestCase.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/ManagementPropertyUnitTestCase.java 2009-03-25 13:10:11 UTC (rev 86321)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/ManagementPropertyUnitTestCase.java 2009-03-25 13:11:00 UTC (rev 86322)
@@ -39,6 +39,7 @@
import org.jboss.test.managed.factory.support.ManagementPropertyAnnotations;
import org.jboss.test.managed.factory.support.ManagementPropertyDescription;
import org.jboss.test.managed.factory.support.ManagementPropertyMandatory;
+import org.jboss.test.managed.factory.support.ManagementPropertyReadOnly;
import org.jboss.test.managed.factory.support.ManagementPropertySimpleManaged;
/**
@@ -88,6 +89,26 @@
}
/**
+ * Test the overridden and accessor based read only
+ */
+ public void testReadOnly()
+ {
+ ManagedObject managedObject = createAndCheckDefaultManagedObject(ManagementPropertyReadOnly.class);
+ checkProperty(managedObject, "readOnly", String.class, "readOnly", false, null);
+ checkProperty(managedObject, "readOnly2", String.class, "readOnly2", false, null);
+ checkProperty(managedObject, "readWrite", String.class, "readWrite", false, null);
+ checkProperty(managedObject, "readWrite2", String.class, "readWrite2", false, null);
+ ManagedProperty readOnly = managedObject.getProperty("readOnly");
+ assertTrue(readOnly.isReadOnly());
+ ManagedProperty readOnly2 = managedObject.getProperty("readOnly");
+ assertTrue(readOnly2.isReadOnly());
+ ManagedProperty readWrite = managedObject.getProperty("readWrite");
+ assertFalse(readWrite.isReadOnly());
+ ManagedProperty readWrite2 = managedObject.getProperty("readWrite2");
+ assertFalse(readWrite2.isReadOnly());
+ }
+
+ /**
* Test the overidden property to managed object
*/
public void testSimpleManaged()
More information about the jboss-cvs-commits
mailing list