Permalink
Browse files

fixed paths to image resources

created favicon.ico (ugly)
fixed web.xml to use default servlet
removed mapping to mvc resources in spring config
  • Loading branch information...
1 parent 737e986 commit 94d5912d3a20c0cfaec8d8604ad6dbdef0324d77 tomek committed Jul 26, 2012
@@ -20,7 +20,7 @@ qx.Class.define('helenos.components.ExceptionWindow',
caption: 'Error occured', modal: true});
this.setLayout(new qx.ui.layout.VBox(10, 'top'));
- this._label = new qx.ui.basic.Atom('<b>Remote server returned an error!', 'qx/icon/Oxygen/32/status/dialog-warning.png');
+ this._label = new qx.ui.basic.Atom('<b>Remote server returned an error!', 'icon/32/status/dialog-warning.png');
this._textArea = new qx.ui.form.TextArea();
this._textArea.setMinHeight(200);
@@ -20,26 +20,26 @@ qx.Class.define("helenos.components.menu.ColumnFamilyContextMenu",
{
this.base(arguments);
- var propsButton = new qx.ui.menu.Button("Properties", "qx/icon/Oxygen/16/status/dialog-information.png");
+ var propsButton = new qx.ui.menu.Button("Properties", "icon/16/status/dialog-information.png");
propsButton.setUserData('KSNAME', ksName);
propsButton.setUserData('CFNAME', cfName);
propsButton.addListener("execute", this.__showProperties);
this.add(propsButton);
- var viewDataButton = new qx.ui.menu.Button("View data", "qx/icon/Oxygen/16/apps/office-spreadsheet.png");
+ var viewDataButton = new qx.ui.menu.Button("View data", "icon/16/apps/office-spreadsheet.png");
viewDataButton.setUserData('KSNAME', ksName);
viewDataButton.setUserData('CFNAME', cfName);
this.add(viewDataButton);
this.add(new qx.ui.menu.Separator());
- var dropButton = new qx.ui.menu.Button("Drop", "qx/icon/Oxygen/16/actions/edit-delete.png");
+ var dropButton = new qx.ui.menu.Button("Drop", "icon/16/actions/edit-delete.png");
dropButton.setUserData('KSNAME', ksName);
dropButton.setUserData('CFNAME', cfName);
dropButton.addListener("execute", this.__dropColumnFamily);
this.add(dropButton);
- var truncateButton = new qx.ui.menu.Button("Truncate", "qx/icon/Oxygen/16/actions/edit-clear.png");
+ var truncateButton = new qx.ui.menu.Button("Truncate", "icon/16/actions/edit-clear.png");
truncateButton.setUserData('KSNAME', ksName);
truncateButton.setUserData('CFNAME', cfName);
truncateButton.addListener("execute", this.__truncateColumnFamily);
@@ -19,19 +19,19 @@ qx.Class.define("helenos.components.menu.KeyspaceContextMenu",
{
this.base(arguments);
- var propsButton = new qx.ui.menu.Button("Properties", "qx/icon/Oxygen/16/status/dialog-information.png");
+ var propsButton = new qx.ui.menu.Button("Properties", "icon/16/status/dialog-information.png");
propsButton.setUserData('KSNAME', ksName);
propsButton.addListener("execute", this.__showProperties);
this.add(propsButton);
this.add(new qx.ui.menu.Separator());
- var addCFButton = new qx.ui.menu.Button("Add column family", "qx/icon/Oxygen/16/actions/list-add.png");
+ var addCFButton = new qx.ui.menu.Button("Add column family", "icon/16/actions/list-add.png");
addCFButton.setUserData('KSNAME', ksName);
addCFButton.addListener("execute", this.__addColumnFamily);
this.add(addCFButton);
- var dropButton = new qx.ui.menu.Button("Drop", "qx/icon/Oxygen/16/actions/edit-delete.png");
+ var dropButton = new qx.ui.menu.Button("Drop", "icon/16/actions/edit-delete.png");
dropButton.setUserData('KSNAME', ksName);
dropButton.addListener("execute", this.__dropKeyspace);
this.add(dropButton);
@@ -25,7 +25,7 @@ qx.Class.define("helenos.components.tab.WelcomePage",
this.base(arguments);
this.set({
label: 'Welcome',
- icon: 'qx/icon/Oxygen/16/places/user-home.png',
+ icon: 'icon/16/places/user-home.png',
layout: new qx.ui.layout.VBox(3, 'top')
});
@@ -3,6 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Helenos</title>
+ <link rel="icon" type="image/ico" href="/helenos/resource/favicon.ico"/>
<script type="text/javascript" src="script/helenos.js"></script>
</head>
<body></body>
Binary file not shown.
@@ -8,16 +8,7 @@
<context:annotation-config />
<context:component-scan base-package="com.kuprowski.helenos.service"/>
<context:property-placeholder system-properties-mode="OVERRIDE" location="WEB-INF/helenos.properties"/>
-
- <!--
- <mvc:resources mapping="/resources/**" location="/, classpath:/META-INF/public-web-resources/"/>
-
- <bean id="requestHandlerAdapter" class="org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter" />
-
- <bean id="multiActionMethodNameResolver" class="org.springframework.web.servlet.mvc.multiaction.ParameterMethodNameResolver"
- p:paramName="action" />
- -->
<bean id="mapper" class="org.dozer.DozerBeanMapper" scope="singleton">
<property name="mappingFiles">
<list>
@@ -15,6 +15,4 @@
<property name="service" ref="queryProvider"/>
<property name="serviceInterface" value="com.kuprowski.helenos.service.QueryProvider"/>
</bean>
-
- <mvc:resources mapping="/helenos/**" location="/helenos/" />
</beans>
@@ -41,11 +41,17 @@
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
+
<servlet-mapping>
<servlet-name>helenos</servlet-name>
- <url-pattern>/*</url-pattern>
+ <url-pattern>*.json</url-pattern>
</servlet-mapping>
-
+
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+
<session-config>
<session-timeout>15</session-timeout>
</session-config>
View
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>Helenos</title>
+ <body>
+ <script language='javascript' type='text/javascript'>
+ window.location.href='helenos/index.html';
+ </script>
+ </body>
+</html>

0 comments on commit 94d5912

Please sign in to comment.