diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-07-18 11:39:27 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-07-18 11:39:27 +0530 |
| commit | 258966e92fcbd101f28d54e7c852364f210704d9 (patch) | |
| tree | 52ee6f31c33fb08c45661ea313547f06d32a1e69 /src/com.gluster.storage.management.server/WebContent/WEB-INF | |
| parent | b4f1bd556d85e3638989200867c42219e114bc72 (diff) | |
| parent | 4290f5519fb7480df6c5919583efc1f7feebf4b3 (diff) | |
Merge branch 'master' of git@github.com:gluster/console
Conflicts:
src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickPage.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractTableTreeViewerPage.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/DisksPage.java
Diffstat (limited to 'src/com.gluster.storage.management.server/WebContent/WEB-INF')
| -rw-r--r-- | src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml b/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml index 7c20d6c7..405c4e40 100644 --- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml +++ b/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml @@ -81,14 +81,14 @@ <filter-name>springSecurityFilterChain</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - + <security-constraint> - <web-resource-collection> - <web-resource-name>Gluster Management Gateway</web-resource-name> - <url-pattern>/*</url-pattern> - </web-resource-collection> - <user-data-constraint> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - </user-data-constraint> -</security-constraint> + <web-resource-collection> + <web-resource-name>Gluster Management Gateway</web-resource-name> + <url-pattern>/*</url-pattern> + </web-resource-collection> + <user-data-constraint> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + </user-data-constraint> + </security-constraint> </web-app> |