From c99a575b1ff0e6763737d069fea9189b70b19301 Mon Sep 17 00:00:00 2001
From: Yegor Jbanov <yjbanov@google.com>
Date: Thu, 5 Feb 2015 14:09:26 -0800
Subject: [PATCH] chore(merge): forms, compiler

---
 modules/{forms => angular2}/forms.js             |  0
 .../src/core/compiler/pipeline/view_splitter.js  |  4 ++--
 .../src => angular2/src/forms}/decorators.js     |  8 ++++----
 .../{forms/src => angular2/src/forms}/model.js   |  2 +-
 .../test/forms}/integration_spec.js              | 16 ++++++++--------
 .../test => angular2/test/forms}/model_spec.js   |  0
 modules/forms/pubspec.yaml                       | 14 --------------
 7 files changed, 15 insertions(+), 29 deletions(-)
 rename modules/{forms => angular2}/forms.js (100%)
 rename modules/{forms/src => angular2/src/forms}/decorators.js (87%)
 rename modules/{forms/src => angular2/src/forms}/model.js (84%)
 rename modules/{forms/test => angular2/test/forms}/integration_spec.js (88%)
 rename modules/{forms/test => angular2/test/forms}/model_spec.js (100%)
 delete mode 100644 modules/forms/pubspec.yaml

diff --git a/modules/forms/forms.js b/modules/angular2/forms.js
similarity index 100%
rename from modules/forms/forms.js
rename to modules/angular2/forms.js
diff --git a/modules/angular2/src/core/compiler/pipeline/view_splitter.js b/modules/angular2/src/core/compiler/pipeline/view_splitter.js
index 59af5daf11..3fa3f1487f 100644
--- a/modules/angular2/src/core/compiler/pipeline/view_splitter.js
+++ b/modules/angular2/src/core/compiler/pipeline/view_splitter.js
@@ -7,9 +7,9 @@ import {Parser} from 'angular2/change_detection';
 import {CompileStep} from './compile_step';
 import {CompileElement} from './compile_element';
 import {CompileControl} from './compile_control';
-import {StringWrapper} from 'facade/src/lang';
+import {StringWrapper} from 'angular2/src/facade/lang';
 
-import {$BANG} from 'change_detection/src/parser/lexer';
+import {$BANG} from 'angular2/src/change_detection/parser/lexer';
 
 /**
  * Splits views at `<template>` elements or elements with `template` attribute:
diff --git a/modules/forms/src/decorators.js b/modules/angular2/src/forms/decorators.js
similarity index 87%
rename from modules/forms/src/decorators.js
rename to modules/angular2/src/forms/decorators.js
index 7f36e31c32..5dba25955e 100644
--- a/modules/forms/src/decorators.js
+++ b/modules/angular2/src/forms/decorators.js
@@ -1,7 +1,7 @@
-import {Decorator, NgElement, Ancestor} from 'core/core';
-import {DOM} from 'facade/src/dom';
-import {isPresent} from 'facade/src/lang';
-import {ListWrapper} from 'facade/src/collection';
+import {Decorator, NgElement, Ancestor} from 'angular2/core';
+import {DOM} from 'angular2/src/facade/dom';
+import {isPresent} from 'angular2/src/facade/lang';
+import {ListWrapper} from 'angular2/src/facade/collection';
 import {ControlGroup, Control} from './model';
 
 @Decorator({
diff --git a/modules/forms/src/model.js b/modules/angular2/src/forms/model.js
similarity index 84%
rename from modules/forms/src/model.js
rename to modules/angular2/src/forms/model.js
index 2f3acfcfec..22bc95369e 100644
--- a/modules/forms/src/model.js
+++ b/modules/angular2/src/forms/model.js
@@ -1,4 +1,4 @@
-import {StringMapWrapper} from 'facade/src/collection';
+import {StringMapWrapper} from 'angular2/src/facade/collection';
 
 export class Control {
   value:any;
diff --git a/modules/forms/test/integration_spec.js b/modules/angular2/test/forms/integration_spec.js
similarity index 88%
rename from modules/forms/test/integration_spec.js
rename to modules/angular2/test/forms/integration_spec.js
index 6f0a2c35c4..7bfb9a0a5b 100644
--- a/modules/forms/test/integration_spec.js
+++ b/modules/angular2/test/forms/integration_spec.js
@@ -1,14 +1,14 @@
 import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach,
-  el, queryView, dispatchEvent} from 'test_lib/test_lib';
+  el, queryView, dispatchEvent} from 'angular2/test_lib';
 
-import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'change_detection/change_detection';
-import {Compiler, CompilerCache} from 'core/src/compiler/compiler';
-import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader';
-import {Injector} from 'di/di';
-import {DOM} from 'facade/src/dom';
+import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection';
+import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
+import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader';
+import {Injector} from 'angular2/di';
+import {DOM} from 'angular2/src/facade/dom';
 
-import {Component, TemplateConfig} from 'core/core';
-import {ControlDecorator, ControlGroupDecorator, Control, ControlGroup} from 'forms/forms';
+import {Component, TemplateConfig} from 'angular2/core';
+import {ControlDecorator, ControlGroupDecorator, Control, ControlGroup} from 'angular2/forms';
 
 export function main() {
   function detectChanges(view) {
diff --git a/modules/forms/test/model_spec.js b/modules/angular2/test/forms/model_spec.js
similarity index 100%
rename from modules/forms/test/model_spec.js
rename to modules/angular2/test/forms/model_spec.js
diff --git a/modules/forms/pubspec.yaml b/modules/forms/pubspec.yaml
deleted file mode 100644
index 3f3070733f..0000000000
--- a/modules/forms/pubspec.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: forms
-environment:
-  sdk: '>=1.4.0'
-dependencies:
-  core:
-    path: ../core
-  di:
-    path: ../di
-  facade:
-    path: ../facade
-dev_dependencies:
-  test_lib:
-    path: ../test_lib
-  guinness: ">=0.1.16 <0.2.0"