/*
 * Copyright (C) 2013 salesforce.com, inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *         http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.auraframework.system;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/**
 */
public interface Annotations {
	
	/**
	 * This action will be queued and run as a lower priority background task.
	 */
	@Retention(RetentionPolicy.RUNTIME)
	@Target(ElementType.METHOD)
	public @interface BackgroundAction {
	}

    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.METHOD)
    public @interface AuraEnabled {
    }

    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.PARAMETER)
    public @interface Key {
        String value();
    }

    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.TYPE)
    public @interface Controller {
    }

    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.TYPE)
    public @interface Model {
    }

    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.TYPE)
    public @interface Provider {
    }

    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.TYPE)
    public @interface SecurityProvider {
    }

    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.METHOD)
    public @interface Type {
        String value();
    }
}

@@ -847,28 +847,45 @@
 %7B%0A%09%0A
-%09/**%0A%09 * This action
+    /**%0A     * Marks a method as that
  wil
@@ -939,20 +939,119 @@
 und 
-task.%0A%09 */%0A%09
+action.%0A     * The AuraEnabled annotation is still required to use this method as a server action.%0A     */%0A    
 @Ret
@@ -1082,17 +1082,20 @@
 UNTIME)%0A
-%09
+    
 @Target(
@@ -1114,17 +1114,20 @@
 METHOD)%0A
-%09
+    
 public @
@@ -1155,17 +1155,20 @@
 ction %7B%0A
-%09
+    
 %7D%0A%0A    @

Update javadoc per code review comments.