From db543bd85497285b1911c7250a9a1f76522f318b Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Fri, 2 May 2014 20:32:16 +0000 Subject: 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 --- .../qpid/server/model/ConfiguredObjectRegistrationGenerator.java | 1 - .../org/apache/qpid/server/model/ManagedObjectFactoryConstructor.java | 4 +++- .../main/java/org/apache/qpid/server/plugin/PluggableProcessor.java | 2 +- .../src/main/java/org/apache/qpid/server/plugin/PluggableService.java | 3 +++ 4 files changed, 7 insertions(+), 3 deletions(-) (limited to 'qpid/java/broker-codegen/src') 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> 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 { } -- cgit v1.2.1