repackaging: all the repackaging changes squashed

modules/@angular/core/src/application_common_providers.ts

@@ -1,4 +1,4 @@
-import {Type} from 'angular2/src/facade/lang';
+import {Type} from '../src/facade/lang';
 import {APP_ID_RANDOM_PROVIDER} from './application_tokens';
 import {APPLICATION_CORE_PROVIDERS} from './application_ref';
 import {
@@ -7,7 +7,7 @@ import {
   KeyValueDiffers,
   defaultKeyValueDiffers
 } from './change_detection/change_detection';
-import {ViewUtils} from "./linker/view_utils";
+import {ViewUtils} from './linker/view_utils';
 import {ComponentResolver, ReflectorComponentResolver} from './linker/component_resolver';
 import {DynamicComponentLoader, DynamicComponentLoader_} from './linker/dynamic_component_loader';
 

modules/@angular/core/src/application_ref.ts

@@ -1,30 +1,27 @@
-import {NgZone, NgZoneError} from 'angular2/src/core/zone/ng_zone';
+import {NgZone, NgZoneError} from './zone/ng_zone';
 import {
   Type,
   isBlank,
   isPresent,
   assertionsEnabled,
-  print,
-  IS_DART,
   lockMode,
   isPromise
-} from 'angular2/src/facade/lang';
-import {provide, Provider, Injector, Injectable} from 'angular2/src/core/di';
-import {APP_ID_RANDOM_PROVIDER, PLATFORM_INITIALIZER, APP_INITIALIZER} from './application_tokens';
-import {PromiseWrapper, PromiseCompleter, ObservableWrapper} from 'angular2/src/facade/async';
-import {ListWrapper} from 'angular2/src/facade/collection';
-import {TestabilityRegistry, Testability} from 'angular2/src/core/testability/testability';
-import {ComponentResolver} from 'angular2/src/core/linker/component_resolver';
-import {ComponentRef, ComponentFactory} from 'angular2/src/core/linker/component_factory';
+} from '../src/facade/lang';
+import {Injector, Injectable} from './di';
+import {PLATFORM_INITIALIZER, APP_INITIALIZER} from './application_tokens';
+import {PromiseWrapper, ObservableWrapper} from '../src/facade/async';
+import {ListWrapper} from '../src/facade/collection';
+import {TestabilityRegistry, Testability} from './testability/testability';
+import {ComponentResolver} from './linker/component_resolver';
+import {ComponentRef, ComponentFactory} from './linker/component_factory';
 import {
   BaseException,
-  WrappedException,
   ExceptionHandler,
   unimplemented
-} from 'angular2/src/facade/exceptions';
-import {Console} from 'angular2/src/core/console';
+} from '../src/facade/exceptions';
+import {Console} from './console';
 import {wtfLeave, wtfCreateScope, WtfScopeFn} from './profile/profile';
