Skip to content

Commit c580f15

Browse files
tltvtltv
committed
Refactored demo app into its own module
Updated to Vaadin 8.0.6
1 parent f336949 commit c580f15

37 files changed

+617
-351
lines changed

‎pom.xml

Lines changed: 13 additions & 310 deletions
Original file line numberDiff line numberDiff line change
@@ -4,316 +4,19 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<groupId>org.vaadin.tltv</groupId>
7-
<artifactId>vprocjs</artifactId>
8-
<packaging>jar</packaging>
9-
<version>3.0.0</version>
10-
<name>ProcessingJs for Vaadin 7</name>
11-
12-
<properties>
13-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<vaadin.version>8.0.3</vaadin.version>
15-
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
16-
<jetty.plugin.version>9.3.9.v20160517</jetty.plugin.version>
17-
<vaadin.widgetset.mode>local</vaadin.widgetset.mode>
18-
<maven.compiler.source>1.8</maven.compiler.source>
19-
<maven.compiler.target>1.8</maven.compiler.target>
20-
<!-- ZIP Manifest fields -->
21-
<Implementation-Version>${project.version}</Implementation-Version>
22-
<!-- Must not change this because of the Directory -->
23-
<Implementation-Title>${project.name}</Implementation-Title>
24-
<Implementation-Vendor>tltv</Implementation-Vendor>
25-
<Vaadin-License-Title>Apache License 2.0</Vaadin-License-Title>
26-
<Vaadin-Addon>${project.artifactId}-${project.version}.jar</Vaadin-Addon>
27-
</properties>
28-
29-
<licenses>
30-
<license>
31-
<name>Apache 2</name>
32-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
33-
<distribution>repo</distribution>
34-
</license>
35-
</licenses>
36-
37-
<repositories>
38-
<repository>
39-
<id>vaadin-addons</id>
40-
<url>http://maven.vaadin.com/vaadin-addons</url>
41-
</repository>
42-
</repositories>
43-
44-
<dependencyManagement>
45-
<dependencies>
46-
<dependency>
47-
<groupId>com.vaadin</groupId>
48-
<artifactId>vaadin-bom</artifactId>
49-
<version>${vaadin.version}</version>
50-
<type>pom</type>
51-
<scope>import</scope>
52-
</dependency>
53-
</dependencies>
54-
</dependencyManagement>
55-
56-
<dependencies>
57-
<dependency>
58-
<groupId>com.vaadin</groupId>
59-
<artifactId>vaadin-server</artifactId>
60-
</dependency>
61-
<dependency>
62-
<groupId>com.vaadin</groupId>
63-
<artifactId>vaadin-client-compiled</artifactId>
64-
</dependency>
65-
<dependency>
66-
<groupId>com.vaadin</groupId>
67-
<artifactId>vaadin-client</artifactId>
68-
</dependency>
69-
<dependency>
70-
<groupId>com.vaadin</groupId>
71-
<artifactId>vaadin-themes</artifactId>
72-
</dependency>
73-
<dependency>
74-
<groupId>com.vaadin</groupId>
75-
<artifactId>vaadin-client-compiler</artifactId>
76-
<exclusions>
77-
<exclusion>
78-
<groupId>org.eclipse.jetty</groupId>
79-
<artifactId>apache-jsp</artifactId>
80-
</exclusion>
81-
</exclusions>
82-
</dependency>
83-
84-
<dependency>
85-
<groupId>com.vaadin</groupId>
86-
<artifactId>vaadin-compatibility-server</artifactId>
87-
</dependency>
88-
<dependency>
89-
<groupId>com.vaadin</groupId>
90-
<artifactId>vaadin-compatibility-client</artifactId>
91-
</dependency>
92-
<dependency>
93-
<groupId>com.vaadin</groupId>
94-
<artifactId>vaadin-compatibility-shared</artifactId>
95-
</dependency>
96-
97-
<dependency>
98-
<groupId>javax.servlet</groupId>
99-
<artifactId>javax.servlet-api</artifactId>
100-
<version>3.1.0</version>
101-
<scope>provided</scope>
102-
</dependency>
103-
<dependency>
104-
<groupId>org.apache.commons</groupId>
105-
<artifactId>commons-lang3</artifactId>
106-
<version>3.0</version>
107-
</dependency>
108-
109-
</dependencies>
110-
111-
<build>
112-
<plugins>
113-
<plugin>
114-
<groupId>org.apache.maven.plugins</groupId>
115-
<artifactId>maven-compiler-plugin</artifactId>
116-
<version>3.6.1</version>
117-
<configuration>
118-
<source>1.8</source>
119-
<target>1.8</target>
120-
</configuration>
121-
</plugin>
122-
123-
<plugin>
124-
<groupId>org.apache.maven.plugins</groupId>
125-
<artifactId>maven-jar-plugin</artifactId>
126-
<version>3.0.2</version>
127-
<configuration>
128-
<archive>
129-
<index>true</index>
130-
<manifest>
131-
<addClasspath>true</addClasspath>
132-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
133-
</manifest>
134-
<manifestEntries>
135-
<!-- Package format version - do not change -->
136-
<Vaadin-Package-Version>1</Vaadin-Package-Version>
137-
<Vaadin-License-Title>${Vaadin-License-Title}</Vaadin-License-Title>
138-
<Vaadin-Widgetsets>org.vaadin.tltv.vprocjs.gwt.ProcessingJsWidgetset</Vaadin-Widgetsets>
139-
<Vaadin-Stylesheets>${Vaadin-Stylesheets}</Vaadin-Stylesheets>
140-
</manifestEntries>
141-
</archive>
142-
</configuration>
143-
</plugin>
144-
145-
<plugin>
146-
<groupId>org.apache.maven.plugins</groupId>
147-
<artifactId>maven-javadoc-plugin</artifactId>
148-
<version>2.10.4</version>
149-
<executions>
150-
<execution>
151-
<id>attach-javadocs</id>
152-
<goals>
153-
<goal>jar</goal>
154-
</goals>
155-
<configuration>
156-
<additionalparam>-Xdoclint:none</additionalparam>
157-
</configuration>
158-
</execution>
159-
</executions>
160-
</plugin>
161-
162-
<plugin>
163-
<groupId>org.apache.maven.plugins</groupId>
164-
<artifactId>maven-source-plugin</artifactId>
165-
<version>3.0.1</version>
166-
<executions>
167-
<execution>
168-
<id>attach-sources</id>
169-
<goals>
170-
<goal>jar</goal>
171-
</goals>
172-
</execution>
173-
</executions>
174-
</plugin>
175-
176-
<plugin>
177-
<groupId>org.apache.maven.plugins</groupId>
178-
<artifactId>maven-assembly-plugin</artifactId>
179-
<version>3.0.0</version>
180-
<configuration>
181-
<appendAssemblyId>false</appendAssemblyId>
182-
<descriptors>
183-
<descriptor>assembly/assembly.xml</descriptor>
184-
</descriptors>
185-
</configuration>
186-
<executions>
187-
<execution>
188-
<goals>
189-
<goal>single</goal>
190-
</goals>
191-
<phase>install</phase>
192-
</execution>
193-
</executions>
194-
</plugin>
195-
196-
<plugin>
197-
<groupId>org.apache.maven.plugins</groupId>
198-
<artifactId>maven-surefire-plugin</artifactId>
199-
<version>2.19.1</version>
200-
</plugin>
201-
202-
<plugin>
203-
<groupId>org.eclipse.jetty</groupId>
204-
<artifactId>jetty-maven-plugin</artifactId>
205-
<version>${jetty.plugin.version}</version>
206-
<configuration>
207-
<scanIntervalSeconds>2</scanIntervalSeconds>
208-
<contextPath>/</contextPath>
209-
</configuration>
210-
</plugin>
211-
212-
<plugin>
213-
<groupId>com.vaadin</groupId>
214-
<artifactId>vaadin-maven-plugin</artifactId>
215-
<version>${vaadin.plugin.version}</version>
216-
<configuration>
217-
<extraJvmArgs>-Xmx1G -Xss1G</extraJvmArgs>
218-
<webappDirectory>${basedir}/src/main/webapp/VAADIN/widgetsets</webappDirectory>
219-
<hostedWebapp>${basedir}/src/main/webapp/VAADIN/widgetsets</hostedWebapp>
220-
<noServer>true</noServer>
221-
<persistentunitcachedir>${basedir}/target/tmp/gwt-unitCache</persistentunitcachedir>
222-
<compileReport>true</compileReport>
223-
<strict>true</strict>
224-
<runTarget>http://localhost:8080/</runTarget>
225-
</configuration>
226-
<executions>
227-
<execution>
228-
<goals>
229-
<goal>resources</goal>
230-
<goal>update-theme</goal>
231-
<goal>update-widgetset</goal>
232-
<goal>compile</goal>
233-
<!-- Comment out compile-theme goal to use on-the-fly theme compilation -->
234-
<!-- >goal>compile-theme</goal-->
235-
</goals>
236-
</execution>
237-
</executions>
238-
</plugin>
239-
<plugin>
240-
<groupId>org.apache.maven.plugins</groupId>
241-
<artifactId>maven-war-plugin</artifactId>
242-
<version>3.0.0</version>
243-
<configuration>
244-
<failOnMissingWebXml>false</failOnMissingWebXml>
245-
<!-- Exclude an unnecessary file generated by the GWT compiler. -->
246-
<packagingExcludes>
247-
WEB-INF/classes/VAADIN/widgetsets/WEB-INF/**,
248-
**/VAADIN/gwt-unitCache/**,
249-
**/VAADIN/widgetsets/WEB-INF/**,
250-
**/WEB-INF/lib/servlet-api-*.jar,
251-
**/WEB-INF/lib/vaadin-client-compiler-*.jar,
252-
**/WEB-INF/lib/jetty-*.jar,
253-
**/WEB-INF/lib/ant-*.jar,
254-
**/WEB-INF/lib/gwt-dev-*.jar,
255-
**/WEB-INF/classes/gwt-unitCache/**,
256-
**/WEB-INF/classes/themes/**,
257-
**/WEB-INF/classes/widgetsets/**
258-
</packagingExcludes>
259-
</configuration>
260-
</plugin>
261-
</plugins>
262-
263-
<resources>
264-
<resource>
265-
<directory>src/main/java</directory>
266-
<excludes>
267-
<exclude>rebel.xml</exclude>
268-
</excludes>
269-
</resource>
270-
<resource>
271-
<directory>src/main/resources</directory>
272-
</resource>
273-
</resources>
274-
</build>
7+
<artifactId>vprocjs-root</artifactId>
8+
<packaging>pom</packaging>
9+
<version>3.1.0</version>
10+
<name>ProcessingJs Add-on Root Project</name>
11+
12+
13+
<prerequisites>
14+
<maven>3</maven>
15+
</prerequisites>
27516

276-
<profiles>
277-
<profile>
278-
<!-- Vaadin pre-release repositories -->
279-
<id>vaadin-prerelease</id>
280-
<activation>
281-
<activeByDefault>false</activeByDefault>
282-
</activation>
17+
<modules>
18+
<module>vprocjs-addon</module>
19+
<module>vprocjs-demo</module>
20+
</modules>
28321

284-
<repositories>
285-
<repository>
286-
<id>vaadin-prereleases</id>
287-
<url>http://maven.vaadin.com/vaadin-prereleases</url>
288-
</repository>
289-
<repository>
290-
<id>vaadin-snapshots</id>
291-
<url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
292-
<releases>
293-
<enabled>false</enabled>
294-
</releases>
295-
<snapshots>
296-
<enabled>true</enabled>
297-
</snapshots>
298-
</repository>
299-
</repositories>
300-
<pluginRepositories>
301-
<pluginRepository>
302-
<id>vaadin-prereleases</id>
303-
<url>http://maven.vaadin.com/vaadin-prereleases</url>
304-
</pluginRepository>
305-
<pluginRepository>
306-
<id>vaadin-snapshots</id>
307-
<url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
308-
<releases>
309-
<enabled>false</enabled>
310-
</releases>
311-
<snapshots>
312-
<enabled>true</enabled>
313-
</snapshots>
314-
</pluginRepository>
315-
</pluginRepositories>
316-
</profile>
317-
</profiles>
318-
31922
</project>

‎vprocjs-addon/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/target/

‎assembly/MANIFEST.MF renamed to ‎vprocjs-addon/assembly/MANIFEST.MF

File renamed without changes.

‎assembly/assembly.xml renamed to ‎vprocjs-addon/assembly/assembly.xml

File renamed without changes.

0 commit comments

Comments
 (0)