Skip to content

Commit

Permalink
Build client-compiler with maven
Browse files Browse the repository at this point in the history 
Change-Id: Ic86a95ce44cc37c8d34d607b39f2aec4cc922ce2
  • Loading branch information
elmot committed Mar 22, 2016
1 parent 646cbae commit 521ec24
Show file tree
Hide file tree
Showing 36 changed files with 410 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .classpath
View file
Expand Up @@ -5,8 +5,8 @@
<classpathentry kind="src" path="shared/src/test/java"/>
<classpathentry kind="src" path="client/src/main/java"/>
<classpathentry kind="src" path="server/src/main/java"/>
<classpathentry kind="src" path="client-compiler/src"/>
<classpathentry kind="src" path="client-compiler/tests/src"/>
<classpathentry kind="src" path="client-compiler/src/main/java"/>
<classpathentry kind="src" path="client-compiler/src/test/java"/>
<classpathentry kind="src" path="uitest/src"/>
<classpathentry kind="src" path="shared/src/main/java"/>
<classpathentry kind="src" path="shared/src/main/java-templates"/>
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
View file
Expand Up @@ -88,6 +88,10 @@ push/target/
shared/target/
server/target/
client/target/
client-compiler/target/

.sass-cache
phantomjsdriver.log

*.iml
.idea
2 changes: 1 addition & 1 deletion client-compiled/ivy.xml
View file
Expand Up @@ -26,7 +26,7 @@
<dependency org="com.vaadin" name="vaadin-client"
rev="${vaadin.version}" conf="compile-module-> default" />
<dependency org="com.vaadin" name="vaadin-client-compiler"
rev="${vaadin.version}" conf="compile-module-> build" />
rev="${vaadin.version}" conf="compile-module-> default" />
</dependencies>

</ivy-module>
327 changes: 327 additions & 0 deletions client-compiler/pom.xml
View file
@@ -0,0 +1,327 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-root</artifactId>
<version>7.7.0-SNAPSHOT</version>
</parent>
<artifactId>vaadin-client-compiler</artifactId>
<name>vaadin-client-compiler</name>
<packaging>jar</packaging>

<organization>
<name>Vaadin Ltd</name>
</organization>
<url>https://vaadin.com/</url>
<description>Vaadin client compiler</description>

<dependencies>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-shared</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-sass-compiler</artifactId>
<version>${vaadin.sass.version}</version>
<!-- remove cssparser override once sass-compiler is updated -->
<exclusions>
<exclusion>
<groupId>net.sourceforge.cssparser</groupId>
<artifactId>cssparser</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.3</version>
</dependency>
<dependency>
<groupId>net.sourceforge.cssparser</groupId>
<artifactId>cssparser</artifactId>
<version>0.9.11</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.6.5</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.6.5</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>5.0.3</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>5.0.3</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>5.0.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>8.1.12.v20130726</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>orbit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>8.1.12.v20130726</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>orbit</artifactId>
</exclusion>
</exclusions>

