Include api and model package in angular

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -600,7 +600,7 @@ public class DefaultCodegen {
 
     public CodegenProperty fromProperty(String name, Property p) {
         if (p == null) {
-            LOGGER.error("unexpected missing property for name " + null);
+            LOGGER.error("unexpected missing property for name " + name);
             return null;
         }
         CodegenProperty property = CodegenModelFactory.newInstance(CodegenModelType.PROPERTY);

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java

@@ -2,6 +2,8 @@ package io.swagger.codegen.languages;
 
 import io.swagger.codegen.SupportingFile;
 
+import java.io.File;
+
 public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCodegen {
 	
 	@Override
@@ -19,6 +21,8 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
 	    modelTemplateFiles.put("model.mustache", ".ts");
 	    apiTemplateFiles.put("api.mustache", ".ts");
 	    templateDir = "TypeScript-Angular";
-	    supportingFiles.add(new SupportingFile("api.d.mustache", apiPackage, "api.d.ts"));
+	    apiPackage = "API.Client";
+	    modelPackage = "API.Client";
+	    supportingFiles.add(new SupportingFile("api.d.mustache", apiPackage().replace('.', File.separatorChar), "api.d.ts"));
 	}
 }

samples/client/petstore/typescript-angular/API/Client/Category.ts

@@ -1,6 +1,6 @@
 /// <reference path="api.d.ts" />
 
-module  {
+module API.Client {
     'use strict';
 
     export class Category {

samples/client/petstore/typescript-angular/API/Client/Order.ts

@@ -1,6 +1,6 @@
 /// <reference path="api.d.ts" />
 
-module  {
+module API.Client {
     'use strict';
 
     export class Order {

samples/client/petstore/typescript-angular/API/Client/Pet.ts

@@ -1,6 +1,6 @@
 /// <reference path="api.d.ts" />
 
-module  {
+module API.Client {
     'use strict';
 
     export class Pet {

samples/client/petstore/typescript-angular/API/Client/PetApi.ts

@@ -2,7 +2,7 @@
 
 /* tslint:disable:no-unused-variable member-ordering */
 
-module  {
+module API.Client {
     'use strict';
 
     export class PetApi {

samples/client/petstore/typescript-angular/API/Client/StoreApi.ts

@@ -2,7 +2,7 @@
 
 /* tslint:disable:no-unused-variable member-ordering */
 
-module  {
+module API.Client {
     'use strict';
 
     export class StoreApi {

samples/client/petstore/typescript-angular/API/Client/Tag.ts

@@ -1,6 +1,6 @@
 /// <reference path="api.d.ts" />
 
-module  {
+module API.Client {
     'use strict';
 
     export class Tag {

samples/client/petstore/typescript-angular/API/Client/User.ts

@@ -1,6 +1,6 @@
 /// <reference path="api.d.ts" />
 
-module  {
+module API.Client {
     'use strict';
 
     export class User {

samples/client/petstore/typescript-angular/API/Client/UserApi.ts

@@ -2,7 +2,7 @@
 
 /* tslint:disable:no-unused-variable member-ordering */
 
-module  {
+module API.Client {
     'use strict';
 
     export class UserApi {