Deactivating web tests for travis

diff --git a/.travis.yml b/.travis.yml
index de1c4b5389fc3f7b0e9895f4d817dd6be016baa7..a6e6ec9a2ddbc22b3dbdd947fe5bbad7284bd819 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ jdk:
 
 install: "mvn clean install -DskipTests=true -B -V -Pci-build"
 
-script: "mvn clean install -B -V -Pit-js -Pci-build"
+script: "mvn clean install -B -V -Pci-build"
 
 cache:
     directories:

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/app-routing.module.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/app-routing.module.ts
index 186a69853b6551c867f4db03d95f37b275f0ab07..3a7666531e46c65eb613e8cbd68955e1e5d549de 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/app-routing.module.ts
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/app-routing.module.ts
@@ -27,7 +27,6 @@ import { LoginComponent } from "./modules/shared/login/login.component";
 import { SearchComponent } from './modules/repo/search/search.component';
 import {BrowseComponent} from "./modules/repo/browse/browse.component";
 import {UploadComponent} from "./modules/repo/upload/upload.component";
-import {ManageUsersComponent} from "./modules/user/manage-users/manage-users.component";
 import {ManageRolesComponent} from "./modules/user/manage-roles/manage-roles.component";
 import {SecurityConfigurationComponent} from "./modules/user/security-configuration/security-configuration.component";
 import {ManageUsersListComponent} from "./modules/user/users/manage-users-list/manage-users-list.component";
@@ -35,6 +34,8 @@ import {ManageUsersAddComponent} from "./modules/user/users/manage-users-add/man
 import {ManageUsersEditComponent} from "./modules/user/users/manage-users-edit/manage-users-edit.component";
 import {RoutingGuardService as Guard} from "./services/routing-guard.service";
 import {ManageUsersDeleteComponent} from "./modules/user/users/manage-users-delete/manage-users-delete.component";
+import {UserModule} from "./modules/user/user.module";
+import { ManageUsersComponent } from './modules/user/users/manage-users/manage-users.component';
 
 /**
  * You can use Guard (RoutingGuardService) for permission checking. The service needs data with one parameter 'perm',

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/user/user.module.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/user/user.module.ts
index 9897c1f1da0abf63a503d1ed75b12206a65af19c..1e9cc5197612f22976d4ae64633b8651b4876a84 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/user/user.module.ts
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/user/user.module.ts
@@ -18,7 +18,7 @@
 
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import {ManageUsersComponent} from "./manage-users/manage-users.component";
+import {ManageUsersComponent} from "./users/manage-users/manage-users.component";
 import {ManageUsersListComponent} from "./users/manage-users-list/manage-users-list.component";
 import {ManageUsersAddComponent} from "./users/manage-users-add/manage-users-add.component";
 import {ManageUsersEditComponent} from "./users/manage-users-edit/manage-users-edit.component";