Switch pkg packages, pub, and dartdoc to use package: imports.

This also changes the SDK layout by replacing the "pkg" directory, which
contained the full source of all the packages needed by pub and dartdoc, with a
"packages" directory that contains only their lib directories. This directory is
used as the package root for pub and dartdoc when run from the SDK.

BUG=6745

Review URL: https://codereview.chromium.org//12782016

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@20640 260f80e4-7a28-3924-810f-c04153c831b5

pkg/fixnum/test/int_64_vm_test.dart

@@ -5,11 +5,12 @@
 // A test to compare the results of the fixnum library with the Dart VM
 
 library int64vmtest;
+
 import 'dart:math' as math;
 
-part '../lib/src/int32.dart';
-part '../lib/src/int64.dart';
-part '../lib/src/intx.dart';
+part 'package:fixnum/src/int32.dart';
+part 'package:fixnum/src/int64.dart';
+part 'package:fixnum/src/intx.dart';
 
 final random = new math.Random();
 

pkg/http/lib/src/multipart_file.dart

@@ -7,7 +7,7 @@ library multipart_file;
 import 'dart:async';
 import 'dart:io';
 
-import '../../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import 'byte_stream.dart';
 import 'utils.dart';

pkg/http/test/client_test.dart

@@ -7,9 +7,10 @@ library client_test;
 import 'dart:io';
 import 'dart:uri';
 
+import 'package:http/http.dart' as http;
+import 'package:http/src/utils.dart';
 import 'package:unittest/unittest.dart';
