summaryrefslogtreecommitdiff
path: root/qpid/java/broker-codegen/src
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-05-02 20:32:16 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-05-02 20:32:16 +0000
commitdb543bd85497285b1911c7250a9a1f76522f318b (patch)
tree0a88c2e19a1a8e3e4bedf49ab0a4ef7248d25603 /qpid/java/broker-codegen/src
parent1af82f62bbf94323e61a415c182adf2d66ac99f0 (diff)
downloadqpid-python-db543bd85497285b1911c7250a9a1f76522f318b.tar.gz
QPID-5746 : [Java Broker] Split attribute annotations into separate annotations for derived and automated, and allow derived attributes to be persisted
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1592030 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-codegen/src')
-rw-r--r--qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectRegistrationGenerator.java1
-rw-r--r--qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/ManagedObjectFactoryConstructor.java4
-rw-r--r--qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableProcessor.java2
-rw-r--r--qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableService.java3
4 files changed, 7 insertions, 3 deletions
diff --git a/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectRegistrationGenerator.java b/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectRegistrationGenerator.java
index 48e9c960b2..67ae9fbce5 100644
--- a/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectRegistrationGenerator.java
+++ b/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectRegistrationGenerator.java
@@ -87,7 +87,6 @@ public class ConfiguredObjectRegistrationGenerator extends AbstractProcessor
}
classNames.add(e.getSimpleName().toString());
}
- processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, e.getSimpleName());
}
for (Map.Entry<String, Set<String>> entry : _managedObjectClasses.entrySet())
{
diff --git a/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/ManagedObjectFactoryConstructor.java b/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/ManagedObjectFactoryConstructor.java
index 285f96db12..0e5022a66f 100644
--- a/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/ManagedObjectFactoryConstructor.java
+++ b/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/ManagedObjectFactoryConstructor.java
@@ -20,11 +20,13 @@
*/
package org.apache.qpid.server.model;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
@Retention(RetentionPolicy.SOURCE)
-
+@Target(ElementType.CONSTRUCTOR)
public @interface ManagedObjectFactoryConstructor
{
}
diff --git a/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableProcessor.java b/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableProcessor.java
index 8cf5692dd5..ba55f6cf20 100644
--- a/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableProcessor.java
+++ b/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableProcessor.java
@@ -142,7 +142,7 @@ public class PluggableProcessor extends AbstractProcessor
.printMessage(Diagnostic.Kind.NOTE, "Generating service file for " + serviceName);
String relativeName = "META-INF/services/" + serviceName;
-
+ loadExistingServicesFile(filer, serviceName);
try
{
FileObject serviceFile = filer.createResource(StandardLocation.CLASS_OUTPUT, "", relativeName);
diff --git a/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableService.java b/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableService.java
index 07799ca71a..59fe72e377 100644
--- a/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableService.java
+++ b/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/plugin/PluggableService.java
@@ -19,10 +19,13 @@ package org.apache.qpid.server.plugin;/*
*
*/
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
@Retention(RetentionPolicy.SOURCE)
+@Target(ElementType.TYPE)
public @interface PluggableService
{
}