aboutsummaryrefslogtreecommitdiffstats
path: root/client-compiler
diff options
context:
space:
mode:
Diffstat (limited to 'client-compiler')
-rw-r--r--client-compiler/build.xml79
-rw-r--r--client-compiler/ivy.xml106
-rw-r--r--client-compiler/pom.xml317
-rw-r--r--client-compiler/src/main/java/com/vaadin/sass/linker/SassLinker.java (renamed from client-compiler/src/com/vaadin/sass/linker/SassLinker.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/OnStateChangeVisitor.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/OnStateChangeVisitor.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/Property.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/Property.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java (renamed from client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/tools/CvalAddonsChecker.java (renamed from client-compiler/src/com/vaadin/tools/CvalAddonsChecker.java)0
-rw-r--r--client-compiler/src/main/java/com/vaadin/tools/CvalChecker.java (renamed from client-compiler/src/com/vaadin/tools/CvalChecker.java)0
-rwxr-xr-xclient-compiler/src/main/java/com/vaadin/tools/WidgetsetCompiler.java (renamed from client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java)0
-rw-r--r--client-compiler/src/main/resources/com/google/gwt/dev/About.properties2
-rw-r--r--client-compiler/src/main/resources/com/vaadin/tools/CvalChecker.properties (renamed from client-compiler/src/com/vaadin/tools/CvalChecker.properties)0
-rw-r--r--client-compiler/src/test/java/com/vaadin/tools/CvalAddonsCheckerTest.java (renamed from client-compiler/tests/src/com/vaadin/tools/CvalAddonsCheckerTest.java)10
-rw-r--r--client-compiler/src/test/java/com/vaadin/tools/CvalAddonstCheckerUseCasesTest.java (renamed from client-compiler/tests/src/com/vaadin/tools/CvalAddonstCheckerUseCasesTest.java)62
-rw-r--r--client-compiler/src/test/java/com/vaadin/tools/CvalCheckerTest.java (renamed from client-compiler/tests/src/com/vaadin/tools/CvalCheckerTest.java)4
31 files changed, 388 insertions, 192 deletions
diff --git a/client-compiler/build.xml b/client-compiler/build.xml
deleted file mode 100644
index 5a5d1a6161..0000000000
--- a/client-compiler/build.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-client-compiler" basedir="." default="publish-local"
- xmlns:ivy="antlib:org.apache.ivy.ant">
- <description>
- Compiles build helpers used when building other
- modules.
- </description>
- <include file="../common.xml" as="common" />
- <include file="../build.xml" as="vaadin" />
- <include file="../gwt-files.xml" as="gwtfiles" />
-
- <!-- global properties -->
- <property name="module.name" value="vaadin-client-compiler" />
- <property name="module.symbolic" value="com.vaadin.client-compiler" />
- <property name="result.dir" value="result" />
- <path id="classpath.compile.custom">
- <fileset file="${gwt.dev.jar}" />
- </path>
- <path id="classpath.test.custom">
- <fileset dir="${result.dir}/classes">
- <include name="**/*" />
- </fileset>
- </path>
- <property name="extra.classes" value="**/*.properties" />
- <!-- don't try to copy the same files twice (first from classes and then
- from sources) in order for the build not to fail when packaging the JAR -->
- <property name="jar.exclude" value="**/*.properties" />
- <union id="compiler.includes">
- <union refid="client-compiler.gwt.includes" />
- <fileset dir="${result.dir}">
- <include name="com/google/gwt/dev/About.properties" />
- </fileset>
- </union>
-
- <target name="jar">
- <!-- Get Git revision -->
- <exec executable="git" outputproperty="git.revision"
- failifexecutionfails="false" errorproperty="">
- <arg value="describe" />
- <arg value="--tags" />
- <arg value="--always" />
- <arg value="HEAD" />
- </exec>
-
- <echo file="${result.dir}/com/google/gwt/dev/About.properties">gwt.version=${vaadin.version}
- gwt.svnrev=${git.revision}</echo>
-
- <antcall target="common.jar">
- <reference refid="compiler.includes" torefid="extra.jar.includes" />
- </antcall>
-
- </target>
-
- <target name="publish-local" depends="jar">
- <antcall target="common.sources.jar">
- <reference torefid="extra.jar.includes" refid="compiler.includes" />
- </antcall>
- <antcall target="common.javadoc.jar" />
-
- <antcall target="common.publish-local" />
- </target>
-
- <target name="clean">
- <antcall target="common.clean" />
- </target>
-
- <target name="checkstyle">
- <antcall target="common.checkstyle">
- <param name="cs.src" location="src" />
- </antcall>
- </target>
-
- <target name="test" depends="checkstyle">
- <antcall target="common.test.run" />
- <!--<echo>WHAT? No tests for ${module.name}!</echo> -->
- </target>
-
-</project>
diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml
deleted file mode 100644
index 8f6b74876e..0000000000
--- a/client-compiler/ivy.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
- xmlns:m="http://ant.apache.org/ivy/maven">
-
- <info organisation="com.vaadin" module="vaadin-client-compiler"
- revision="${vaadin.version}" />
-
- <configurations>
- <conf name="build" />
- <conf name="build-provided" />
- <conf name="ide" visibility="private" />
- <conf name="test" visibility="private" />
- </configurations>
- <publications>
- <artifact type="jar" ext="jar" />
- <artifact type="source" ext="jar" m:classifier="sources" />
- <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
- <artifact type="pom" ext="pom" />
- </publications>
- <dependencies>
- <dependency org="com.vaadin" name="vaadin-shared"
- rev="${vaadin.version}" conf="build" />
- <dependency org="com.vaadin" name="vaadin-server"
- rev="${vaadin.version}" conf="build" />
- <dependency org="com.vaadin" name="vaadin-client"
- rev="${vaadin.version}" conf="build,test" />
- <dependency org="com.vaadin" name="vaadin-sass-compiler"
- rev="${vaadin.sass.version}" conf="build,ide->default">
- <!-- remove cssparser override once sass-compiler is updated -->
- <exclude name="cssparser" />
- </dependency>
-
- <dependency org="commons-collections" name="commons-collections"
- rev="3.2.2" conf="build,ide -> default" />
- <dependency org="commons-logging" name="commons-logging"
- rev="1.1.3" conf="build,ide -> default" />
-
- <dependency org="ant" name="ant" rev="1.6.5"
- conf="build,ide -> default" />
- <dependency org="net.sourceforge.cssparser" name="cssparser"
- rev="0.9.11" conf="build,ide -> default" />
- <dependency org="ant" name="ant" rev="1.6.5"
- conf="build,ide -> default" />
- <dependency org="ant" name="ant-launcher" rev="1.6.5"
- conf="build,ide -> default" />
- <dependency org="org.ow2.asm" name="asm"
- rev="5.0.3" conf="build-> default" />
- <dependency org="org.ow2.asm" name="asm-util"
- rev="5.0.3" conf="build-> default" />
- <dependency org="org.ow2.asm" name="asm-commons"
- rev="5.0.3" conf="build-> default" />
-
- <dependency org="org.eclipse.jetty" name="jetty-annotations"
- rev="8.1.12.v20130726" conf="build,ide -> default">
- <exclude org="org.eclipse.jetty.orbit"></exclude>
- </dependency>
- <dependency org="org.eclipse.jetty" name="jetty-servlets"
- rev="8.1.12.v20130726" conf="build,ide -> default">
- <exclude org="org.eclipse.jetty.orbit"></exclude>
- </dependency>
-
- <dependency org="org.eclipse.jetty" name="jetty-util"
- rev="8.1.12.v20130726" conf="build,ide -> default" />
-
- <dependency org="org.jdesktop" name="swing-worker"
- rev="1.1" conf="build,ide -> default" />
- <dependency org="commons-codec" name="commons-codec"
- rev="1.8" conf="build,ide -> default" />
- <dependency org="commons-io" name="commons-io"
- rev="${commons-io.version}" conf="build,ide -> default" />
- <dependency org="org.apache.commons" name="commons-lang3"
- rev="3.1" conf="build,ide -> default" />
- <dependency org="org.apache.james" name="apache-mime4j"
- rev="0.6" conf="build,ide -> default" />
-
- <dependency org="org.apache.httpcomponents" name="httpclient"
- rev="4.3.1" conf="build,ide -> default" />
- <dependency org="org.apache.httpcomponents" name="httpcore"
- rev="4.3" conf="build,ide -> default" />
- <dependency org="org.apache.httpcomponents" name="httpmime"
- rev="4.3.1" conf="build,ide -> default" />
-
- <dependency org="net.sourceforge.nekohtml" name="nekohtml"
- rev="1.9.19" conf="build,ide -> default" />
- <dependency org="xalan" name="serializer" rev="2.7.1"
- conf="build,ide -> default" />
- <dependency org="xerces" name="xercesImpl" rev="2.11.0"
- conf="build,ide -> default" />
- <dependency org="xml-apis" name="xml-apis" rev="1.4.01"
- conf="build,ide -> default" />
-
- <dependency org="com.ibm.icu" name="icu4j" rev="50.1.1"
- conf="build,ide -> default" />
-
- <dependency org="com.vaadin" name="vaadin-client-compiler-deps"
- rev="1.2.0" conf="build,ide -> default" />
-
- <dependency org="junit" name="junit" rev="4.11"
- conf="test,ide -> default" />
-
-
- </dependencies>
-
-</ivy-module>
diff --git a/client-compiler/pom.xml b/client-compiler/pom.xml
new file mode 100644
index 0000000000..699dbac757
--- /dev/null
+++ b/client-compiler/pom.xml
@@ -0,0 +1,317 @@
+<?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>
+
+ <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.orbit</groupId>
+ <artifactId>*</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.orbit</groupId>
+ <artifactId>*</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>
+ <executions>
+ <execution>
+ <id>unpack-dependencies</id>
+ <phase>generate-resources</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>
+ </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.outputDirectory}</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>
+ <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>
+ </plugin>
+ </plugins>
+ </build>
+ <!--todo .javadoc.jar file -->
+</project>
diff --git a/client-compiler/src/com/vaadin/sass/linker/SassLinker.java b/client-compiler/src/main/java/com/vaadin/sass/linker/SassLinker.java
index dda6733384..dda6733384 100644
--- a/client-compiler/src/com/vaadin/sass/linker/SassLinker.java
+++ b/client-compiler/src/main/java/com/vaadin/sass/linker/SassLinker.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java
index 2d08329e9a..2d08329e9a 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
index 2b8ccc87d0..2b8ccc87d0 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java
index 0049ae9b50..0049ae9b50 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java
index 992a012005..992a012005 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
index b4531eb08e..b4531eb08e 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java
index ea3b097fa2..ea3b097fa2 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java
index bb3dd4f61d..bb3dd4f61d 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java
index 9876baf946..9876baf946 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
index a31dafe05c..a31dafe05c 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java
index 6afb172ea2..6afb172ea2 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java
index a7a6c568da..a7a6c568da 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java
index 32aad92774..32aad92774 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/OnStateChangeVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/OnStateChangeVisitor.java
index 1c0da9d9e8..1c0da9d9e8 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/OnStateChangeVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/OnStateChangeVisitor.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/Property.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/Property.java
index 0c849bead5..0c849bead5 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/Property.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/Property.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java
index 8b645aa492..8b645aa492 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java
index 86ece28041..86ece28041 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java
index 046c5c4611..046c5c4611 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java
index 028e4cc44d..028e4cc44d 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java
index 9a9cac18ba..9a9cac18ba 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java
diff --git a/client-compiler/src/com/vaadin/tools/CvalAddonsChecker.java b/client-compiler/src/main/java/com/vaadin/tools/CvalAddonsChecker.java
index aab7231258..aab7231258 100644
--- a/client-compiler/src/com/vaadin/tools/CvalAddonsChecker.java
+++ b/client-compiler/src/main/java/com/vaadin/tools/CvalAddonsChecker.java
diff --git a/client-compiler/src/com/vaadin/tools/CvalChecker.java b/client-compiler/src/main/java/com/vaadin/tools/CvalChecker.java
index 9217781695..9217781695 100644
--- a/client-compiler/src/com/vaadin/tools/CvalChecker.java
+++ b/client-compiler/src/main/java/com/vaadin/tools/CvalChecker.java
diff --git a/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java b/client-compiler/src/main/java/com/vaadin/tools/WidgetsetCompiler.java
index 7c06e9d7af..7c06e9d7af 100755
--- a/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java
+++ b/client-compiler/src/main/java/com/vaadin/tools/WidgetsetCompiler.java
diff --git a/client-compiler/src/main/resources/com/google/gwt/dev/About.properties b/client-compiler/src/main/resources/com/google/gwt/dev/About.properties
new file mode 100644
index 0000000000..364c323136
--- /dev/null
+++ b/client-compiler/src/main/resources/com/google/gwt/dev/About.properties
@@ -0,0 +1,2 @@
+gwt.version=${project.version}
+gwt.svnrev=
diff --git a/client-compiler/src/com/vaadin/tools/CvalChecker.properties b/client-compiler/src/main/resources/com/vaadin/tools/CvalChecker.properties
index 3f4fd52cb7..3f4fd52cb7 100644
--- a/client-compiler/src/com/vaadin/tools/CvalChecker.properties
+++ b/client-compiler/src/main/resources/com/vaadin/tools/CvalChecker.properties
diff --git a/client-compiler/tests/src/com/vaadin/tools/CvalAddonsCheckerTest.java b/client-compiler/src/test/java/com/vaadin/tools/CvalAddonsCheckerTest.java
index 1fb9413ee4..c6200bc7e0 100644
--- a/client-compiler/tests/src/com/vaadin/tools/CvalAddonsCheckerTest.java
+++ b/client-compiler/src/test/java/com/vaadin/tools/CvalAddonsCheckerTest.java
@@ -33,6 +33,8 @@ import static com.vaadin.tools.CvalCheckerTest.saveCache;
import static com.vaadin.tools.CvalCheckerTest.unreachableLicenseProvider;
import static com.vaadin.tools.CvalCheckerTest.validLicenseProvider;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.util.List;
import org.junit.Assert;
@@ -58,6 +60,10 @@ public class CvalAddonsCheckerTest {
deleteCache(productNameCval);
System.getProperties().remove(licenseName);
+
+ // Set up a new URLClassLoader for the thread
+ Thread thread = Thread.currentThread();
+ thread.setContextClassLoader(new URLClassLoader(new URL[0], null));
}
@Test
@@ -83,7 +89,7 @@ public class CvalAddonsCheckerTest {
// We have a license that has never been validated from the server and
// we are offline
// -> Show a message on compile time (“Your license for TouchKit 4 has
- // not been validated.”)
+ // not been validated.")
System.setProperty(licenseName, VALID_KEY);
addonChecker.setLicenseProvider(unreachableLicenseProvider);
captureSystemOut();
@@ -153,7 +159,7 @@ public class CvalAddonsCheckerTest {
// -> Work as expected
// -> Show info message “Using TouchKit 4 license
// 312-312321-321312-3-12-312-312
- // licensed to <licensee> (1 developer license)”
+ // licensed to <licensee> (1 developer license)"
System.setProperty(licenseName, VALID_KEY);
addonChecker.setLicenseProvider(validLicenseProvider);
captureSystemOut();
diff --git a/client-compiler/tests/src/com/vaadin/tools/CvalAddonstCheckerUseCasesTest.java b/client-compiler/src/test/java/com/vaadin/tools/CvalAddonstCheckerUseCasesTest.java
index 89c8fc1f81..01cfe2087e 100644
--- a/client-compiler/tests/src/com/vaadin/tools/CvalAddonstCheckerUseCasesTest.java
+++ b/client-compiler/src/test/java/com/vaadin/tools/CvalAddonstCheckerUseCasesTest.java
@@ -35,7 +35,11 @@ import static com.vaadin.tools.CvalCheckerTest.unreachableLicenseProvider;
import static com.vaadin.tools.CvalCheckerTest.validEvaluationLicenseProvider;
import static com.vaadin.tools.CvalCheckerTest.validLicenseProvider;
+import java.net.URL;
+import java.net.URLClassLoader;
+
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
import com.vaadin.tools.CvalChecker.CvalServer;
@@ -81,59 +85,111 @@ public class CvalAddonstCheckerUseCasesTest {
}
}
+ @Before
+ public void setUp() {
+ // Set up a new URLClassLoader for the thread
+ Thread thread = Thread.currentThread();
+ thread.setContextClassLoader(new URLClassLoader(new URL[0], null));
+ }
+
+ /* TODO: Use more descriptive test names */
+
@Test
- public void testUseCases() throws Exception {
+ public void testUseCase1() throws Exception {
useCase(1, License.NONE, Version.AGPL, Validated.NO, Network.OFF,
Compile.YES, Cached.NO, Message.AGPL);
+ }
+ @Test
+ public void testUseCase2() throws Exception {
useCase(2, License.NONE, Version.CVAL, Validated.NO, Network.ON,
Compile.NO, Cached.NO, Message.NO_LICENSE);
+ }
+ @Test
+ public void testUseCase3() throws Exception {
useCase(3, License.NONE, Version.CVAL, Validated.NO, Network.OFF,
Compile.NO, Cached.NO, Message.NO_LICENSE);
+ }
+ @Test
+ public void testUseCase4() throws Exception {
useCase(4, License.EVAL, Version.CVAL, Validated.NO, Network.ON,
Compile.YES, Cached.YES, Message.EVALUATION);
+ }
+ @Test
+ public void testUseCase5() throws Exception {
useCase(5, License.INVALID, Version.CVAL, Validated.NO, Network.OFF,
Compile.YES, Cached.NO, Message.NO_VALIDATED);
+ }
+ @Test
+ public void testUseCase6() throws Exception {
useCase(6, License.INVALID, Version.CVAL, Validated.NO, Network.ON,
Compile.NO, Cached.NO, Message.INVALID);
+ }
+ @Test
+ public void testUseCase7() throws Exception {
useCase(7, License.REAL, Version.CVAL, Validated.NO, Network.ON,
Compile.YES, Cached.YES, Message.VALID);
+ }
+ @Test
+ public void testUseCase8() throws Exception {
useCase(8, License.REAL, Version.CVAL, Validated.NO, Network.OFF,
Compile.YES, Cached.NO, Message.NO_VALIDATED);
+ }
+ @Test
+ public void testUseCase9() throws Exception {
useCase(9, License.REAL, Version.CVAL, Validated.YES, Network.OFF,
Compile.YES, Cached.YES, Message.VALID);
+ }
+ @Test
+ public void testUseCase10() throws Exception {
useCase(10, License.EVAL_EXPIRED, Version.CVAL, Validated.NO,
Network.ON, Compile.NO, Cached.YES, Message.EXPIRED);
+ }
+ @Test
+ public void testUseCase11() throws Exception {
useCase(11, License.EVAL_EXPIRED, Version.CVAL, Validated.YES,
Network.OFF, Compile.NO, Cached.YES, Message.EXPIRED);
+ }
+ @Test
+ public void testUseCase12() throws Exception {
useCase(12, License.REAL_EXPIRED, Version.CVAL, Validated.YES,
Network.OFF, Compile.NO, Cached.YES, Message.EXPIRED);
+ }
+ @Test
+ public void testUseCase13() throws Exception {
useCase(13, License.REAL_EXPIRED, Version.CVAL, Validated.NO,
Network.ON, Compile.NO, Cached.YES, Message.EXPIRED);
+ }
+ @Test
+ public void testUseCase14() throws Exception {
useCase(14, License.INVALID, Version.CVAL, Validated.OLD_KEY,
Network.OFF, Compile.YES, Cached.NO, Message.NO_VALIDATED);
}
@Test
- public void testMultipleLicenseUseCases() throws Exception {
+ public void testMultipleLicenseUseCase15() throws Exception {
addLicensedJarToClasspath("test.foo", VAADIN_CVAL);
System.setProperty(computeLicenseName("test.foo"), VALID_KEY);
-
useCase(15, License.REAL, Version.CVAL, Validated.YES, Network.OFF,
Compile.YES, Cached.YES, Message.NO_VALIDATED);
+ }
+ @Test
+ public void testMultipleLicenseUseCase16() throws Exception {
+ addLicensedJarToClasspath("test.foo", VAADIN_CVAL);
+ System.setProperty(computeLicenseName("test.foo"), VALID_KEY);
useCase(16, License.REAL, Version.CVAL, Validated.YES, Network.ON,
Compile.NO, Cached.YES, Message.INVALID);
}
diff --git a/client-compiler/tests/src/com/vaadin/tools/CvalCheckerTest.java b/client-compiler/src/test/java/com/vaadin/tools/CvalCheckerTest.java
index 6da455b2f6..6e1a8e57ed 100644
--- a/client-compiler/tests/src/com/vaadin/tools/CvalCheckerTest.java
+++ b/client-compiler/src/test/java/com/vaadin/tools/CvalCheckerTest.java
@@ -304,14 +304,14 @@ public class CvalCheckerTest {
testManifest.getMainAttributes().putValue(VAADIN_ADDON_VERSION, "2");
// Create a temporary Jar
- File testJarFile = File.createTempFile("vaadin." + productName, "jar");
+ File testJarFile = File.createTempFile("vaadin." + productName, ".jar");
testJarFile.deleteOnExit();
JarOutputStream target = new JarOutputStream(new FileOutputStream(
testJarFile), testManifest);
target.close();
// Add the new jar to our classpath (use reflection)
- URL url = new URL("file://" + testJarFile.getAbsolutePath());
+ URL url = testJarFile.toURI().toURL();
final Method addURL = URLClassLoader.class.getDeclaredMethod("addURL",
new Class[] { URL.class });
addURL.setAccessible(true);
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-25 23:01:50 +0000