Skip to content

Commit 0358d00

Browse files
committed
Vaadin 7 compatible version
1 parent 59895b3 commit 0358d00

30 files changed

+699
-707
lines changed

.classpath

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
<attribute name="owner.project.facets" value="java"/>
99
</attributes>
1010
</classpathentry>
11-
<classpathentry kind="lib" path="build/lib/gwt-dev.jar"/>
12-
<classpathentry kind="lib" path="build/lib/gwt-user.jar"/>
11+
<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=ImageViewer7&amp;ivyXmlPath=ivy.xml&amp;confs=default">
12+
<attributes>
13+
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
14+
</attributes>
15+
</classpathentry>
16+
<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=ImageViewer7&amp;ivyXmlPath=ivy.xml&amp;confs=widgetset-compile"/>
1317
<classpathentry kind="output" path="build/classes"/>
1418
</classpath>

.project

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>ImageViewer6Final</name>
3+
<name>ImageViewer7</name>
44
<comment></comment>
55
<projects>
66
</projects>
@@ -38,5 +38,6 @@
3838
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
3939
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
4040
<nature>com.vaadin.integration.eclipse.widgetsetNature</nature>
41+
<nature>org.apache.ivyde.eclipse.ivynature</nature>
4142
</natures>
4243
</projectDescription>

.settings/com.vaadin.integration.eclipse.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#Fri Jan 25 09:35:15 EET 2013
1+
#Fri Jan 25 15:13:32 EET 2013
22
com.vaadin.integration.eclipse.useLatestNightly=false
33
com.vaadin.integration.eclipse.widgetsetBuildsSuspended=true
4-
com.vaadin.integration.eclipse.widgetsetCompilationEta=82516
5-
com.vaadin.integration.eclipse.widgetsetDirty=true
4+
com.vaadin.integration.eclipse.widgetsetCompilationEta=99034
5+
com.vaadin.integration.eclipse.widgetsetDirty=false
66
com.vaadin.integration.eclipse.widgetsetParallelism=3
77
com.vaadin.integration.eclipse.widgetsetStyle=OBF
88
com.vaadin.integration.eclipse.widgetsetVerbose=true
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
@import url(../reindeer/legacy-styles.css);
2+
3+
.licence {
4+
font-style: italic;
5+
font-size: 9px;
6+
line-height: 10px;
7+
}
8+
.v-orderedlayout-margin-top,
9+
.v-horizontallayout-margin-top,
10+
.v-verticallayout-margin-top {
11+
padding-top: 5px;
12+
}
13+
.v-orderedlayout-margin-right,
14+
.v-horizontallayout-margin-right,
15+
.v-verticallayout-margin-right {
16+
padding-right: 5px;
17+
}
18+
.v-orderedlayout-margin-bottom,
19+
.v-horizontallayout-margin-bottom,
20+
.v-verticallayout-margin-bottom {
21+
padding-bottom: 5px;
22+
}
23+
.v-orderedlayout-margin-left,
24+
.v-horizontallayout-margin-left,
25+
.v-verticallayout-margin-left {
26+
padding-left: 5px;
27+
}
28+
.v-orderedlayout-spacing-on,
29+
.v-horizontallayout-spacing-on,
30+
.v-verticallayout-spacing-on {
31+
padding-top: 3px;
32+
padding-left: 3px;
33+
}
-4.82 MB
Binary file not shown.

WebContent/WEB-INF/web.xml

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
3-
<display-name>ImageViewer6Final</display-name>
4-
<context-param>
5-
<description>
6-
Vaadin production mode</description>
7-
<param-name>productionMode</param-name>
8-
<param-value>false</param-value>
9-
</context-param>
10-
<servlet>
11-
<servlet-name>ImageViewerDemo</servlet-name>
12-
<servlet-class>
13-
com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
14-
<init-param>
15-
<param-name>application</param-name>
16-
<param-value>org.vaadin.tepi.imageviewer.demo.ImageViewerDemoApplication</param-value>
17-
</init-param>
18-
<init-param>
19-
<param-name>widgetset</param-name>
20-
<param-value>org.vaadin.tepi.imageviewer.widgetset.ImageViewerWidgetset</param-value>
21-
</init-param>
22-
</servlet>
23-
<servlet-mapping>
24-
<servlet-name>ImageViewerDemo</servlet-name>
25-
<url-pattern>/*</url-pattern>
26-
</servlet-mapping>
27-
<welcome-file-list>
28-
<welcome-file>index.html</welcome-file>
29-
<welcome-file>index.htm</welcome-file>
30-
<welcome-file>index.jsp</welcome-file>
31-
<welcome-file>default.html</welcome-file>
32-
<welcome-file>default.htm</welcome-file>
33-
<welcome-file>default.jsp</welcome-file>
34-
</welcome-file-list>
35-
</web-app>
2+
<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
3+
<display-name>ImageViewer7Final</display-name>
4+
<context-param>
5+
<description>
6+
Vaadin production mode</description>
7+
<param-name>productionMode</param-name>
8+
<param-value>false</param-value>
9+
</context-param>
10+
<servlet>
11+
<servlet-name>Imageviewer7final Application</servlet-name>
12+
<servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
13+
<init-param>
14+
<description>
15+
Vaadin UI class to use</description>
16+
<param-name>UI</param-name>
17+
<param-value>org.vaadin.tepi.imageviewer.demo.ImageViewerDemoUI</param-value>
18+
</init-param>
19+
<init-param>
20+
<description>
21+
Application widgetset</description>
22+
<param-name>widgetset</param-name>
23+
<param-value>org.vaadin.tepi.imageviewer.widgetset.ImageViewerWidgetset</param-value>
24+
</init-param>
25+
</servlet>
26+
<servlet-mapping>
27+
<servlet-name>Imageviewer7final Application</servlet-name>
28+
<url-pattern>/*</url-pattern>
29+
</servlet-mapping>
30+
<welcome-file-list>
31+
<welcome-file>index.html</welcome-file>
32+
<welcome-file>index.htm</welcome-file>
33+
<welcome-file>index.jsp</welcome-file>
34+
<welcome-file>default.html</welcome-file>
35+
<welcome-file>default.htm</welcome-file>
36+
<welcome-file>default.jsp</welcome-file>
37+
</welcome-file-list>
38+
</web-app>

build/build.properties

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
result-path=build/result
2-
gwt.lib.dir=build/lib
32
src.package.dir=org/vaadin/tepi/imageviewer
43
demo.src.base=src/org/vaadin/tepi/imageviewer/demo
54

6-
version=0.4.2
5+
temp.lib.dir=build/templib
6+
web.xml.location=WebContent/WEB-INF/web.xml
7+
webcontent.dir=WebContent
8+
webcontent.widgetset.dir=VAADIN/widgetsets/
9+
webcontent.theme.dir=VAADIN/themes/
10+
documentation.dir=doc
11+
12+
dependency.gwt-image-loader.dir=WebContent/WEB-INF/lib
13+
dependency.gwt-image-loader=gwt-image-loader-1.1.4.jar
14+
15+
version=0.5.1.v7
716
addon.name=imageviewer
817
addon.title=ImageViewer
918
addon.vendor=Teppo Kurki
1019
addon.widgetset=org.vaadin.tepi.imageviewer.widgetset.ImageViewerWidgetset
1120
addon.license=Apache License 2.0
12-
13-
dependency.gwt-image-loader=gwt-image-loader-1.1.4.jar
14-
dependency.gwt-image-loader.dir=WebContent/WEB-INF/lib

0 commit comments

Comments
 (0)