repackaging: all the repackaging changes squashed

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 {