repackaging: all the repackaging changes squashed

modules/@angular/compiler/src/output/abstract_emitter.ts

@@ -2,12 +2,9 @@ import {
   isPresent,
   isBlank,
   isString,
-  evalExpression,
-  RegExpWrapper,
   StringWrapper
-} from 'angular2/src/facade/lang';
-import {ListWrapper} from 'angular2/src/facade/collection';
-import {BaseException, unimplemented} from 'angular2/src/facade/exceptions';
+} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
 import * as o from './output_ast';
 
 var _SINGLE_QUOTE_ESCAPE_STRING_RE = /'|\\|\n|\r|\$/g;

modules/@angular/compiler/src/output/abstract_js_emitter.ts

@@ -1,5 +1,5 @@
-import {isPresent} from 'angular2/src/facade/lang';
-import {BaseException} from 'angular2/src/facade/exceptions';
+import {isPresent} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
 import * as o from './output_ast';
 import {
   EmitterVisitorContext,

modules/@angular/compiler/src/output/dart_emitter.ts

@@ -1,14 +1,9 @@
 import {
-  StringWrapper,
-  RegExpWrapper,
   isPresent,
   isBlank,
-  Math,
-  isString,
   isArray
-} from 'angular2/src/facade/lang';
-import {ListWrapper} from 'angular2/src/facade/collection';
-import {BaseException} from 'angular2/src/facade/exceptions';
+} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
 import {CompileIdentifierMetadata} from '../compile_metadata';
 import * as o from './output_ast';
 import {
@@ -17,7 +12,6 @@ import {
   AbstractEmitterVisitor,
   CATCH_ERROR_VAR,
   CATCH_STACK_VAR,
-  escapeSingleQuoteString
 } from './abstract_emitter';
 import {getImportModulePath, ImportEnv} from './path_util';
 
@@ -381,4 +375,4 @@ function getSuperConstructorCallExpr(stmt: o.Statement): o.Expression {
 
 function isConstType(type: o.Type): boolean {
   return isPresent(type) && type.hasModifier(o.TypeModifier.Const);
-}
+}

modules/@angular/compiler/src/output/interpretive_view.ts

@@ -1,7 +1,7 @@
-import {isPresent} from 'angular2/src/facade/lang';
-import {AppView, DebugAppView} from 'angular2/src/core/linker/view';
-import {AppElement} from 'angular2/src/core/linker/element';
-import {BaseException} from 'angular2/src/facade/exceptions';
+import {AppElement, AppView, DebugAppView} from '../../core_private';
+
+import {isPresent} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
 import {InstanceFactory, DynamicInstance} from './output_interpreter';
 
 export class InterpretiveAppViewInstanceFactory implements InstanceFactory {

modules/@angular/compiler/src/output/js_emitter.ts

@@ -6,8 +6,8 @@ import {
   evalExpression,
   RegExpWrapper,
   StringWrapper
-} from 'angular2/src/facade/lang';
-import {BaseException} from 'angular2/src/facade/exceptions';
+} from '../facade/lang';
+import {BaseException} from '@angular/core';
 import {OutputEmitter, EmitterVisitorContext} from './abstract_emitter';
 import {AbstractJsEmitterVisitor} from './abstract_js_emitter';
 import {getImportModulePath, ImportEnv} from './path_util';

modules/@angular/compiler/src/output/output_ast.ts

@@ -1,4 +1,4 @@
-import {isString, isPresent, isBlank} from 'angular2/src/facade/lang';
+import {isString, isPresent, isBlank} from '../../src/facade/lang';
 import {CompileIdentifierMetadata} from '../compile_metadata';
 
 //// Types
@@ -401,7 +401,6 @@ export class LiteralArrayExpr extends Expression {
 
 export class LiteralMapExpr extends Expression {
   public valueType: Type = null;
-  ;
   constructor(public entries: Array<Array<string | Expression>>, type: MapType = null) {
     super(type);
     if (isPresent(type)) {

modules/@angular/compiler/src/output/output_interpreter.ts

@@ -1,16 +1,14 @@
+import {reflector} from '@angular/core';
 import {
   isPresent,
-  isBlank,
-  isString,
-  evalExpression,
   IS_DART,
   FunctionWrapper
-} from 'angular2/src/facade/lang';
-import {ObservableWrapper} from 'angular2/src/facade/async';
+} from '../../src/facade/lang';
+import {ObservableWrapper} from '../../src/facade/async';
+import {BaseException, unimplemented} from '../../src/facade/exceptions';
+import {ListWrapper} from '../../src/facade/collection';
+
 import * as o from './output_ast';
-import {reflector} from 'angular2/src/core/reflection/reflection';
-import {BaseException, unimplemented} from 'angular2/src/facade/exceptions';
-import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
 import {debugOutputAstAsDart} from './dart_emitter';
 import {debugOutputAstAsTypeScript} from './ts_emitter';
 
@@ -419,4 +417,4 @@ function _declareFn(varNames: string[], statements: o.Statement[], ctx: _Executi
 }
 
 var CATCH_ERROR_VAR = 'error';
-var CATCH_STACK_VAR = 'stack';
+var CATCH_STACK_VAR = 'stack';

modules/@angular/compiler/src/output/output_jit.ts

@@ -1,11 +1,7 @@
 import {
   isPresent,
-  isBlank,
-  isString,
   evalExpression,
-  RegExpWrapper,
-  StringWrapper
-} from 'angular2/src/facade/lang';
+} from '../../src/facade/lang';
 import * as o from './output_ast';
 import {EmitterVisitorContext} from './abstract_emitter';
 import {AbstractJsEmitterVisitor} from './abstract_js_emitter';

modules/@angular/compiler/src/output/path_util.ts

@@ -1,5 +1,5 @@
-import {BaseException} from 'angular2/src/facade/exceptions';
-import {isPresent, isBlank, RegExpWrapper, Math} from 'angular2/src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
+import {isPresent, isBlank, RegExpWrapper, Math} from '../../src/facade/lang';
 
 // asset:<package-name>/<realm>/<path-to-module>
 var _ASSET_URL_RE = /asset:([^\/]+)\/([^\/]+)\/(.+)/g;

modules/@angular/compiler/src/output/ts_emitter.ts

@@ -2,14 +2,10 @@ import * as o from './output_ast';
 import {
   isPresent,
   isBlank,
-  isString,
-  evalExpression,
-  RegExpWrapper,
-  StringWrapper,
   isArray
-} from 'angular2/src/facade/lang';
+} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
 import {CompileIdentifierMetadata} from '../compile_metadata';
-import {BaseException} from 'angular2/src/facade/exceptions';
 import {
   OutputEmitter,
   EmitterVisitorContext,