-import '../lib/src/utils.dart';
-import '../lib/http.dart' as http;
+
 import 'utils.dart';
 
 void main() {

pkg/http/test/http_test.dart

@@ -6,8 +6,9 @@ library http_test;
 
 import 'dart:io';
 
+import 'package:http/http.dart' as http;
 import 'package:unittest/unittest.dart';
-import '../lib/http.dart' as http;
+
 import 'utils.dart';
 
 main() {

pkg/http/test/mock_client_test.dart

@@ -9,10 +9,11 @@ import 'dart:io';
 import 'dart:json' as json;
 import 'dart:uri';
 
+import 'package:http/http.dart' as http;
+import 'package:http/src/utils.dart';
+import 'package:http/testing.dart';
 import 'package:unittest/unittest.dart';
-import '../lib/http.dart' as http;
-import '../lib/testing.dart';
-import '../lib/src/utils.dart';
+
 import 'utils.dart';
 
 void main() {

pkg/http/test/multipart_test.dart

@@ -8,10 +8,10 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:utf';
 
+import 'package:http/http.dart' as http;
+import 'package:http/src/utils.dart';
+import 'package:pathos/path.dart' as path;
 import 'package:unittest/unittest.dart';
-import '../../pathos/lib/path.dart' as path;
-import '../lib/http.dart' as http;
-import '../lib/src/utils.dart';
 
 import 'utils.dart';
 

pkg/http/test/request_test.dart

@@ -6,9 +6,10 @@ library request_test;
 
 import 'dart:io';
 
+import 'package:http/http.dart' as http;
+import 'package:http/src/utils.dart';
 import 'package:unittest/unittest.dart';
-import '../lib/http.dart' as http;
-import '../lib/src/utils.dart';
+
 import 'utils.dart';
 
 void main() {

pkg/http/test/response_test.dart

@@ -7,8 +7,8 @@ library response_test;
 import 'dart:async';
 import 'dart:io';
 
+import 'package:http/http.dart' as http;
 import 'package:unittest/unittest.dart';
-import '../lib/http.dart' as http;
 
 void main() {
   group('()', () {

pkg/http/test/streamed_request_test.dart

@@ -6,8 +6,9 @@ library streamed_request_test;
 
 import 'dart:io';
 
+import 'package:http/http.dart' as http;
 import 'package:unittest/unittest.dart';
-import '../lib/http.dart' as http;
+
 import 'utils.dart';
 
 void main() {

pkg/http/test/utils.dart

@@ -9,10 +9,11 @@ import 'dart:io';
 import 'dart:json' as json;
 import 'dart:uri';
 
+import 'package:http/http.dart' as http;
+import 'package:http/src/byte_stream.dart';
+import 'package:http/src/utils.dart';
 import 'package:unittest/unittest.dart';
-import '../lib/src/byte_stream.dart';
-import '../lib/http.dart' as http;
-import '../lib/src/utils.dart';
+
 import 'safe_http_server.dart';
 
 /// The current server instance.

pkg/logging/test/logging_test.dart

@@ -5,7 +5,7 @@
 
 library logging_test;
 
-import '../../../pkg/logging/lib/logging.dart';
+import 'package:logging/logging.dart';
 import 'package:unittest/unittest.dart';
 
 main() {

pkg/oauth2/lib/src/authorization_code_grant.dart

@@ -7,8 +7,7 @@ library authorization_code_grant;
 import 'dart:async';
 import 'dart:uri';
 
-// TODO(nweiz): This should be a "package:" import. See issue 6745.
-import '../../../../pkg/http/lib/http.dart' as http;
+import 'package:http/http.dart' as http;
 
 import 'client.dart';
 import 'authorization_exception.dart';

pkg/oauth2/lib/src/client.dart

@@ -7,7 +7,7 @@ library client;
 import 'dart:async';
 import 'dart:uri';
 
-import '../../../../pkg/http/lib/http.dart' as http;
+import 'package:http/http.dart' as http;
 
 import 'authorization_exception.dart';
 import 'credentials.dart';

pkg/oauth2/lib/src/credentials.dart

@@ -8,7 +8,8 @@ import 'dart:async';
 import 'dart:json' as JSON;
 import 'dart:uri';
 
-import '../../../../pkg/http/lib/http.dart' as http;
+import 'package:http/http.dart' as http;
+
 import 'handle_access_token_response.dart';
 import 'utils.dart';
 

pkg/oauth2/lib/src/handle_access_token_response.dart

@@ -8,7 +8,7 @@ import 'dart:io';
 import 'dart:json' as JSON;
 import 'dart:uri';
 
-import '../../../../pkg/http/lib/http.dart' as http;
+import 'package:http/http.dart' as http;
 
 import 'credentials.dart';
 import 'authorization_exception.dart';

pkg/oauth2/test/authorization_code_grant_test.dart

@@ -9,10 +9,11 @@ import 'dart:io';
 import 'dart:json' as JSON;
 import 'dart:uri';
 
-import '../../../pkg/unittest/lib/unittest.dart';
-import '../../../pkg/http/lib/http.dart' as http;
-import '../../../pkg/http/lib/testing.dart';
-import '../lib/oauth2.dart' as oauth2;
+import 'package:unittest/unittest.dart';
+import 'package:http/http.dart' as http;
+import 'package:http/testing.dart';
+import 'package:oauth2/oauth2.dart' as oauth2;
+
 import 'utils.dart';
 
 final redirectUrl = Uri.parse('http://example.com/redirect');

pkg/oauth2/test/client_test.dart

@@ -9,9 +9,10 @@ import 'dart:io';
 import 'dart:json' as JSON;
 import 'dart:uri';
 
-import '../../../pkg/unittest/lib/unittest.dart';
-import '../../../pkg/http/lib/http.dart' as http;
-import '../lib/oauth2.dart' as oauth2;
+import 'package:http/http.dart' as http;
+import 'package:oauth2/oauth2.dart' as oauth2;
+import 'package:unittest/unittest.dart';
+
 import 'utils.dart';
 
 final Uri requestUri = Uri.parse("http://example.com/resource");

pkg/oauth2/test/credentials_test.dart

@@ -9,9 +9,10 @@ import 'dart:io';
 import 'dart:json' as JSON;
 import 'dart:uri';
 
-import '../../../pkg/unittest/lib/unittest.dart';
-import '../../../pkg/http/lib/http.dart' as http;
-import '../lib/oauth2.dart' as oauth2;
+import 'package:http/http.dart' as http;
+import 'package:oauth2/oauth2.dart' as oauth2;
+import 'package:unittest/unittest.dart';
+
 import 'utils.dart';
 
 final Uri tokenEndpoint = Uri.parse('http://example.com/token');

pkg/oauth2/test/handle_access_token_response_test.dart

@@ -8,10 +8,11 @@ import 'dart:io';
 import 'dart:json' as JSON;
 import 'dart:uri';
 
-import '../../../pkg/unittest/lib/unittest.dart';
-import '../../../pkg/http/lib/http.dart' as http;
-import '../lib/oauth2.dart' as oauth2;
-import '../lib/src/handle_access_token_response.dart';
+import 'package:http/http.dart' as http;
+import 'package:oauth2/oauth2.dart' as oauth2;
+import 'package:oauth2/src/handle_access_token_response.dart';
+import 'package:unittest/unittest.dart';
+
 import 'utils.dart';
 
 final Uri tokenEndpoint = Uri.parse("https://example.com/token");

pkg/oauth2/test/utils.dart

@@ -7,10 +7,10 @@ library utils;
 import 'dart:async';
 import 'dart:collection' show Queue;
 
-import '../../../pkg/unittest/lib/unittest.dart';
-import '../../../pkg/http/lib/http.dart' as http;
-import '../../../pkg/http/lib/testing.dart';
-import '../lib/oauth2.dart' as oauth2;
+import 'package:http/http.dart' as http;
+import 'package:http/testing.dart';
+import 'package:oauth2/oauth2.dart' as oauth2;
+import 'package:unittest/unittest.dart';
 
 class ExpectClient extends MockClient {
   final Queue<MockClientHandler> _handlers;

pkg/oauth2/test/utils_test.dart

@@ -4,9 +4,8 @@
 
 library utils_test;
 
-import '../../../pkg/unittest/lib/unittest.dart';
-import '../lib/src/utils.dart';
-
+import 'package:oauth2/src/utils.dart';
+import 'package:unittest/unittest.dart';
 
 void main() {
   group('AuthenticateHeader', () {

pkg/scheduled_test/lib/descriptor.dart

@@ -64,7 +64,7 @@ library descriptor;
 
 import 'dart:async';
 
-import '../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import 'scheduled_test.dart';
 import 'src/descriptor/async_descriptor.dart';

pkg/scheduled_test/lib/scheduled_test.dart

@@ -175,14 +175,14 @@ library scheduled_test;
 
 import 'dart:async';
 
-import '../../../pkg/unittest/lib/unittest.dart' as unittest;
+import 'package:unittest/unittest.dart' as unittest;
 
 import 'src/schedule.dart';
 import 'src/schedule_error.dart';
 import 'src/utils.dart';
 
-export '../../../pkg/unittest/lib/matcher.dart' hide completes, completion;
-export '../../../pkg/unittest/lib/unittest.dart' show
+export 'package:unittest/matcher.dart' hide completes, completion;
+export 'package:unittest/unittest.dart' show
     config, configure, Configuration, logMessage, expectThrow;
 
 export 'src/schedule.dart';

pkg/scheduled_test/lib/src/descriptor/directory_descriptor.dart

@@ -7,7 +7,7 @@ library descriptor.file;
 import 'dart:async';
 import 'dart:io';
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../../descriptor.dart';
 import '../../scheduled_test.dart';

pkg/scheduled_test/lib/src/descriptor/file_descriptor.dart

@@ -9,7 +9,7 @@ import 'dart:io';
 import 'dart:math' as math;
 import 'dart:utf';
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../../descriptor.dart';
 import '../../scheduled_test.dart';

pkg/scheduled_test/lib/src/descriptor/nothing_descriptor.dart

@@ -7,7 +7,7 @@ library descriptor.async;
 import 'dart:async';
 import 'dart:io';
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../../descriptor.dart';
 import '../../scheduled_test.dart';

pkg/scheduled_test/lib/src/descriptor/pattern_descriptor.dart

@@ -7,7 +7,7 @@ library descriptor.pattern;
 import 'dart:async';
 import 'dart:io';
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../../descriptor.dart';
 import '../../scheduled_test.dart';

pkg/scheduled_test/lib/src/schedule.dart

@@ -7,7 +7,7 @@ library schedule;
 import 'dart:async';
 import 'dart:collection';
 
-import '../../../../pkg/unittest/lib/unittest.dart' as unittest;
+import 'package:unittest/unittest.dart' as unittest;
 
 import 'mock_clock.dart' as mock_clock;
 import 'schedule_error.dart';

pkg/scheduled_test/test/descriptor_test.dart

@@ -7,9 +7,9 @@ library descriptor_test;
 import 'dart:async';
 import 'dart:io';
 
-import '../../../pkg/pathos/lib/path.dart' as path;
-import '../lib/descriptor.dart' as d;
-import '../lib/scheduled_test.dart';
+import 'package:pathos/path.dart' as path;
+import 'package:scheduled_test/descriptor.dart' as d;
+import 'package:scheduled_test/scheduled_test.dart';
 
 import 'metatest.dart';
 import 'utils.dart';

pkg/scheduled_test/test/metatest.dart

@@ -13,8 +13,8 @@ import 'dart:io';
 import 'dart:async';
 import 'dart:isolate';
 
-import '../../../pkg/pathos/lib/path.dart' as path;
-import '../../../pkg/unittest/lib/unittest.dart';
+import 'package:pathos/path.dart' as path;
+import 'package:unittest/unittest.dart';
 
 import 'utils.dart';
 

pkg/scheduled_test/test/scheduled_process_test.dart

@@ -7,10 +7,10 @@ library scheduled_process_test;
 import 'dart:async';
 import 'dart:io';
 
-import '../../../pkg/pathos/lib/path.dart' as path;
-import '../lib/scheduled_process.dart';
-import '../lib/scheduled_test.dart';
-import '../lib/src/mock_clock.dart' as mock_clock;
+import 'package:pathos/path.dart' as path;
+import 'package:scheduled_test/scheduled_process.dart';
+import 'package:scheduled_test/scheduled_test.dart';
+import 'package:scheduled_test/src/mock_clock.dart' as mock_clock;
 
 import 'metatest.dart';
 import 'utils.dart';

pkg/scheduled_test/test/scheduled_server_test.dart

@@ -7,10 +7,10 @@ library scheduled_server_test;
 import 'dart:async';
 import 'dart:io';
 
-import '../../../pkg/http/lib/http.dart' as http;
-import '../lib/scheduled_server.dart';
-import '../lib/scheduled_test.dart';
-import '../lib/src/mock_clock.dart' as mock_clock;
+import 'package:http/http.dart' as http;
+import 'package:scheduled_test/scheduled_server.dart';
+import 'package:scheduled_test/scheduled_test.dart';
+import 'package:scheduled_test/src/mock_clock.dart' as mock_clock;
 
 import 'metatest.dart';
 import 'utils.dart';

pkg/scheduled_test/test/scheduled_test_test.dart

@@ -6,8 +6,8 @@ library scheduled_test_test;
 
 import 'dart:async';
 
-import '../lib/scheduled_test.dart';
-import '../lib/src/mock_clock.dart' as mock_clock;
+import 'package:scheduled_test/scheduled_test.dart';
+import 'package:scheduled_test/src/mock_clock.dart' as mock_clock;
 
 import 'metatest.dart';
 import 'utils.dart';

pkg/scheduled_test/test/substitute_future_test.dart

@@ -6,8 +6,8 @@ library substitute_future_test;
 
 import 'dart:async';
 
-import '../lib/src/substitute_future.dart';
-import '../../../pkg/unittest/lib/unittest.dart';
+import 'package:scheduled_test/src/substitute_future.dart';
+import 'package:unittest/unittest.dart';
 
 void main() {
   group('with no substitution, works like a normal Future for', () {

pkg/scheduled_test/test/utils.dart

@@ -7,10 +7,10 @@ library test_utils;
 import 'dart:io';
 import 'dart:async';
 
-import '../lib/src/utils.dart';
-import '../lib/src/mock_clock.dart' as mock_clock;
+import 'package:scheduled_test/src/utils.dart';
+import 'package:scheduled_test/src/mock_clock.dart' as mock_clock;
 
-export '../lib/src/utils.dart';
+export 'package:scheduled_test/src/utils.dart';
 
 /// Wraps [input] to provide a timeout. If [input] completes before
 /// [milliseconds] have passed, then the return value completes in the same way.

pkg/scheduled_test/test/value_future_test.dart

@@ -6,8 +6,8 @@ library value_future_test;
 
 import 'dart:async';
 
-import '../lib/src/value_future.dart';
-import '../../../pkg/unittest/lib/unittest.dart';
+import 'package:scheduled_test/src/value_future.dart';
+import 'package:unittest/unittest.dart';
 
 void main() {
   group('works like a normal Future for', () {

sdk/bin/dartdoc

@@ -23,4 +23,4 @@ if test -f "$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart.snapshot"; then
   echo Using snapshot "$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart.snapshot" 1>&2
   SNAPSHOT="--use-script-snapshot=$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart.snapshot"
 fi
-exec "$BIN_DIR"/dart --heap_growth_rate=32 $SNAPSHOT "$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart" $COLORS "$@"
+exec "$BIN_DIR"/dart --heap_growth_rate=32 "--package-root=$BIN_DIR/../../packages/" $SNAPSHOT "$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart" $COLORS "$@"

sdk/bin/dartdoc.bat

@@ -12,4 +12,4 @@ set arguments=%*
 rem set SNAPSHOTNAME="%SCRIPTPATH%dartdoc.snapshot"
 rem if exist %SNAPSHOTNAME% set SNAPSHOT=--use-script-snapshot=%SNAPSHOTNAME%
 
-"%SCRIPTPATH%dart" --heap_growth_rate=32 %SNAPSHOT% "%SCRIPTPATH%..\lib\_internal\dartdoc\bin\dartdoc.dart" %arguments%
+"%SCRIPTPATH%dart" --heap_growth_rate=32 "--package-root=%SCRIPTPATH%..\..\packages\" %SNAPSHOT% "%SCRIPTPATH%..\lib\_internal\dartdoc\bin\dartdoc.dart" %arguments%

sdk/lib/_internal/dartdoc/bin/dartdoc.dart

@@ -19,11 +19,10 @@ library dartdoc;
 import 'dart:async';
 import 'dart:io';
 
-import '../lib/dartdoc.dart';
-
 // TODO(rnystrom): Use "package:" URL (#4968).
-import '../../../../../pkg/args/lib/args.dart';
-import '../../../../../pkg/pathos/lib/path.dart' as path;
+import '../lib/dartdoc.dart';
+import 'package:args/args.dart';
+import 'package:pathos/path.dart' as path;
 
 /**
  * Run this from the `lib/_internal/dartdoc` directory.

sdk/lib/_internal/dartdoc/lib/universe_serializer.dart

@@ -11,7 +11,7 @@ library universe_serializer;
 import 'dartdoc.dart';
 
 // TODO(rnystrom): Use "package:" URL (#4968).
-import '../../../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 import '../../compiler/implementation/mirrors/dart2js_mirror.dart' as dart2js;
 import '../../compiler/implementation/mirrors/mirrors.dart';
 import '../../compiler/implementation/mirrors/mirrors_util.dart';

sdk/lib/_internal/dartdoc/pubspec.yaml

@@ -1,3 +1,10 @@
 name: dartdoc
 description: >
  Libraries for generating documentation from Dart source code.
+
+dependencies:
+  args: ">=0.4.2 <1.0.0"
+  pathos: ">=0.4.2 <1.0.0"
+
+dev_dependencies:
+  unittest: ">=0.4.2 <1.0.0"

sdk/lib/_internal/dartdoc/test/dartdoc_test.dart

@@ -7,16 +7,15 @@ library dartdocTests;
 
 import 'dart:async';
 import 'dart:io';
-import '../../../../../pkg/pathos/lib/path.dart' as path;
+
+import 'package:pathos/path.dart' as path;
+import 'package:unittest/unittest.dart';
 
 // TODO(rnystrom): Use "package:" URL (#4968).
 import '../lib/dartdoc.dart' as dd;
 import '../lib/markdown.dart';
 import 'markdown_test.dart';
 
-// TODO(rnystrom): Better path to unittest.
-import '../../../../../pkg/unittest/lib/unittest.dart';
-
 // Pretty test config with --human
 import '../../../../../utils/tests/pub/command_line_config.dart';
 
@@ -237,11 +236,8 @@ void _testRunDartDoc(List<String> libraryPaths, void eval(ProcessResult)) {
   expect(_runDartdoc(libraryPaths).then(eval), completes);
 }
 
-/// Runs dartdoc with the libraryPaths provided, and completes to dartdoc's
-/// ProcessResult.
-Future<ProcessResult> _runDartdoc(List<String> libraryPaths) {
-  var dartBin = new Options().executable;
-
+/// The path to the root directory of the dartdoc entrypoint.
+String get _dartdocDir {
   var dir = path.absolute(new Options().script);
   while (path.basename(dir) != 'dartdoc') {
     if (!path.absolute(dir).contains('dartdoc') || dir == path.dirname(dir)) {
@@ -249,9 +245,40 @@ Future<ProcessResult> _runDartdoc(List<String> libraryPaths) {
     }
     dir = path.dirname(dir);
   }
-  var dartdoc = path.join(path.absolute(dir), 'bin/dartdoc.dart');
+  return path.absolute(dir);
+}
 
-  final runArgs = [dartdoc];
+/// The path to use for the package root for subprocesses.
+String get _packageRoot {
+  var sdkVersionPath = path.join(_dartdocDir, '..', '..', '..', 'version');
+  if (new File(sdkVersionPath).existsSync()) {
+    // It looks like dartdoc is being run from the SDK, so we should set the
+    // package root to the SDK's packages directory.
+    return path.absolute(path.join(_dartdocDir, '..', '..', '..', 'packages'));
+  }
+
+  // It looks like Dartdoc is being run from the Dart repo, so the package root
+  // is in the build output directory. We can find that directory relative to
+  // the Dart executable, but that could be in one of two places: in
+  // "$BUILD/dart" or "$BUILD/dart-sdk/bin/dart".
+  var executableDir = path.dirname(new Options().executable);
+  if (new Directory(path.join(executableDir, 'dart-sdk')).existsSync()) {
+    // The executable is in "$BUILD/dart".
+    return path.absolute(path.join(executableDir, 'packages'));
+  } else {
+    // The executable is in "$BUILD/dart-sdk/bin/dart".
+    return path.absolute(path.join(executableDir, '..', '..', 'packages'));
+  }
+}
+
+/// Runs dartdoc with the libraryPaths provided, and completes to dartdoc's
+/// ProcessResult.
+Future<ProcessResult> _runDartdoc(List<String> libraryPaths) {
+  var dartBin = new Options().executable;
+
+  var dartdoc = path.join(_dartdocDir, 'bin/dartdoc.dart');
+
+  final runArgs = ['--package-root=$_packageRoot/', dartdoc];
 
   // Turn relative libraryPaths to absolute ones.
   runArgs.addAll(libraryPaths

sdk/lib/_internal/dartdoc/test/markdown_test.dart

@@ -5,12 +5,11 @@
 /// Unit tests for markdown.
 library markdownTests;
 
+import 'package:unittest/unittest.dart';
+
 // TODO(rnystrom): Use "package:" URL (#4968).
 import '../lib/markdown.dart';
 
-// TODO(rnystrom): Better path to unittest.
-import '../../../../../pkg/unittest/lib/unittest.dart';
-
 /// Most of these tests are based on observing how showdown behaves:
 /// http://softwaremaniacs.org/playground/showdown-highlight/
 void main() {

tools/create_sdk.py

@@ -38,7 +38,7 @@
 # ......utf/
 # ......scalarlist/
 # ......typeddata/
-# ....pkg/
+# ....packages/
 # ......args/
 # ......intl/
 # ......logging/
@@ -215,20 +215,19 @@ def Main(argv):
              ignore=ignore_patterns('*.svn', 'doc', '*.py', '*.gypi', '*.sh'))
 
 
-  # Create and copy pkg.
-  PKG = join(SDK_tmp, 'pkg')
-  os.makedirs(PKG)
+  # Create and copy packages.
+  PACKAGES = join(SDK_tmp, 'packages')
+  os.makedirs(PACKAGES)
 
   #
-  # Create and populate pkg/{args, intl, logging, meta, unittest, ...}
+  # Create and populate packages/{args, intl, logging, meta, unittest, ...}
   #
 
   for library in ['args', 'http', 'intl', 'logging', 'meta', 'oauth2', 'pathos',
                   'serialization', 'unittest', 'yaml']:
 
-    copytree(join(HOME, 'pkg', library), join(PKG, library),
-             ignore=ignore_patterns('*.svn', 'doc', 'docs',
-                                    '*.py', '*.gypi', '*.sh', 'packages'))
+    copytree(join(HOME, 'pkg', library, 'lib'), join(PACKAGES, library),
+             ignore=ignore_patterns('*.svn'))
 
   # Create and copy tools.
   UTIL = join(SDK_tmp, 'util')
@@ -275,18 +274,6 @@ def Main(argv):
   # Copy dart2js/dartdoc/pub.
   CopyDartScripts(HOME, build_dir, SDK_tmp, version)
 
-  # Fix up dartdoc.
-  # TODO(dgrove): Remove this once issue 6619 is fixed.
-  ReplaceInFiles([join(SDK_tmp, 'lib', '_internal', 'dartdoc',
-                       'bin', 'dartdoc.dart'),
-                  join(SDK_tmp, 'lib', '_internal', 'dartdoc',
-                       'lib', 'universe_serializer.dart')], [
-                  ("../../../../../pkg/args/lib/args.dart",
-                   "../../../../pkg/args/lib/args.dart"),
-                  ("../../../../../pkg/pathos/lib/path.dart",
-                   "../../../../pkg/pathos/lib/path.dart"),
-                 ])
-
   # Write the 'version' file
   versionFile = open(os.path.join(SDK_tmp, 'version'), 'w')
   versionFile.write(version + '\n')

tools/dom/docs/test/docs_test.dart

@@ -6,7 +6,7 @@ library docs_test;
 
 import 'dart:io';
 
-import '../../../../pkg/unittest/lib/unittest.dart';
+import 'package:unittest/unittest.dart';
 
 import '../bin/docs.dart';
 import '../lib/docs.dart';

utils/apidoc/apidoc.gyp

@@ -47,6 +47,7 @@
           ],
           'action': [
             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
+            '--package-root=<(PRODUCT_DIR)/packages/',
             'apidoc.dart',
             '--out=<(PRODUCT_DIR)/api_docs',
             '--version=<!@(["python", "../../tools/print_version.py"])',

utils/pub/command_lish.dart

@@ -9,9 +9,10 @@ import 'dart:io';
 import 'dart:json';
 import 'dart:uri';
 
-import '../../pkg/args/lib/args.dart';
-import '../../pkg/http/lib/http.dart' as http;
-import '../../pkg/pathos/lib/path.dart' as path;
+import 'package:args/args.dart';
+import 'package:http/http.dart' as http;
+import 'package:pathos/path.dart' as path;
+
 import 'directory_tree.dart';
 import 'exit_codes.dart' as exit_codes;
 import 'git.dart' as git;

utils/pub/command_uploader.dart

@@ -8,8 +8,9 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:uri';
 
-import '../../pkg/args/lib/args.dart';
-import '../../pkg/pathos/lib/path.dart' as path;
+import 'package:args/args.dart';
+import 'package:pathos/path.dart' as path;
+
 import 'entrypoint.dart';
 import 'exit_codes.dart' as exit_codes;
 import 'http.dart';

utils/pub/directory_tree.dart

@@ -5,7 +5,8 @@
 /// A simple library for rendering a list of files as a directory tree.
 library directory_tree;
 
-import '../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
+
 import 'log.dart' as log;
 
 /// Draws a directory tree for the given list of files. Given a list of files

utils/pub/entrypoint.dart

@@ -6,7 +6,7 @@ library entrypoint;
 
 import 'dart:async';
 
-import '../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import 'io.dart';
 import 'lock_file.dart';

utils/pub/git_source.dart

@@ -6,7 +6,7 @@ library git_source;
 
 import 'dart:async';
 
-import '../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import 'git.dart' as git;
 import 'io.dart';

utils/pub/hosted_source.dart

@@ -9,9 +9,8 @@ import 'dart:io' as io;
 import 'dart:json' as json;
 import 'dart:uri';
 
-// TODO(nweiz): Make this import better.
-import '../../pkg/http/lib/http.dart' as http;
-import '../../pkg/pathos/lib/path.dart' as path;
+import 'package:http/http.dart' as http;
+import 'package:pathos/path.dart' as path;
 
 import 'http.dart';
 import 'io.dart';

utils/pub/http.dart

@@ -9,8 +9,8 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:json' as json;
 
-// TODO(nweiz): Make this import better.
-import '../../pkg/http/lib/http.dart' as http;
+import 'package:http/http.dart' as http;
+
 import 'io.dart';
 import 'log.dart' as log;
 import 'oauth2.dart' as oauth2;

utils/pub/io.dart

@@ -11,14 +11,14 @@ import 'dart:isolate';
 import 'dart:json';
 import 'dart:uri';
 
-import '../../pkg/pathos/lib/path.dart' as path;
-import '../../pkg/http/lib/http.dart' show ByteStream;
+import 'package:pathos/path.dart' as path;
+import 'package:http/http.dart' show ByteStream;
 import 'error_group.dart';
 import 'exit_codes.dart' as exit_codes;
 import 'log.dart' as log;
 import 'utils.dart';
 
-export '../../pkg/http/lib/http.dart' show ByteStream;
+export 'package:http/http.dart' show ByteStream;
 
 /// Returns whether or not [entry] is nested somewhere within [dir]. This just
 /// performs a path comparison; it doesn't look at the actual filesystem.

utils/pub/lock_file.dart

@@ -5,12 +5,14 @@
 library lock_file;
 
 import 'dart:json' as json;
+
+import 'package:yaml/yaml.dart';
+
 import 'io.dart';
 import 'package.dart';
 import 'source_registry.dart';
 import 'utils.dart';
 import 'version.dart';
-import '../../pkg/yaml/lib/yaml.dart';
 
 /// A parsed and validated `pubspec.lock` file.
 class LockFile {

utils/pub/oauth2.dart

@@ -8,9 +8,8 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:uri';
 
-// TODO(nweiz): Make this a "package:" URL, or something nicer than this.
-import '../../pkg/oauth2/lib/oauth2.dart';
-import '../../pkg/pathos/lib/path.dart' as path;
+import 'package:oauth2/oauth2.dart';
+import 'package:pathos/path.dart' as path;
 
 import 'http.dart';
 import 'io.dart';
@@ -19,7 +18,7 @@ import 'safe_http_server.dart';
 import 'system_cache.dart';
 import 'utils.dart';
 
-export '../../pkg/oauth2/lib/oauth2.dart';
+export 'package:oauth2/oauth2.dart';
 
 /// The pub client's OAuth2 identifier.
 final _identifier = '818368855108-8grd2eg9tj9f38os6f1urbcvsq399u8n.apps.'

utils/pub/package.dart

@@ -6,7 +6,7 @@ library package;
 
 import 'dart:async';
 
-import '../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import 'io.dart';
 import 'pubspec.dart';

utils/pub/path_source.dart

@@ -7,7 +7,7 @@ library path_source;
 import 'dart:async';
 import 'dart:io';
 
-import '../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import 'log.dart' as log;
 

utils/pub/pub.dart

@@ -9,8 +9,8 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:math';
 
-import '../../pkg/args/lib/args.dart';
-import '../../pkg/pathos/lib/path.dart' as path;
+import 'package:args/args.dart';
+import 'package:pathos/path.dart' as path;
 
 import 'command_help.dart';
 import 'command_install.dart';

utils/pub/pubspec.dart

@@ -4,8 +4,8 @@
 
 library pubspec;
 
-import '../../pkg/yaml/lib/yaml.dart';
-import '../../pkg/pathos/lib/path.dart' as path;
+import 'package:yaml/yaml.dart';
+import 'package:pathos/path.dart' as path;
 
 import 'io.dart';
 import 'package.dart';

utils/pub/sdk.dart

@@ -7,7 +7,7 @@ library sdk;
 
 import 'dart:io';
 
-import '../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import 'io.dart';
 import 'log.dart' as log;

utils/pub/sdk/pub

@@ -8,4 +8,4 @@
 BIN_DIR="$(cd "${0%/*}" ; pwd -P)"
 DART_SDK="$(cd "${BIN_DIR%/*}" ; pwd -P)"
 
-exec "$BIN_DIR"/dart "$DART_SDK"/util/pub/pub.dart $@
+exec "$BIN_DIR"/dart --package-root="$DART_SDK"/packages/ "$DART_SDK"/util/pub/pub.dart $@

utils/pub/sdk/pub.bat

@@ -11,4 +11,4 @@ set SCRIPTPATH=%~dp0
 :: Does the string have a trailing slash? If so, remove it.
 if %SCRIPTPATH:~-1%==\ set SCRIPTPATH=%SCRIPTPATH:~0,-1%
 
-"%SCRIPTPATH%\dart.exe" "%SCRIPTPATH%\..\util\pub\pub.dart" %*
+"%SCRIPTPATH%\dart.exe" --package-root="%SCRIPTPATH%\..\packages\" "%SCRIPTPATH%\..\util\pub\pub.dart" %*

utils/pub/source.dart

@@ -6,7 +6,7 @@ library source;
 
 import 'dart:async';
 
-import '../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import 'io.dart';
 import 'package.dart';

utils/pub/system_cache.dart

@@ -7,7 +7,7 @@ library system_cache;
 import 'dart:io';
 import 'dart:async';
 
-import '../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import 'git_source.dart';
 import 'hosted_source.dart';

utils/pub/validator/compiled_dartdoc.dart

@@ -6,7 +6,7 @@ library compiled_dartdoc_validator;
 
 import 'dart:async';
 
-import '../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../entrypoint.dart';
 import '../io.dart';

utils/pub/validator/directory.dart

@@ -6,7 +6,7 @@ library directory_validator;
 
 import 'dart:async';
 
-import '../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../entrypoint.dart';
 import '../io.dart';

utils/pub/validator/lib.dart

@@ -7,7 +7,7 @@ library lib_validator;
 import 'dart:async';
 import 'dart:io';
 
-import '../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../entrypoint.dart';
 import '../io.dart';

utils/pub/validator/license.dart

@@ -6,7 +6,7 @@ library pubspec_field_validator;
 
 import 'dart:async';
 
-import '../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../entrypoint.dart';
 import '../io.dart';

utils/pub/validator/name.dart

@@ -7,7 +7,7 @@ library name_validator;
 import 'dart:async';
 import 'dart:io';
 
-import '../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../entrypoint.dart';
 import '../io.dart';

utils/pub/validator/utf8_readme.dart

@@ -7,7 +7,7 @@ library utf8_readme_validator;
 import 'dart:async';
 import 'dart:utf';
 
-import '../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../entrypoint.dart';
 import '../io.dart';

utils/tests/pub/command_line_config.dart

@@ -6,8 +6,8 @@ library command_line_config;
 
 import 'dart:io';
 
-import '../../../pkg/pathos/lib/path.dart' as path;
-import '../../../pkg/unittest/lib/unittest.dart';
+import 'package:pathos/path.dart' as path;
+import 'package:unittest/unittest.dart';
 import '../../pub/utils.dart';
 
 /// Gets a "special" string (ANSI escape or Unicode). On Windows, returns

utils/tests/pub/descriptor.dart

@@ -5,17 +5,17 @@
 /// Pub-specific scheduled_test descriptors.
 library descriptor;
 
-import '../../../pkg/oauth2/lib/oauth2.dart' as oauth2;
-import '../../../pkg/scheduled_test/lib/scheduled_server.dart';
-import '../../../pkg/scheduled_test/lib/scheduled_test.dart';
-import '../../../pkg/scheduled_test/lib/descriptor.dart';
+import 'package:oauth2/oauth2.dart' as oauth2;
+import 'package:scheduled_test/scheduled_server.dart';
+import 'package:scheduled_test/scheduled_test.dart';
+import 'package:scheduled_test/descriptor.dart';
 
 import '../../pub/utils.dart';
 import 'descriptor/git.dart';
 import 'descriptor/tar.dart';
 import 'test_pub.dart';
 
-export '../../../pkg/scheduled_test/lib/descriptor.dart';
+export 'package:scheduled_test/descriptor.dart';
 export 'descriptor/git.dart';
 export 'descriptor/tar.dart';
 

utils/tests/pub/descriptor/git.dart

@@ -6,9 +6,9 @@ library descriptor.git;
 
 import 'dart:async';
 
-import '../../../../pkg/pathos/lib/path.dart' as path;
-import '../../../../pkg/scheduled_test/lib/scheduled_test.dart';
-import '../../../../pkg/scheduled_test/lib/descriptor.dart';
+import 'package:pathos/path.dart' as path;
+import 'package:scheduled_test/scheduled_test.dart';
+import 'package:scheduled_test/descriptor.dart';
 
 import '../../../pub/git.dart' as git;
 

utils/tests/pub/descriptor/tar.dart

@@ -7,9 +7,9 @@ library descriptor.tar;
 import 'dart:io';
 import 'dart:async';
 
-import '../../../../pkg/pathos/lib/path.dart' as path;
-import '../../../../pkg/scheduled_test/lib/scheduled_test.dart';
-import '../../../../pkg/scheduled_test/lib/descriptor.dart';
+import 'package:pathos/path.dart' as path;
+import 'package:scheduled_test/scheduled_test.dart';
+import 'package:scheduled_test/descriptor.dart';
 
 import '../../../pub/io.dart';
 import '../../../pub/utils.dart';

utils/tests/pub/dev_dependency_test.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import '../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import 'descriptor.dart' as d;
 import 'test_pub.dart';

utils/tests/pub/directory_tree_test.dart

@@ -4,7 +4,8 @@
 
 library lock_file_test;
 
-import '../../../pkg/unittest/lib/unittest.dart';
+import 'package:unittest/unittest.dart';
+
 import '../../pub/directory_tree.dart';
 
 main() {

utils/tests/pub/error_group_test.dart

@@ -6,7 +6,8 @@ library error_group_test;
 
 import 'dart:async';
 
-import '../../../pkg/unittest/lib/unittest.dart';
+import 'package:unittest/unittest.dart';
+
 import '../../pub/error_group.dart';
 import '../../pub/utils.dart';
 

utils/tests/pub/install/broken_symlink_test.dart

@@ -6,7 +6,7 @@ library pub_tests;
 
 import 'dart:io';
 
-import '../../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../descriptor.dart' as d;
 import '../test_pub.dart';

utils/tests/pub/install/git/check_out_with_trailing_slash_test.dart

@@ -6,7 +6,7 @@ library pub_tests;
 
 import 'dart:io';
 
-import '../../../../../pkg/scheduled_test/lib/scheduled_test.dart';
+import 'package:scheduled_test/scheduled_test.dart';
 
 import '../../descriptor.dart' as d;
 import '../../test_pub.dart';

utils/tests/pub/install/git/lock_version_test.dart

@@ -6,8 +6,8 @@ library pub_tests;
 
 import 'dart:io';
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
-import '../../../../../pkg/scheduled_test/lib/scheduled_test.dart';
+import 'package:pathos/path.dart' as path;
+import 'package:scheduled_test/scheduled_test.dart';
 
 import '../../../../pub/io.dart';
 import '../../descriptor.dart' as d;

utils/tests/pub/install/hosted/repair_cache_test.dart

@@ -4,7 +4,7 @@
 
 library pub_tests;
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../../../../pub/io.dart';
 import '../../descriptor.dart' as d;

utils/tests/pub/install/hosted/stay_locked_test.dart

@@ -6,8 +6,8 @@ library pub_tests;
 
 import 'dart:io';
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
-import '../../../../../pkg/scheduled_test/lib/scheduled_test.dart';
+import 'package:pathos/path.dart' as path;
+import 'package:scheduled_test/scheduled_test.dart';
 
 import '../../../../pub/io.dart';
 import '../../descriptor.dart' as d;

utils/tests/pub/install/path/absolute_path_test.dart

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE d.file.
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
-import '../../../../../pkg/scheduled_test/lib/scheduled_test.dart';
+import 'package:pathos/path.dart' as path;
+import 'package:scheduled_test/scheduled_test.dart';
 
 import '../../../../pub/io.dart';
 import '../../descriptor.dart' as d;

utils/tests/pub/install/path/absolute_symlink_test.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE d.file.
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../../../../pub/exit_codes.dart' as exit_codes;
 import '../../descriptor.dart' as d;

utils/tests/pub/install/path/no_pubspec_test.dart

@@ -4,8 +4,8 @@
 
 import 'dart:io';
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
-import '../../../../../pkg/scheduled_test/lib/scheduled_test.dart';
+import 'package:pathos/path.dart' as path;
+import 'package:scheduled_test/scheduled_test.dart';
 
 import '../../descriptor.dart' as d;
 import '../../test_pub.dart';

utils/tests/pub/install/path/nonexistent_dir_test.dart

@@ -4,8 +4,8 @@
 
 import 'dart:io';
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
-import '../../../../../pkg/scheduled_test/lib/scheduled_test.dart';
+import 'package:pathos/path.dart' as path;
+import 'package:scheduled_test/scheduled_test.dart';
 
 import '../../../../pub/exit_codes.dart' as exit_codes;
 import '../../descriptor.dart' as d;

utils/tests/pub/install/path/path_is_file_test.dart

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE d.file.
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
-import '../../../../../pkg/scheduled_test/lib/scheduled_test.dart';
+import 'package:pathos/path.dart' as path;
+import 'package:scheduled_test/scheduled_test.dart';
 
 import '../../../../pub/exit_codes.dart' as exit_codes;
 import '../../descriptor.dart' as d;

utils/tests/pub/install/path/relative_path_test.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE d.file.
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../../../../pub/exit_codes.dart' as exit_codes;
 import '../../descriptor.dart' as d;

utils/tests/pub/install/path/relative_symlink_test.dart

@@ -4,7 +4,7 @@
 
 import 'dart:io';
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../../../../pub/exit_codes.dart' as exit_codes;
 import '../../descriptor.dart' as d;

utils/tests/pub/install/path/shared_dependency_symlink_test.dart

@@ -4,7 +4,7 @@
 
 import 'dart:io';
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../../descriptor.dart' as d;
 import '../../test_pub.dart';

utils/tests/pub/install/path/shared_dependency_test.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE d.file.
 
-import '../../../../../pkg/pathos/lib/path.dart' as path;
+import 'package:pathos/path.dart' as path;
 
 import '../../descriptor.dart' as d;
 import '../../test_pub.dart';

utils/tests/pub/install/pub_install_test.dart

@@ -6,8 +6,8 @@ library pub_tests;
 
 import 'dart:io';
 
-import '../../../../pkg/pathos/lib/path.dart' as path;
-import '../../../../pkg/scheduled_test/lib/scheduled_test.dart';
+import 'package:pathos/path.dart' as path;
+import 'package:scheduled_test/scheduled_test.dart';
 
 import '../../../pub/io.dart';
 import '../descriptor.dart' as d;

utils/tests/pub/install/relative_symlink_test.dart

@@ -6,7 +6,7 @@ library pub_tests;
 
 import 'dart:io';
 
-import '../../../../pkg/scheduled_test/lib/scheduled_test.dart';
+import 'package:scheduled_test/scheduled_test.dart';
 
 import '../descriptor.dart' as d;
 import '../test_pub.dart';

utils/tests/pub/io_test.dart

@@ -6,8 +6,8 @@ library io_test;
 
 import 'dart:io';
 
-import '../../../pkg/pathos/lib/path.dart' as path;
-import '../../../pkg/unittest/lib/unittest.dart';
+import 'package:pathos/path.dart' as path;
+import 'package:unittest/unittest.dart';
 
 import '../../pub/io.dart';
 import '../../pub/utils.dart';

utils/tests/pub/lock_file_test.dart

@@ -4,8 +4,9 @@
 
 library lock_file_test;
 
-import '../../../pkg/unittest/lib/unittest.dart';
-import '../../../pkg/yaml/lib/yaml.dart';
+import 'package:unittest/unittest.dart';
+import 'package:yaml/yaml.dart';
+
 import '../../pub/lock_file.dart';
 import '../../pub/package.dart';
 import '../../pub/source.dart';

utils/tests/pub/oauth2_test.dart

@@ -8,10 +8,10 @@ import 'dart:io';
 import 'dart:json' as json;
 import 'dart:uri';
 
-import '../../../pkg/http/lib/http.dart' as http;
-import '../../../pkg/scheduled_test/lib/scheduled_process.dart';
-import '../../../pkg/scheduled_test/lib/scheduled_test.dart';
-import '../../../pkg/scheduled_test/lib/scheduled_server.dart';
+import 'package:http/http.dart' as http;
+import 'package:scheduled_test/scheduled_process.dart';
+import 'package:scheduled_test/scheduled_test.dart';
+import 'package:scheduled_test/scheduled_server.dart';
 
 import '../../pub/io.dart';
 import '../../pub/utils.dart';

utils/tests/pub/pub_cache_test.dart

@@ -7,7 +7,7 @@ library pub_cache_test;
 import 'dart:io';
 import 'dart:json' as json;
 
-import '../../../pkg/scheduled_test/lib/scheduled_test.dart';
+import 'package:scheduled_test/scheduled_test.dart';
 
 import '../../pub/io.dart';
 import 'descriptor.dart' as d;

utils/tests/pub/pub_lish_test.dart

@@ -7,8 +7,8 @@ library pub_lish_test;
 import 'dart:io';
 import 'dart:json' as json;
 
-import '../../../pkg/scheduled_test/lib/scheduled_test.dart';
-import '../../../pkg/scheduled_test/lib/scheduled_server.dart';
+import 'package:scheduled_test/scheduled_test.dart';
+import 'package:scheduled_test/scheduled_server.dart';
 
 import '../../pub/exit_codes.dart' as exit_codes;
 import '../../pub/io.dart';

utils/tests/pub/pub_test.dart

@@ -6,7 +6,7 @@ library pub_tests;
 
 import 'dart:io';
 
-import '../../../pkg/scheduled_test/lib/scheduled_test.dart';
+import 'package:scheduled_test/scheduled_test.dart';
 
 import 'descriptor.dart' as d;
 import 'test_pub.dart';