-import {ChangeDetectorRef} from 'angular2/src/core/change_detection/change_detector_ref';
+import {ChangeDetectorRef} from './change_detection/change_detector_ref';
 
 /**
  * Create an Angular zone.

modules/@angular/core/src/application_tokens.ts

@@ -1,5 +1,5 @@
-import {OpaqueToken, Provider} from 'angular2/src/core/di';
-import {Math, StringWrapper} from 'angular2/src/facade/lang';
+import {OpaqueToken} from './di';
+import {Math, StringWrapper} from '../src/facade/lang';
 
 /**
  * A DI Token representing a unique string id assigned to the application by Angular and used

modules/@angular/core/src/change_detection.ts

@@ -12,6 +12,7 @@ export {
   WrappedValue,
   SimpleChange,
   PipeTransform,
+  DefaultIterableDiffer,
   IterableDiffers,
   IterableDiffer,
   IterableDifferFactory,

modules/@angular/core/src/change_detection/change_detection.ts

@@ -30,6 +30,7 @@ export {
   TrackByFn
 } from './differs/iterable_differs';
 export {KeyValueDiffers, KeyValueDiffer, KeyValueDifferFactory} from './differs/keyvalue_differs';
+export {DefaultIterableDiffer} from './differs/default_iterable_differ';
 export {PipeTransform} from './pipe_transform';
 
 export {

modules/@angular/core/src/change_detection/change_detection_util.ts

@@ -1,11 +1,10 @@
-import {isBlank, looseIdentical, isPrimitive} from 'angular2/src/facade/lang';
+import {looseIdentical, isPrimitive} from '../../src/facade/lang';
 import {
-  StringMapWrapper,
   isListLikeIterable,
   areIterablesEqual
-} from 'angular2/src/facade/collection';
+} from '../../src/facade/collection';
 
-export {looseIdentical} from 'angular2/src/facade/lang';
+export {looseIdentical} from '../../src/facade/lang';
 export var uninitialized: Object = /*@ts2dart_const*/ new Object();
 
 export function devModeEqual(a: any, b: any): boolean {

modules/@angular/core/src/change_detection/constants.ts

@@ -1,4 +1,4 @@
-import {StringWrapper, normalizeBool, isBlank} from 'angular2/src/facade/lang';
+import {isBlank} from '../../src/facade/lang';
 
 /**
  * Describes the current state of the change detector.

modules/@angular/core/src/change_detection/differs/default_iterable_differ.ts

@@ -1,5 +1,5 @@
-import {BaseException} from 'angular2/src/facade/exceptions';
-import {isListLikeIterable, iterateListLike, ListWrapper} from 'angular2/src/facade/collection';
+import {BaseException} from '../../../src/facade/exceptions';
+import {isListLikeIterable, iterateListLike} from '../../../src/facade/collection';
 
 import {
   isBlank,
@@ -8,10 +8,10 @@ import {
   getMapKey,
   looseIdentical,
   isArray
-} from 'angular2/src/facade/lang';
+} from '../../../src/facade/lang';
 
 import {ChangeDetectorRef} from '../change_detector_ref';
-import {IterableDiffer, IterableDifferFactory, TrackByFn} from '../differs/iterable_differs';
+import {IterableDiffer, IterableDifferFactory, TrackByFn} from './iterable_differs';
 
 /* @ts2dart_const */
 export class DefaultIterableDifferFactory implements IterableDifferFactory {

modules/@angular/core/src/change_detection/differs/default_keyvalue_differ.ts

@@ -1,8 +1,8 @@
-import {MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
-import {stringify, looseIdentical, isJsObject, isBlank} from 'angular2/src/facade/lang';
-import {BaseException} from 'angular2/src/facade/exceptions';
+import {MapWrapper, StringMapWrapper} from '../../../src/facade/collection';
+import {stringify, looseIdentical, isJsObject, isBlank} from '../../../src/facade/lang';
+import {BaseException} from '../../../src/facade/exceptions';
 import {ChangeDetectorRef} from '../change_detector_ref';
-import {KeyValueDiffer, KeyValueDifferFactory} from '../differs/keyvalue_differs';
+import {KeyValueDiffer, KeyValueDifferFactory} from './keyvalue_differs';
 
 /* @ts2dart_const */
 export class DefaultKeyValueDifferFactory implements KeyValueDifferFactory {

modules/@angular/core/src/change_detection/differs/iterable_differs.ts

@@ -1,8 +1,8 @@
-import {isBlank, isPresent, getTypeNameForDebugging} from 'angular2/src/facade/lang';
-import {BaseException} from 'angular2/src/facade/exceptions';
-import {ListWrapper} from 'angular2/src/facade/collection';
+import {isBlank, isPresent, getTypeNameForDebugging} from '../../../src/facade/lang';
+import {BaseException} from '../../../src/facade/exceptions';
+import {ListWrapper} from '../../../src/facade/collection';
 import {ChangeDetectorRef} from '../change_detector_ref';
-import {Provider, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/src/core/di';
+import {Provider, SkipSelfMetadata, OptionalMetadata} from '../../di';
 
 /**
  * A strategy for tracking changes over time to an iterable. Used for {@link NgFor} to

modules/@angular/core/src/change_detection/differs/keyvalue_differs.ts

@@ -1,8 +1,8 @@
-import {isBlank, isPresent} from 'angular2/src/facade/lang';
-import {BaseException} from 'angular2/src/facade/exceptions';
-import {ListWrapper} from 'angular2/src/facade/collection';
+import {isBlank, isPresent} from '../../../src/facade/lang';
+import {BaseException} from '../../../src/facade/exceptions';
+import {ListWrapper} from '../../../src/facade/collection';
 import {ChangeDetectorRef} from '../change_detector_ref';
-import {Provider, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/src/core/di';
+import {Provider, SkipSelfMetadata, OptionalMetadata} from '../../di';
 
 /**
  * A differ that tracks changes made to an object over time.

modules/@angular/core/src/change_detection/pipe_transform.ts

@@ -13,7 +13,7 @@
  * The `RepeatPipe` below repeats the value as many times as indicated by the first argument:
  *
  * ```
- * import {Pipe, PipeTransform} from 'angular2/core';
+ * import {Pipe, PipeTransform} from '@angular/core';
  *
  * @Pipe({name: 'repeat'})
  * export class RepeatPipe implements PipeTransform {

modules/@angular/core/src/console.ts

@@ -1,5 +1,5 @@
-import {Injectable} from 'angular2/src/core/di';
-import {print, warn} from 'angular2/src/facade/lang';
+import {print, warn} from './facade/lang';
+import {Injectable} from './di/decorators';
 
 // Note: Need to rename warn as in Dart
 // class members and imports can't use the same name.

modules/@angular/core/src/debug/debug_node.ts

@@ -1,7 +1,7 @@
-import {isPresent, Type} from 'angular2/src/facade/lang';
-import {Predicate, ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
-import {Injector} from 'angular2/src/core/di';
-import {RenderDebugInfo} from 'angular2/src/core/render/api';
+import {isPresent} from '../../src/facade/lang';
+import {Predicate, ListWrapper, MapWrapper} from '../../src/facade/collection';
+import {Injector} from '../di';
+import {RenderDebugInfo} from '../render/api';
 
 export class EventListener { constructor(public name: string, public callback: Function){}; }
 

modules/@angular/core/src/debug/debug_renderer.ts

@@ -1,10 +1,10 @@
-import {isPresent} from 'angular2/src/facade/lang';
+import {isPresent} from '../../src/facade/lang';
 import {
   Renderer,
   RootRenderer,
   RenderComponentType,
   RenderDebugInfo
-} from 'angular2/src/core/render/api';
+} from '../render/api';
 import {
   DebugNode,
   DebugElement,
@@ -12,7 +12,7 @@ import {
   getDebugNode,
   indexDebugNode,
   removeDebugNodeFromIndex
-} from 'angular2/src/core/debug/debug_node';
+} from './debug_node';
 
 export class DebugDomRootRenderer implements RootRenderer {
   constructor(private _delegate: RootRenderer) {}

modules/@angular/core/src/di/decorators.ts

@@ -85,4 +85,4 @@ export var Host: HostMetadataFactory = makeParamDecorator(HostMetadata);
 /**
  * Factory for creating {@link SkipSelfMetadata}.
  */
-export var SkipSelf: SkipSelfMetadataFactory = makeParamDecorator(SkipSelfMetadata);
+export var SkipSelf: SkipSelfMetadataFactory = makeParamDecorator(SkipSelfMetadata);

modules/@angular/core/src/di/forward_ref.ts

@@ -1,4 +1,4 @@
-import {Type, stringify, isFunction} from 'angular2/src/facade/lang';
+import {Type, stringify, isFunction} from '../../src/facade/lang';
 
 /**
  * An interface that a function passed into {@link forwardRef} has to implement.

modules/@angular/core/src/di/injector.ts

@@ -1,4 +1,4 @@
-import {unimplemented} from 'angular2/src/facade/exceptions';
+import {unimplemented} from '../../src/facade/exceptions';
 
 const _THROW_IF_NOT_FOUND = /*@ts2dart_const*/ new Object();
 export const THROW_IF_NOT_FOUND = /*@ts2dart_const*/ _THROW_IF_NOT_FOUND;

modules/@angular/core/src/di/metadata.ts

@@ -1,4 +1,4 @@
-import {stringify, isBlank, isPresent} from "angular2/src/facade/lang";
+import {stringify} from '../../src/facade/lang';
 
 /**
  * A parameter metadata that specifies a dependency.

modules/@angular/core/src/di/opaque_token.ts

@@ -1,4 +1,3 @@
-
 /**
  * Creates a token that can be used in a DI Provider.
  *

modules/@angular/core/src/di/provider.ts

@@ -5,8 +5,8 @@ import {
   isBlank,
   isFunction,
   stringify
-} from 'angular2/src/facade/lang';
-import {BaseException} from 'angular2/src/facade/exceptions';
+} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
 
 /**
  * Describes how the {@link Injector} should instantiate a given token.

modules/@angular/core/src/di/provider_util.dart

@@ -0,0 +1,20 @@
+import './provider.dart' show Provider;
+
+bool isProviderLiteral(dynamic obj) {
+  if (obj is Map) {
+    Map map = obj as Map;
+    return map.containsKey('provide');
+  } else {
+    return false;
+  }
+}
+
+Provider createProvider(dynamic obj) {
+  Map map = obj as Map;
+  return new Provider(map['provide'], useClass: map['useClass'],
+    useValue: map['useValue'],
+    useExisting: map['useExisting'],
+    useFactory: map['useFactory'],
+    deps: map['deps'],
+    multi: map['multi']);
+}

modules/@angular/core/src/di/provider_util.ts

@@ -0,0 +1,9 @@
+import {Provider} from './provider';
+
+export function isProviderLiteral(obj: any): boolean {
+  return obj && typeof obj == 'object' && obj.provide;
+}
+
+export function createProvider(obj: any): Provider {
+  return new Provider(obj.provide, obj);
+}

modules/@angular/core/src/di/reflective_exceptions.ts

@@ -1,6 +1,6 @@
-import {ListWrapper} from 'angular2/src/facade/collection';
-import {stringify, isBlank} from 'angular2/src/facade/lang';
-import {BaseException, WrappedException, unimplemented} from 'angular2/src/facade/exceptions';
+import {ListWrapper} from '../../src/facade/collection';
+import {stringify, isBlank} from '../../src/facade/lang';
+import {BaseException, WrappedException} from '../../src/facade/exceptions';
 import {ReflectiveKey} from './reflective_key';
 import {ReflectiveInjector} from './reflective_injector';
 

modules/@angular/core/src/di/reflective_injector.ts

@@ -1,5 +1,5 @@
-import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
-import {Provider, ProviderBuilder, provide} from './provider';
+import {ListWrapper} from '../../src/facade/collection';
+import {Provider} from './provider';
 import {
   ResolvedReflectiveProvider,
   ReflectiveDependency,
@@ -11,13 +11,12 @@ import {
   NoProviderError,
   CyclicDependencyError,
   InstantiationError,
-  InvalidProviderError,
   OutOfBoundsError
 } from './reflective_exceptions';
-import {Type, isPresent} from 'angular2/src/facade/lang';
-import {BaseException, unimplemented} from 'angular2/src/facade/exceptions';
+import {Type} from '../../src/facade/lang';
+import {BaseException, unimplemented} from '../../src/facade/exceptions';
 import {ReflectiveKey} from './reflective_key';
-import {SelfMetadata, HostMetadata, SkipSelfMetadata} from './metadata';
+import {SelfMetadata, SkipSelfMetadata} from './metadata';
 import {Injector, THROW_IF_NOT_FOUND} from './injector';
 
 var __unused: Type;  // avoid unused import when Type union types are erased

modules/@angular/core/src/di/reflective_key.ts

@@ -1,5 +1,5 @@
-import {stringify, Type, isBlank} from 'angular2/src/facade/lang';
-import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
+import {stringify, isBlank} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
 import {resolveForwardRef} from './forward_ref';
 
 /**

modules/@angular/core/src/di/reflective_provider.ts

@@ -1,10 +1,14 @@
-import {Type, isBlank, isPresent, isArray, isType} from 'angular2/src/facade/lang';
-import {MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
-import {reflector} from 'angular2/src/core/reflection/reflection';
+import {
+  Type,
+  isBlank,
+  isPresent,
+  isArray,
+} from '../../src/facade/lang';
+import {MapWrapper, ListWrapper} from '../../src/facade/collection';
+import {reflector} from '../reflection/reflection';
 import {ReflectiveKey} from './reflective_key';
 import {
   InjectMetadata,
-  InjectableMetadata,
   OptionalMetadata,
   SelfMetadata,
   HostMetadata,

modules/@angular/core/src/facade

@@ -0,0 +1 @@
+../../facade/src

modules/@angular/core/src/linker.ts

@@ -7,4 +7,4 @@ export {TemplateRef} from './linker/template_ref';
 export {EmbeddedViewRef, ViewRef} from './linker/view_ref';
 export {ViewContainerRef} from './linker/view_container_ref';
 export {ComponentRef, ComponentFactory} from './linker/component_factory';
-export {ExpressionChangedAfterItHasBeenCheckedException} from './linker/exceptions';
+export {ExpressionChangedAfterItHasBeenCheckedException} from './linker/exceptions';

modules/@angular/core/src/linker/component_factory.ts

@@ -1,11 +1,11 @@
-import {Injector} from 'angular2/src/core/di';
-import {Type, isPresent, isBlank} from 'angular2/src/facade/lang';
-import {unimplemented} from 'angular2/src/facade/exceptions';
+import {Type, isPresent, isBlank} from '../../src/facade/lang';
+import {unimplemented} from '../../src/facade/exceptions';
 import {ElementRef} from './element_ref';
 import {ViewRef, ViewRef_} from './view_ref';
 import {AppElement} from './element';
 import {ViewUtils} from './view_utils';
 import {ChangeDetectorRef} from '../change_detection/change_detection';
+import {Injector} from '../di/injector';
 
 /**
  * Represents an instance of a Component created via a {@link ComponentFactory}.

modules/@angular/core/src/linker/component_resolver.ts

@@ -1,9 +1,9 @@
-import {Injectable} from 'angular2/src/core/di';
-import {Type, isBlank, stringify} from 'angular2/src/facade/lang';
-import {BaseException} from 'angular2/src/facade/exceptions';
-import {PromiseWrapper} from 'angular2/src/facade/async';
-import {reflector} from 'angular2/src/core/reflection/reflection';
+import {Type, isBlank, stringify} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
+import {PromiseWrapper} from '../../src/facade/async';
+import {reflector} from '../reflection/reflection';
 import {ComponentFactory} from './component_factory';
+import {Injectable} from '../di/decorators';
 
 /**
  * Low-level service for loading {@link ComponentFactory}s, which

modules/@angular/core/src/linker/debug_context.ts

@@ -1,9 +1,9 @@
-import {isPresent, isBlank} from 'angular2/src/facade/lang';
-import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
-import {Injector} from 'angular2/src/core/di';
-import {RenderDebugInfo} from 'angular2/src/core/render/api';
-import {DebugAppView} from './view';
+import {isPresent, isBlank} from '../../src/facade/lang';
+import {ListWrapper, StringMapWrapper} from '../../src/facade/collection';
+import {Injector} from '../di';
 import {ViewType} from './view_type';
+import {RenderDebugInfo} from '../render/api';
+import {DebugAppView} from './view';
 
 /* @ts2dart_const */
 export class StaticNodeDebugInfo {

modules/@angular/core/src/linker/dynamic_component_loader.ts

@@ -1,13 +1,11 @@
-import {
-  Injector,
-  ResolvedReflectiveProvider,
-  Injectable,
-  ReflectiveInjector
-} from 'angular2/src/core/di';
 import {ComponentResolver} from './component_resolver';
-import {isType, Type, stringify, isPresent} from 'angular2/src/facade/lang';
+import {Type, isPresent} from '../../src/facade/lang';
 import {ComponentRef} from './component_factory';
 import {ViewContainerRef} from './view_container_ref';
+import {ResolvedReflectiveProvider} from '../di/reflective_provider';
+import {ReflectiveInjector} from '../di/reflective_injector';
+import {Injectable} from '../di/decorators';
+import {Injector} from '../di/injector';
 
 /**
  * Use ComponentResolver and ViewContainerRef directly.

modules/@angular/core/src/linker/element.ts

@@ -1,16 +1,15 @@
-import {isPresent, isBlank, Type} from 'angular2/src/facade/lang';
-import {ListWrapper} from 'angular2/src/facade/collection';
-import {BaseException} from 'angular2/src/facade/exceptions';
-
-import {Injector} from 'angular2/src/core/di';
+import {isPresent} from '../../src/facade/lang';
+import {ListWrapper} from '../../src/facade/collection';
+import {BaseException} from '../../src/facade/exceptions';
 
 import {AppView} from './view';
 import {ViewType} from './view_type';
 import {ElementRef} from './element_ref';
 
-import {ViewContainerRef, ViewContainerRef_} from './view_container_ref';
+import {ViewContainerRef_} from './view_container_ref';
 
 import {QueryList} from './query_list';
+import {Injector} from '../di/injector';
 
 /**
  * An AppElement is created for elements that have a ViewContainerRef,

modules/@angular/core/src/linker/element_injector.ts

@@ -1,4 +1,4 @@
-import {Injector, THROW_IF_NOT_FOUND} from 'angular2/src/core/di/injector';
+import {Injector, THROW_IF_NOT_FOUND} from '../di/injector';
 import {AppView} from './view';
 
 const _UNDEFINED = /*@ts2dart_const*/ new Object();

modules/@angular/core/src/linker/exceptions.ts

@@ -1,4 +1,4 @@
-import {BaseException, WrappedException} from "angular2/src/facade/exceptions";
+import {BaseException, WrappedException} from '../../src/facade/exceptions';
 
 /**
  * An error thrown if application changes model breaking the top-down data flow.

modules/@angular/core/src/linker/query_list.ts

@@ -1,6 +1,6 @@
-import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
-import {getSymbolIterator} from 'angular2/src/facade/lang';
-import {Observable, EventEmitter} from 'angular2/src/facade/async';
+import {ListWrapper} from '../../src/facade/collection';
+import {getSymbolIterator} from '../../src/facade/lang';
+import {Observable, EventEmitter} from '../../src/facade/async';
 
 
 /**

modules/@angular/core/src/linker/template_ref.ts

@@ -1,4 +1,4 @@
-import {isBlank} from 'angular2/src/facade/lang';
+import {isBlank} from '../facade/lang';
 import {ElementRef} from './element_ref';
 import {AppElement} from './element';
 import {AppView} from './view';

modules/@angular/core/src/linker/view.ts

@@ -1,13 +1,8 @@
 import {
   ListWrapper,
-  MapWrapper,
-  Map,
   StringMapWrapper,
-  isListLikeIterable,
-  areIterablesEqual
-} from 'angular2/src/facade/collection';
+} from '../../src/facade/collection';
 
-import {Injector} from 'angular2/src/core/di';
 import {AppElement} from './element';
 import {
   assertionsEnabled,
@@ -19,15 +14,10 @@ import {
   stringify,
   isPrimitive,
   isString
-} from 'angular2/src/facade/lang';
+} from '../../src/facade/lang';
 
-import {ObservableWrapper} from 'angular2/src/facade/async';
-import {
-  Renderer,
-  RootRenderer,
-  RenderComponentType,
-  RenderDebugInfo
-} from 'angular2/src/core/render/api';
+import {ObservableWrapper} from '../../src/facade/async';
+import {Renderer, RootRenderer, RenderComponentType, RenderDebugInfo} from '../render/api';
 import {ViewRef_} from './view_ref';
 
 import {ViewType} from './view_type';
@@ -42,9 +32,7 @@ import {
   ChangeDetectorRef,
   ChangeDetectionStrategy,
   ChangeDetectorState,
-  isDefaultChangeDetectionStrategy,
-  devModeEqual
-} from 'angular2/src/core/change_detection/change_detection';
+} from '../change_detection/change_detection';
 import {wtfCreateScope, wtfLeave, WtfScopeFn} from '../profile/profile';
 import {
   ExpressionChangedAfterItHasBeenCheckedException,
@@ -53,6 +41,7 @@ import {
 } from './exceptions';
 import {StaticNodeDebugInfo, DebugContext} from './debug_context';
 import {ElementInjector} from './element_injector';
+import {Injector} from '../di/injector';
 
 var _scope_check: WtfScopeFn = wtfCreateScope(`AppView#check(ascii id)`);
 

modules/@angular/core/src/linker/view_container_ref.ts

@@ -1,13 +1,13 @@
-import {ListWrapper} from 'angular2/src/facade/collection';
-import {unimplemented} from 'angular2/src/facade/exceptions';
-import {Injector} from 'angular2/src/core/di/injector';
-import {isPresent, isBlank} from 'angular2/src/facade/lang';
+import {ListWrapper} from '../../src/facade/collection';
+import {unimplemented} from '../../src/facade/exceptions';
+import {Injector} from '../di/injector';
+import {isPresent} from '../../src/facade/lang';
 import {wtfCreateScope, wtfLeave, WtfScopeFn} from '../profile/profile';
 
 import {AppElement} from './element';
 
 import {ElementRef} from './element_ref';
-import {TemplateRef, TemplateRef_} from './template_ref';
+import {TemplateRef} from './template_ref';
 import {EmbeddedViewRef, ViewRef, ViewRef_} from './view_ref';
 import {ComponentFactory, ComponentRef} from './component_factory';
 

modules/@angular/core/src/linker/view_ref.ts

@@ -1,8 +1,7 @@
-import {unimplemented} from 'angular2/src/facade/exceptions';
-import {isPresent} from 'angular2/src/facade/lang';
+import {unimplemented} from '../../src/facade/exceptions';
 import {ChangeDetectorRef} from '../change_detection/change_detector_ref';
 import {AppView} from './view';
-import {ChangeDetectionStrategy} from 'angular2/src/core/change_detection/constants';
+import {ChangeDetectionStrategy} from '../change_detection/constants';
 
 export abstract class ViewRef {
   get destroyed(): boolean { return <boolean>unimplemented(); }

modules/@angular/core/src/linker/view_utils.ts

@@ -1,13 +1,18 @@
-import {isBlank, isPresent, Type, stringify, looseIdentical} from 'angular2/src/facade/lang';
-import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
-import {BaseException} from 'angular2/src/facade/exceptions';
+import {
+  isBlank,
+  isPresent,
+  looseIdentical
+} from '../../src/facade/lang';
+import {ListWrapper, StringMapWrapper} from '../../src/facade/collection';
+import {BaseException} from '../../src/facade/exceptions';
 import {AppElement} from './element';
 import {ExpressionChangedAfterItHasBeenCheckedException} from './exceptions';
-import {devModeEqual, uninitialized} from 'angular2/src/core/change_detection/change_detection';
-import {Inject, Injectable} from 'angular2/src/core/di';
-import {RootRenderer, RenderComponentType, Renderer} from 'angular2/src/core/render/api';
-import {APP_ID} from 'angular2/src/core/application_tokens';
-import {ViewEncapsulation} from 'angular2/src/core/metadata/view';
+import {devModeEqual} from '../change_detection/change_detection';
+import {RootRenderer, RenderComponentType, Renderer} from '../render/api';
+import {APP_ID} from '../application_tokens';
+import {ViewEncapsulation} from '../metadata/view';
+import {Injectable, Inject} from '../di/decorators';
+import {uninitialized} from "../change_detection/change_detection_util";
 
 @Injectable()
 export class ViewUtils {

modules/@angular/core/src/metadata.ts

@@ -57,16 +57,15 @@ import {
 } from './metadata/directives';
 
 import {ViewMetadata, ViewEncapsulation} from './metadata/view';
-import {ChangeDetectionStrategy} from 'angular2/src/core/change_detection/change_detection';
+import {ChangeDetectionStrategy} from './change_detection/change_detection';
 
 import {
   makeDecorator,
   makeParamDecorator,
   makePropDecorator,
   TypeDecorator,
-  Class
 } from './util/decorators';
-import {Type} from 'angular2/src/facade/lang';
+import {Type} from '../src/facade/lang';
 
 /**
  * Interface for the {@link DirectiveMetadata} decorator function.
@@ -262,7 +261,7 @@ export interface ComponentMetadataFactory {
  * ### Example as TypeScript Decorator
  *
  * ```
- * import {Component, View} from "angular2/core";
+ * import {Component, View} from '@angular/core';
  *
  * @Component({...})
  * class MyComponent {
@@ -364,7 +363,7 @@ export interface AttributeMetadataFactory {
  * ### Example as TypeScript Decorator
  *
  * ```
- * import {Query, QueryList, Component} from "angular2/core";
+ * import {Query, QueryList, Component} from '@angular/core';
  *
  * @Component({...})
  * class MyComponent {

modules/@angular/core/src/metadata/di.ts

@@ -1,6 +1,6 @@
-import {Type, stringify, isPresent, isString} from 'angular2/src/facade/lang';
-import {resolveForwardRef} from 'angular2/src/core/di';
-import {DependencyMetadata} from 'angular2/src/core/di/metadata';
+import {stringify, isString, Type} from '../../src/facade/lang';
+import {DependencyMetadata} from '../di/metadata';
+import {resolveForwardRef} from '../di/forward_ref';
 
 /**
  * Specifies that a constant attribute value should be injected.

modules/@angular/core/src/metadata/directives.ts

@@ -1,7 +1,7 @@
-import {isPresent, Type} from 'angular2/src/facade/lang';
-import {InjectableMetadata} from 'angular2/src/core/di/metadata';
-import {ChangeDetectionStrategy} from 'angular2/src/core/change_detection';
-import {ViewEncapsulation} from 'angular2/src/core/metadata/view';
+import {isPresent, Type} from '../../src/facade/lang';
+import {InjectableMetadata} from '../di/metadata';
+import {ViewEncapsulation} from './view';
+import {ChangeDetectionStrategy} from '../change_detection/constants';
 
 /**
  * Directives allow you to attach behavior to elements in the DOM.

modules/@angular/core/src/metadata/lifecycle_hooks.ts

@@ -1,4 +1,4 @@
-import {SimpleChange} from 'angular2/src/core/change_detection/change_detection_util';
+import {SimpleChange} from '../change_detection/change_detection_util';
 
 export enum LifecycleHooks {
   OnInit,
@@ -242,7 +242,7 @@ export interface DoCheck { ngDoCheck(); }
  * the interval when the binding is destroyed or the countdown completes.
  *
  * ```
- * import {OnDestroy, Pipe, PipeTransform} from 'angular2/core'
+ * import {OnDestroy, Pipe, PipeTransform} from '@angular/core'
  * @Pipe({name: 'countdown', pure: false})
  * class CountDown implements PipeTransform, OnDestroy {
  *   remainingTime:Number;

modules/@angular/core/src/metadata/view.ts

@@ -1,4 +1,4 @@
-import {Type} from 'angular2/src/facade/lang';
+import {Type} from '../../src/facade/lang';
 
 /**
  * Defines template and style encapsulation options available for Component's {@link View}.

modules/@angular/core/src/platform_common_providers.ts

@@ -1,9 +1,9 @@
-import {Type} from 'angular2/src/facade/lang';
-import {Provider} from 'angular2/src/core/di';
-import {Console} from 'angular2/src/core/console';
+import {Type, isBlank, isPresent, assertionsEnabled} from '../src/facade/lang';
+import {provide, Provider, Injector, OpaqueToken} from './di';
+import {Console} from './console';
 import {Reflector, reflector} from './reflection/reflection';
 import {ReflectorReader} from './reflection/reflector_reader';
-import {TestabilityRegistry} from 'angular2/src/core/testability/testability';
+import {TestabilityRegistry} from './testability/testability';
 import {PLATFORM_CORE_PROVIDERS} from './application_ref';
 
 function _reflector(): Reflector {

modules/@angular/core/src/platform_directives_and_pipes.ts

@@ -1,4 +1,4 @@
-import {OpaqueToken} from "angular2/src/core/di";
+import {OpaqueToken} from './di';
 
 /**
  * A token that can be provided when bootstraping an application to make an array of directives
@@ -7,7 +7,7 @@ import {OpaqueToken} from "angular2/src/core/di";
  * ### Example
  *
  * ```typescript
- * import {PLATFORM_DIRECTIVES} from 'angular2/core';
+ * import {PLATFORM_DIRECTIVES} from '@angular/core';
  * import {OtherDirective} from './myDirectives';
  *
  * @Component({
@@ -34,7 +34,7 @@ export const PLATFORM_DIRECTIVES: OpaqueToken =
  * ### Example
  *
  * ```typescript
- * import {PLATFORM_PIPES} from 'angular2/core';
+ * import {PLATFORM_PIPES} from '@angular/core';
  * import {OtherPipe} from './myPipe';
  *
  * @Component({

modules/@angular/core/src/prod_mode.ts

@@ -1 +1 @@
-export {enableProdMode} from 'angular2/src/facade/lang';
+export {enableProdMode} from '../src/facade/lang';

modules/@angular/core/src/profile/profile.ts

@@ -1,6 +1,6 @@
 export {WtfScopeFn} from './wtf_impl';
 
-import * as impl from "./wtf_impl";
+import * as impl from './wtf_impl';
 
 // Change exports to const once https://github.com/angular/ts2dart/issues/150
 

modules/@angular/core/src/profile/wtf_impl.ts

@@ -1,4 +1,4 @@
-import {global} from 'angular2/src/facade/lang';
+import {global} from '../../src/facade/lang';
 
 /**
  * A scope function for the Web Tracing Framework (WTF).

modules/@angular/core/src/reflection/platform_reflection_capabilities.ts

@@ -1,4 +1,4 @@
-import {Type} from 'angular2/src/facade/lang';
+import {Type} from '../../src/facade/lang';
 import {GetterFn, SetterFn, MethodFn} from './types';
 
 export interface PlatformReflectionCapabilities {

modules/@angular/core/src/reflection/reflection.ts

@@ -1,5 +1,3 @@
-import {Type, isPresent} from 'angular2/src/facade/lang';
-import {ListWrapper} from 'angular2/src/facade/collection';
 import {Reflector} from './reflector';
 export {Reflector, ReflectionInfo} from './reflector';
 import {ReflectionCapabilities} from './reflection_capabilities';

modules/@angular/core/src/reflection/reflection_capabilities.ts

@@ -5,8 +5,8 @@ import {
   global,
   stringify,
   ConcreteType
-} from 'angular2/src/facade/lang';
-import {BaseException} from 'angular2/src/facade/exceptions';
+} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
 import {GetterFn, SetterFn, MethodFn} from './types';
 import {PlatformReflectionCapabilities} from './platform_reflection_capabilities';
 

modules/@angular/core/src/reflection/reflector.ts

@@ -1,5 +1,5 @@
-import {Type, isPresent, stringify} from 'angular2/src/facade/lang';
-import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
+import {Type, isPresent, stringify} from '../../src/facade/lang';
+import {BaseException, WrappedException} from '../../src/facade/exceptions';
 import {
   ListWrapper,
   Map,
@@ -7,7 +7,7 @@ import {
   Set,
   SetWrapper,
   StringMapWrapper
-} from 'angular2/src/facade/collection';
+} from '../../src/facade/collection';
 import {SetterFn, GetterFn, MethodFn} from './types';
 import {ReflectorReader} from './reflector_reader';
 import {PlatformReflectionCapabilities} from './platform_reflection_capabilities';

modules/@angular/core/src/reflection/types.ts

@@ -1,5 +1,3 @@
-import {Type} from 'angular2/src/facade/lang';
-
 export type SetterFn = (obj: any, value: any) => void;
 export type GetterFn = (obj: any) => any;
 export type MethodFn = (obj: any, args: any[]) => any;

modules/@angular/core/src/render/api.ts

@@ -1,6 +1,6 @@
-import {unimplemented} from 'angular2/src/facade/exceptions';
-import {ViewEncapsulation} from 'angular2/src/core/metadata/view';
-import {Injector, Injectable} from 'angular2/src/core/di';
+import {unimplemented} from '../../src/facade/exceptions';
+import {ViewEncapsulation} from '../metadata/view';
+import {Injector} from '../di/injector';
 
 export class RenderComponentType {
   constructor(public id: string, public templateUrl: string, public slotCount: number,

modules/@angular/core/src/testability/testability.ts

@@ -1,9 +1,9 @@
-import {Injectable} from 'angular2/src/core/di';
-import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
-import {scheduleMicroTask} from 'angular2/src/facade/lang';
-import {BaseException} from 'angular2/src/facade/exceptions';
+import {Map, MapWrapper} from '../../src/facade/collection';
+import {scheduleMicroTask} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
 import {NgZone} from '../zone/ng_zone';
-import {ObservableWrapper} from 'angular2/src/facade/async';
+import {ObservableWrapper} from '../../src/facade/async';
+import {Injectable} from '../di/decorators';
 
 
 /**

modules/@angular/core/src/util.ts

@@ -1,2 +1,2 @@
 // Public API for util
-export {Class, ClassDefinition, TypeDecorator} from './util/decorators';
+export {Class, ClassDefinition, TypeDecorator} from './util/decorators';

modules/@angular/core/src/util/decorators.ts

@@ -1,4 +1,4 @@
-import {ConcreteType, global, Type, isFunction, stringify} from 'angular2/src/facade/lang';
+import {ConcreteType, global, Type, isFunction, stringify} from '../../src/facade/lang';
 
 var _nextClassId = 0;
 
@@ -222,7 +222,7 @@ export function Class(clsDef: ClassDefinition): ConcreteType {
   }
   for (var key in clsDef) {
     if (key != 'extends' && key != 'prototype' && clsDef.hasOwnProperty(key)) {
-      proto[key] = applyParams(clsDef[key], key);
+      proto[key] = applyParams(<any>clsDef[key], key);
     }
   }
 

modules/@angular/core/src/zone/ng_zone.ts

@@ -1,6 +1,6 @@
-import {EventEmitter} from 'angular2/src/facade/async';
+import {EventEmitter} from '../../src/facade/async';
 import {NgZoneImpl, NgZoneError} from './ng_zone_impl';
-import {BaseException} from '../../facade/exceptions';
+import {BaseException} from '../../src/facade/exceptions';
 export {NgZoneError} from './ng_zone_impl';
 
 
@@ -19,8 +19,8 @@ export {NgZoneError} from './ng_zone_impl';
  *
  * ### Example ([live demo](http://plnkr.co/edit/lY9m8HLy7z06vDoUaSN2?p=preview))
  * ```
- * import {Component, View, NgZone} from 'angular2/core';
- * import {NgIf} from 'angular2/common';
+ * import {Component, View, NgZone} from '@angular/core';
+ * import {NgIf} from '@angular/common';
  *
  * @Component({
  *   selector: 'ng-zone-demo'.

modules/@angular/core/src/zone/ng_zone_impl.ts

@@ -1,5 +1,3 @@
-import {global} from 'angular2/src/facade/lang';
-
 /**
  * Stores error information; delivered via [NgZone.onError] stream.
  */
@@ -90,7 +88,7 @@ export class NgZoneImpl {
                            }
       });
     } else {
-      throw new Error('Angular2 needs to be run with Zone.js polyfill.');
+      throw new Error('Angular requires Zone.js polyfill.');
     }
   }