From a543bd86d5ac7f57de163f6a851b0c3ca7dc51db Mon Sep 17 00:00:00 2001
From: Elad Ben-Israel <benisrae@amazon.com>
Date: Thu, 13 Sep 2018 11:15:23 +0300
Subject: [PATCH 1/2] Rename @aws-cdk/aws-serverless to @aws-cdk/aws-sam

Fixes #699
---
 .../@aws-cdk/{aws-serverless => aws-sam}/.gitignore  |  0
 .../@aws-cdk/{aws-serverless => aws-sam}/.npmignore  |  0
 .../@aws-cdk/{aws-serverless => aws-sam}/LICENSE     |  0
 packages/@aws-cdk/{aws-serverless => aws-sam}/NOTICE |  0
 .../@aws-cdk/{aws-serverless => aws-sam}/README.md   |  0
 .../{aws-serverless => aws-sam}/lib/index.ts         |  0
 .../{aws-serverless => aws-sam}/package-lock.json    |  0
 .../{aws-serverless => aws-sam}/package.json         | 12 ++++++------
 .../test/test.serverless.ts                          |  0
 9 files changed, 6 insertions(+), 6 deletions(-)
 rename packages/@aws-cdk/{aws-serverless => aws-sam}/.gitignore (100%)
 rename packages/@aws-cdk/{aws-serverless => aws-sam}/.npmignore (100%)
 rename packages/@aws-cdk/{aws-serverless => aws-sam}/LICENSE (100%)
 rename packages/@aws-cdk/{aws-serverless => aws-sam}/NOTICE (100%)
 rename packages/@aws-cdk/{aws-serverless => aws-sam}/README.md (100%)
 rename packages/@aws-cdk/{aws-serverless => aws-sam}/lib/index.ts (100%)
 rename packages/@aws-cdk/{aws-serverless => aws-sam}/package-lock.json (100%)
 rename packages/@aws-cdk/{aws-serverless => aws-sam}/package.json (79%)
 rename packages/@aws-cdk/{aws-serverless => aws-sam}/test/test.serverless.ts (100%)

diff --git a/packages/@aws-cdk/aws-serverless/.gitignore b/packages/@aws-cdk/aws-sam/.gitignore
similarity index 100%
rename from packages/@aws-cdk/aws-serverless/.gitignore
rename to packages/@aws-cdk/aws-sam/.gitignore
diff --git a/packages/@aws-cdk/aws-serverless/.npmignore b/packages/@aws-cdk/aws-sam/.npmignore
similarity index 100%
rename from packages/@aws-cdk/aws-serverless/.npmignore
rename to packages/@aws-cdk/aws-sam/.npmignore
diff --git a/packages/@aws-cdk/aws-serverless/LICENSE b/packages/@aws-cdk/aws-sam/LICENSE
similarity index 100%
rename from packages/@aws-cdk/aws-serverless/LICENSE
rename to packages/@aws-cdk/aws-sam/LICENSE
diff --git a/packages/@aws-cdk/aws-serverless/NOTICE b/packages/@aws-cdk/aws-sam/NOTICE
similarity index 100%
rename from packages/@aws-cdk/aws-serverless/NOTICE
rename to packages/@aws-cdk/aws-sam/NOTICE
diff --git a/packages/@aws-cdk/aws-serverless/README.md b/packages/@aws-cdk/aws-sam/README.md
similarity index 100%
rename from packages/@aws-cdk/aws-serverless/README.md
rename to packages/@aws-cdk/aws-sam/README.md
diff --git a/packages/@aws-cdk/aws-serverless/lib/index.ts b/packages/@aws-cdk/aws-sam/lib/index.ts
similarity index 100%
rename from packages/@aws-cdk/aws-serverless/lib/index.ts
rename to packages/@aws-cdk/aws-sam/lib/index.ts
diff --git a/packages/@aws-cdk/aws-serverless/package-lock.json b/packages/@aws-cdk/aws-sam/package-lock.json
similarity index 100%
rename from packages/@aws-cdk/aws-serverless/package-lock.json
rename to packages/@aws-cdk/aws-sam/package-lock.json
diff --git a/packages/@aws-cdk/aws-serverless/package.json b/packages/@aws-cdk/aws-sam/package.json
similarity index 79%
rename from packages/@aws-cdk/aws-serverless/package.json
rename to packages/@aws-cdk/aws-sam/package.json
index 6b91294e616a8..8d529e7d209b2 100644
--- a/packages/@aws-cdk/aws-serverless/package.json
+++ b/packages/@aws-cdk/aws-sam/package.json
@@ -1,22 +1,22 @@
 {
-  "name": "@aws-cdk/aws-serverless",
+  "name": "@aws-cdk/aws-sam",
   "version": "0.9.0",
-  "description": "The CDK Construct Library for AWS::Serverless",
+  "description": "The CDK Construct Library for the AWS Serverless Application Model (SAM) resources",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "jsii": {
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.services.serverless",
+        "package": "software.amazon.awscdk.services.sam",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "serverless"
+          "artifactId": "sam"
         }
       },
       "dotnet": {
-        "namespace": "Amazon.CDK.AWS.Serverless",
-        "packageId": "Amazon.CDK.AWS.Serverless",
+        "namespace": "Amazon.CDK.AWS.SAM",
+        "packageId": "Amazon.CDK.AWS.SAM",
         "signAssembly": true,
         "assemblyOriginatorKeyFile": "../../key.snk"
       },
diff --git a/packages/@aws-cdk/aws-serverless/test/test.serverless.ts b/packages/@aws-cdk/aws-sam/test/test.serverless.ts
similarity index 100%
rename from packages/@aws-cdk/aws-serverless/test/test.serverless.ts
rename to packages/@aws-cdk/aws-sam/test/test.serverless.ts

From 3ff512784ee40878f7a2c2bbd6242f7f4b82c805 Mon Sep 17 00:00:00 2001
From: Elad Ben-Israel <benisrae@amazon.com>
Date: Thu, 13 Sep 2018 15:48:38 +0300
Subject: [PATCH 2/2] Conform to "only generated"

---
 .../@aws-cdk/aws-sam/test/{test.serverless.ts => test.sam.ts}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/@aws-cdk/aws-sam/test/{test.serverless.ts => test.sam.ts} (100%)

diff --git a/packages/@aws-cdk/aws-sam/test/test.serverless.ts b/packages/@aws-cdk/aws-sam/test/test.sam.ts
similarity index 100%
rename from packages/@aws-cdk/aws-sam/test/test.serverless.ts
rename to packages/@aws-cdk/aws-sam/test/test.sam.ts