summaryrefslogtreecommitdiff
path: root/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/Test2RootCategory.java
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-08-25 15:25:00 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-08-25 15:25:00 +0000
commit19478e74524f27e26f01117b1b973829718ed44d (patch)
tree214cee6e0e1fb25a553aaaa490b775450ea9e8e2 /qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/Test2RootCategory.java
parente0e8f4c5087c1c5dc787740d6bd862755bd8daf1 (diff)
downloadqpid-python-19478e74524f27e26f01117b1b973829718ed44d.tar.gz
Merging from trunk r1618230:1618433 in the Java tree
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620344 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/Test2RootCategory.java')
-rw-r--r--qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/Test2RootCategory.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/Test2RootCategory.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/Test2RootCategory.java
index e47c76cbbb..23f03db507 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/Test2RootCategory.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/Test2RootCategory.java
@@ -26,10 +26,15 @@ import org.apache.qpid.server.model.ManagedAttribute;
public interface Test2RootCategory<X extends Test2RootCategory<X>> extends TestRootCategory<X>
{
String DEFAULTED_VALUE_DEFAULT = "differentDefault";
+
@Override
@ManagedAttribute( defaultValue = DEFAULTED_VALUE_DEFAULT)
String getDefaultedValue();
+ @Override
+ @ManagedAttribute( validValues = {"org.apache.qpid.server.model.testmodel.Test2RootCategoryImpl#functionGeneratedValidValues()"})
+ String getValidValue();
+
@DerivedAttribute
public int getDerivedAttribute();
}