Revision c52a98a0
Added by Cherian Mathew over 9 years ago
| .gitattributes | ||
|---|---|---|
| 1 | 1 |
* text=auto !eol |
| 2 | 2 |
ide/eclipse/cdm-vaadin.launch -text |
| 3 | 3 |
/pom.xml -text |
| 4 |
src/main/java/eu/etaxonomy/AppWidgetSet.gwt.xml -text |
|
| 5 | 4 |
src/main/java/eu/etaxonomy/MyVaadinUI.java -text |
| 6 | 5 |
src/main/java/eu/etaxonomy/cdm/remote/config/AbstractWebApplicationConfigurer.java -text |
| 7 | 6 |
src/main/java/eu/etaxonomy/cdm/remote/config/DataSourceConfigurer.java -text |
| 8 | 7 |
src/main/java/eu/etaxonomy/cdm/remote/config/DataSourceProperties.java -text |
| 9 | 8 |
src/main/java/eu/etaxonomy/cdm/remote/config/LoggingConfigurer.java -text |
| 9 |
src/main/java/eu/etaxonomy/cdm/vaadin/AppWidgetSet.gwt.xml -text |
|
| 10 | 10 |
src/main/java/eu/etaxonomy/cdm/vaadin/CdmAppInitializer.java.bkp -text |
| 11 | 11 |
src/main/java/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainer.java -text |
| 12 | 12 |
src/main/java/eu/etaxonomy/cdm/vaadin/presenter/AuthenticationPresenter.java -text |
| pom.xml | ||
|---|---|---|
| 5 | 5 |
<groupId>eu.etaxonomy</groupId> |
| 6 | 6 |
<artifactId>cdm-vaadin</artifactId> |
| 7 | 7 |
<packaging>war</packaging> |
| 8 |
<version>0.9</version>
|
|
| 8 |
<version>3.4.0-SNAPSHOT</version>
|
|
| 9 | 9 |
<name>Vaadin Web Application</name> |
| 10 | 10 |
|
| 11 | 11 |
<properties> |
| 12 | 12 |
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
| 13 | 13 |
<vaadin.version>7.3.5</vaadin.version> |
| 14 | 14 |
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
|
| 15 |
<cdmlib.version>3.4.0-SNAPSHOT</cdmlib.version>
|
|
| 15 |
<cdmlib.version>${version}</cdmlib.version>
|
|
| 16 | 16 |
<unitils.version>3.3</unitils.version> |
| 17 | 17 |
</properties> |
| 18 | 18 |
<repositories> |
| ... | ... | |
| 116 | 116 |
<groupId>eu.etaxonomy</groupId> |
| 117 | 117 |
<artifactId>cdmlib-services</artifactId> |
| 118 | 118 |
<version>${cdmlib.version}</version>
|
| 119 |
<scope>provided</scope> |
|
| 119 | 120 |
</dependency> |
| 120 | 121 |
|
| 121 | 122 |
<dependency> |
| 122 | 123 |
<groupId>eu.etaxonomy</groupId> |
| 123 | 124 |
<artifactId>cdmlib-model</artifactId> |
| 124 | 125 |
<version>${cdmlib.version}</version>
|
| 126 |
<scope>provided</scope> |
|
| 125 | 127 |
</dependency> |
| 126 | 128 |
<dependency> |
| 127 | 129 |
<groupId>eu.etaxonomy</groupId> |
| ... | ... | |
| 146 | 148 |
<artifactId>spring-mock</artifactId> |
| 147 | 149 |
</exclusion> |
| 148 | 150 |
</exclusions> |
| 151 |
<scope>provided</scope> |
|
| 149 | 152 |
</dependency> |
| 150 | 153 |
<dependency> |
| 151 | 154 |
<groupId>com.thoughtworks.xstream</groupId> |
| 152 | 155 |
<artifactId>xstream</artifactId> |
| 153 | 156 |
<version>1.4.4</version> |
| 157 |
<scope>provided</scope> |
|
| 154 | 158 |
</dependency> |
| 155 |
|
|
| 156 |
<!-- <dependency> --> |
|
| 157 |
<!-- <groupId>org.eclipse.jetty.websocket</groupId> --> |
|
| 158 |
<!-- <artifactId>websocket-server</artifactId> --> |
|
| 159 |
<!-- <version>9.2.5.v20141112</version> --> |
|
| 160 |
<!-- </dependency> --> |
|
| 161 |
|
|
| 162 | 159 |
<dependency> |
| 163 | 160 |
<groupId>org.springframework</groupId> |
| 164 | 161 |
<artifactId>spring-mock</artifactId> |
| 165 | 162 |
<version>2.0.8</version> |
| 163 |
<scope>provided</scope> |
|
| 166 | 164 |
</dependency> |
| 167 | 165 |
<dependency> |
| 168 | 166 |
<groupId>org.springframework</groupId> |
| 169 | 167 |
<artifactId>spring-context-support</artifactId> |
| 170 | 168 |
<version>3.2.2.RELEASE</version> |
| 169 |
<scope>provided</scope> |
|
| 171 | 170 |
</dependency> |
| 172 | 171 |
<dependency> |
| 173 | 172 |
<groupId>org.springframework</groupId> |
| 174 | 173 |
<artifactId>org.springframework.web</artifactId> |
| 175 | 174 |
<version>3.2.2.RELEASE</version> |
| 175 |
<scope>provided</scope> |
|
| 176 | 176 |
</dependency> |
| 177 | 177 |
<dependency> |
| 178 | 178 |
<groupId>org.springframework</groupId> |
| 179 | 179 |
<artifactId>org.springframework.web.servlet</artifactId> |
| 180 | 180 |
<version>3.2.2.RELEASE</version> |
| 181 |
<scope>provided</scope> |
|
| 181 | 182 |
</dependency> |
| 182 | 183 |
<dependency> |
| 183 | 184 |
<groupId>junit</groupId> |
| ... | ... | |
| 334 | 335 |
<groupId>org.slf4j</groupId> |
| 335 | 336 |
<artifactId>slf4j-log4j12</artifactId> |
| 336 | 337 |
<version>1.7.2</version> |
| 338 |
<scope>provided</scope> |
|
| 337 | 339 |
</dependency> |
| 338 | 340 |
<dependency> |
| 339 | 341 |
<groupId>org.slf4j</groupId> |
| 340 | 342 |
<artifactId>slf4j-api</artifactId> |
| 341 | 343 |
<version>1.7.2</version> |
| 344 |
<scope>provided</scope> |
|
| 342 | 345 |
</dependency> |
| 343 | 346 |
</dependencies> |
| 344 | 347 |
|
| ... | ... | |
| 418 | 421 |
</execution> |
| 419 | 422 |
</executions> |
| 420 | 423 |
</plugin> |
| 424 |
|
|
| 421 | 425 |
<plugin> |
| 422 | 426 |
<groupId>org.eclipse.jetty</groupId> |
| 423 | 427 |
<artifactId>jetty-maven-plugin</artifactId> |
| 424 | 428 |
<version>9.2.3.v20140905</version> |
| 425 |
</plugin> |
|
| 426 |
|
|
| 427 |
|
|
| 428 |
<plugin> |
|
| 429 |
<groupId>org.mortbay.jetty</groupId> |
|
| 430 |
<artifactId>jetty-maven-plugin</artifactId> |
|
| 431 | 429 |
<configuration> |
| 432 | 430 |
<scanIntervalSeconds>10</scanIntervalSeconds> |
| 433 | 431 |
<stopPort>8005</stopPort> |
| 434 | 432 |
<stopKey>STOP</stopKey> |
| 433 |
<useProvidedScope>true</useProvidedScope> |
|
| 434 |
<webApp> |
|
| 435 |
<descriptor>${project.basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
|
|
| 436 |
</webApp> |
|
| 435 | 437 |
</configuration> |
| 436 | 438 |
<executions> |
| 437 | 439 |
<execution> |
| src/main/java/eu/etaxonomy/AppWidgetSet.gwt.xml | ||
|---|---|---|
| 1 |
<?xml version="1.0" encoding="UTF-8"?> |
|
| 2 |
<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.5.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.5.1/distro-source/core/src/gwt-module.dtd"> |
|
| 3 |
<module> |
|
| 4 |
<!-- |
|
| 5 |
This file is automatically updated based on new dependencies by the |
|
| 6 |
goal "vaadin:update-widgetset". |
|
| 7 |
--> |
|
| 8 |
|
|
| 9 |
<!-- Inherit DefaultWidgetSet --> |
|
| 10 |
<inherits name="com.vaadin.DefaultWidgetSet" /> |
|
| 11 |
|
|
| 12 |
<!-- |
|
| 13 |
Uncomment the following to compile the widgetset for one browser only. |
|
| 14 |
|
|
| 15 |
Multiple browsers can be specified as a comma separated list. The |
|
| 16 |
supported user agents at the moment of writing were: |
|
| 17 |
ie8,ie9,gecko1_8,safari,opera |
|
| 18 |
|
|
| 19 |
The value gecko1_8 is used for Firefox and safari is used for webkit |
|
| 20 |
based browsers including Google Chrome. |
|
| 21 |
--> |
|
| 22 |
<!-- <set-property name="user.agent" value="safari"/> --> |
|
| 23 |
|
|
| 24 |
<!-- |
|
| 25 |
To enable SuperDevMode, uncomment this line. |
|
| 26 |
|
|
| 27 |
See https://vaadin.com/wiki/-/wiki/Main/Using%20SuperDevMode for more |
|
| 28 |
information and instructions. |
|
| 29 |
--> |
|
| 30 |
<!-- <set-configuration-property name="devModeRedirectEnabled" value="true" /> --> |
|
| 31 |
|
|
| 32 |
</module> |
|
| src/main/java/eu/etaxonomy/cdm/vaadin/AppWidgetSet.gwt.xml | ||
|---|---|---|
| 1 |
<?xml version="1.0" encoding="UTF-8"?> |
|
| 2 |
<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.5.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.5.1/distro-source/core/src/gwt-module.dtd"> |
|
| 3 |
<module> |
|
| 4 |
<!-- |
|
| 5 |
This file is automatically updated based on new dependencies by the |
|
| 6 |
goal "vaadin:update-widgetset". |
|
| 7 |
--> |
|
| 8 |
|
|
| 9 |
<!-- Inherit DefaultWidgetSet --> |
|
| 10 |
<inherits name="com.vaadin.DefaultWidgetSet" /> |
|
| 11 |
|
|
| 12 |
<!-- |
|
| 13 |
Uncomment the following to compile the widgetset for one browser only. |
|
| 14 |
|
|
| 15 |
Multiple browsers can be specified as a comma separated list. The |
|
| 16 |
supported user agents at the moment of writing were: |
|
| 17 |
ie8,ie9,gecko1_8,safari,opera |
|
| 18 |
|
|
| 19 |
The value gecko1_8 is used for Firefox and safari is used for webkit |
|
| 20 |
based browsers including Google Chrome. |
|
| 21 |
--> |
|
| 22 |
<!-- <set-property name="user.agent" value="safari"/> --> |
|
| 23 |
|
|
| 24 |
<!-- |
|
| 25 |
To enable SuperDevMode, uncomment this line. |
|
| 26 |
|
|
| 27 |
See https://vaadin.com/wiki/-/wiki/Main/Using%20SuperDevMode for more |
|
| 28 |
information and instructions. |
|
| 29 |
--> |
|
| 30 |
<!-- <set-configuration-property name="devModeRedirectEnabled" value="true" /> --> |
|
| 31 |
|
|
| 32 |
|
|
| 33 |
|
|
| 34 |
</module> |
|
Also available in: Unified diff
changed version to match cdmlib.
changed dependency library to provided scope.
changed maven jetty version to the eclipse one
moved widgetset to vaadin package to have vaddin code in a unique namespace