</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>8.1.12.v20130726</version>
</dependency>
<dependency>
<groupId>org.jdesktop</groupId>
<artifactId>swing-worker</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.1</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j</artifactId>
<version>0.6</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.3</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.3.1</version>
</dependency>
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
<version>1.9.19</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
<version>2.7.1</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>50.1.1</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-client-compiler-deps</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>com.vaadin.external.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<version>${vaadin.gwt.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>unpack-dependencies</id>
<phase>process-classes</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.vaadin.external.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<includes>
about_files/**,
com/google/gwt/core/**,
com/google/gwt/dev/**,
com/google/gwt/lang/**,
com/google/gwt/soyc/**,
com/google/gwt/thirdparty/json/**,
com/google/gwt/util/**,
license/LICENSE.sax.txt,
netscape/**,
org/apache/COPYING,
org/apache/jasper/**,
org/apache/commons/el/**,
org/apache/commons/lang3/**,
templates/*,
about.html,
jetty-dir.css,
plugin.properties
</includes>
<excludes>
com/google/gwt/dev/protobuf/**,
com/google/gwt/dev/About.properties
</excludes>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<!-- Copy .java files to package -->
<execution>
<id>copy-sources</id>
<!-- here the phase you need -->
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<resources>
<resource>
<directory>src/main/java</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
<Export-Package>com.vaadin.*;version="${project.version}",com.google.gwt.*;version="${project.version}"</Export-Package>
<!--TODO decide gwt packages version number<Export-Package>com.vaadin.*;version="${project.version}",com.google.gwt.*;version="${vaadin.gwt.version}"</Export-Package> -->
<Import-Package></Import-Package> <!--todo find out what should be in Import-Package -->
</instructions>
</configuration>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>prepare-package</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<index />
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
</plugin>
</plugins>
</build>
<!--todo .javadoc.jar file -->
<!--todo .sources.java -->
</project>
0 ...rc/com/vaadin/sass/linker/SassLinker.java → ...va/com/vaadin/sass/linker/SassLinker.java
View file
File renamed without changes.
0 ...utils/AcceptCriteriaFactoryGenerator.java → ...utils/AcceptCriteriaFactoryGenerator.java
View file
File renamed without changes.
0 ...etutils/ConnectorBundleLoaderFactory.java → ...etutils/ConnectorBundleLoaderFactory.java
View file
File renamed without changes.
0 ...getsetutils/metadata/ArraySerializer.java → ...getsetutils/metadata/ArraySerializer.java
View file
File renamed without changes.
0 ...etsetutils/metadata/ClientRpcVisitor.java → ...etsetutils/metadata/ClientRpcVisitor.java
View file
File renamed without changes.
0 ...getsetutils/metadata/ConnectorBundle.java → ...getsetutils/metadata/ConnectorBundle.java
View file
File renamed without changes.
0 ...tutils/metadata/ConnectorInitVisitor.java → ...tutils/metadata/ConnectorInitVisitor.java
View file
File renamed without changes.
0 ...etsetutils/metadata/CustomSerializer.java → ...etsetutils/metadata/CustomSerializer.java
View file
File renamed without changes.
0 ...dgetsetutils/metadata/EnumSerializer.java → ...dgetsetutils/metadata/EnumSerializer.java
View file
File renamed without changes.
0 ...idgetsetutils/metadata/FieldProperty.java → ...idgetsetutils/metadata/FieldProperty.java
View file
File renamed without changes.
0 ...etutils/metadata/GeneratedSerializer.java → ...etutils/metadata/GeneratedSerializer.java
View file
File renamed without changes.
0 ...dgetsetutils/metadata/JsonSerializer.java → ...dgetsetutils/metadata/JsonSerializer.java
View file
File renamed without changes.
0 ...dgetsetutils/metadata/MethodProperty.java → ...dgetsetutils/metadata/MethodProperty.java
View file
File renamed without changes.
0 ...tutils/metadata/OnStateChangeVisitor.java → ...tutils/metadata/OnStateChangeVisitor.java
View file
File renamed without changes.
0 ...ver/widgetsetutils/metadata/Property.java → ...ver/widgetsetutils/metadata/Property.java
View file
File renamed without changes.
0 ...getsetutils/metadata/RendererVisitor.java → ...getsetutils/metadata/RendererVisitor.java
View file
File renamed without changes.
0 ...etsetutils/metadata/ServerRpcVisitor.java → ...etsetutils/metadata/ServerRpcVisitor.java
View file
File renamed without changes.
0 ...etsetutils/metadata/StateInitVisitor.java → ...etsetutils/metadata/StateInitVisitor.java
View file
File renamed without changes.
0 .../widgetsetutils/metadata/TypeVisitor.java → .../widgetsetutils/metadata/TypeVisitor.java
View file
File renamed without changes.
0 ...tsetutils/metadata/WidgetInitVisitor.java → ...tsetutils/metadata/WidgetInitVisitor.java
View file
File renamed without changes.
0 ...c/com/vaadin/tools/CvalAddonsChecker.java → ...a/com/vaadin/tools/CvalAddonsChecker.java
View file
File renamed without changes.
0 ...ler/src/com/vaadin/tools/CvalChecker.java → ...in/java/com/vaadin/tools/CvalChecker.java
View file
File renamed without changes.
0 ...c/com/vaadin/tools/WidgetsetCompiler.java → ...a/com/vaadin/tools/WidgetsetCompiler.java
View file
File renamed without changes.
2 changes: 2 additions & 0 deletions client-compiler/src/main/resources/com/google/gwt/dev/About.properties
View file
@@ -0,0 +1,2 @@
gwt.version=${project.version}
gwt.svnrev=
0 ...c/com/vaadin/tools/CvalChecker.properties → ...s/com/vaadin/tools/CvalChecker.properties
View file
File renamed without changes.

0 comments on commit 521ec24

Please sign in to comment.