diff --git a/AMW_angular/io/src/app/app.routes.ts b/AMW_angular/io/src/app/app.routes.ts index 019a0047f..11e65f3c0 100644 --- a/AMW_angular/io/src/app/app.routes.ts +++ b/AMW_angular/io/src/app/app.routes.ts @@ -1,5 +1,4 @@ import { Routes } from '@angular/router'; -import { DeploymentsComponent } from './deployments/deployments.component'; import { appsRoutes } from './apps/apps.routes'; import { auditviewRoutes } from './auditview/auditview.routes'; import { deploymentRoutes } from './deployment/deployment-routes'; @@ -7,10 +6,11 @@ import { settingsRoutes } from './settings/settings.routes'; import { deploymentsRoutes } from './deployments/deployments.routes'; import { serversRoute } from './servers/servers.route'; import { resourcesRoute } from './resources/resources.route'; +import { AppsComponent } from './apps/apps.component'; export const routes: Routes = [ // default route only, the rest is done in module routing - { path: '', component: DeploymentsComponent }, + { path: '', component: AppsComponent }, ...appsRoutes, ...serversRoute, diff --git a/AMW_ear/pom.xml b/AMW_ear/pom.xml index 6ea6b8730..489250e56 100644 --- a/AMW_ear/pom.xml +++ b/AMW_ear/pom.xml @@ -44,13 +44,13 @@ ch.puzzle.itc.mobiliar - AMW_web - AMW_web.war + AMW_angular + AMW_angular.war ch.puzzle.itc.mobiliar - AMW_angular - AMW_angular.war + AMW_web + AMW_web.war ch.puzzle.itc.mobiliar @@ -76,12 +76,12 @@ ch.puzzle.itc.mobiliar - AMW_web + AMW_angular war ch.puzzle.itc.mobiliar - AMW_angular + AMW_web war diff --git a/AMW_web/src/main/webapp/WEB-INF/web.xml b/AMW_web/src/main/webapp/WEB-INF/web.xml index 41e347f0c..61049055c 100644 --- a/AMW_web/src/main/webapp/WEB-INF/web.xml +++ b/AMW_web/src/main/webapp/WEB-INF/web.xml @@ -73,9 +73,6 @@ ecss text/css - - index.html - java.lang.Exception /pages/error.xhtml