feat: start from angular-artifact

liimaorg · Dec 18, 2024 · e150b3b · e150b3b
1 parent 9460905
commit e150b3b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/AMW_angular/io/src/app/app.routes.ts b/AMW_angular/io/src/app/app.routes.ts
@@ -1,16 +1,16 @@
 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';
 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
@@ -44,13 +44,13 @@
 								</ejbModule>
 								<webModule>
 									<groupId>ch.puzzle.itc.mobiliar</groupId>
-									<artifactId>AMW_web</artifactId>
-									<bundleFileName>AMW_web.war</bundleFileName>
+									<artifactId>AMW_angular</artifactId>
+									<bundleFileName>AMW_angular.war</bundleFileName>
 								</webModule>
 								<webModule>
 									<groupId>ch.puzzle.itc.mobiliar</groupId>
-									<artifactId>AMW_angular</artifactId>
-									<bundleFileName>AMW_angular.war</bundleFileName>
+									<artifactId>AMW_web</artifactId>
+									<bundleFileName>AMW_web.war</bundleFileName>
 								</webModule>
 								<webModule>
 									<groupId>ch.puzzle.itc.mobiliar</groupId>
@@ -76,12 +76,12 @@
 				</dependency>
 				<dependency>
 					<groupId>ch.puzzle.itc.mobiliar</groupId>
-					<artifactId>AMW_web</artifactId>
+					<artifactId>AMW_angular</artifactId>
 					<type>war</type>
 				</dependency>
 				<dependency>
 					<groupId>ch.puzzle.itc.mobiliar</groupId>
-					<artifactId>AMW_angular</artifactId>
+					<artifactId>AMW_web</artifactId>
 					<type>war</type>
 				</dependency>
 				<dependency>

diff --git a/AMW_web/src/main/webapp/WEB-INF/web.xml b/AMW_web/src/main/webapp/WEB-INF/web.xml
@@ -73,9 +73,6 @@
 		<extension>ecss</extension>
 		<mime-type>text/css</mime-type>
 	</mime-mapping>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
 	<error-page>
 		<exception-type>java.lang.Exception</exception-type>
 		<location>/pages/error.xhtml</location>