Change-Id: I5c740f4e9cb28103bab199f9a552153d82277e7etags/7.7.0.alpha1
@@ -1,10 +1,10 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<classpath> | |||
<classpathentry kind="src" path="server/tests/src"/> | |||
<classpathentry kind="src" path="server/src/test/java"/> | |||
<classpathentry kind="src" path="client/tests/src"/> | |||
<classpathentry kind="src" path="shared/src/test/java"/> | |||
<classpathentry kind="src" path="client/src"/> | |||
<classpathentry kind="src" path="server/src"/> | |||
<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="uitest/src"/> |
@@ -86,6 +86,7 @@ scripts/*.pyc | |||
result | |||
push/target/ | |||
shared/target/ | |||
server/target/ | |||
.sass-cache | |||
phantomjsdriver.log |
@@ -22,7 +22,7 @@ | |||
</publications> | |||
<dependencies> | |||
<dependency org="com.vaadin" name="vaadin-server" | |||
rev="${vaadin.version}" conf="compile-module-> build" /> | |||
rev="${vaadin.version}" conf="compile-module-> default" /> | |||
<dependency org="com.vaadin" name="vaadin-client" | |||
rev="${vaadin.version}" conf="compile-module-> build" /> | |||
<dependency org="com.vaadin" name="vaadin-client-compiler" |
@@ -23,7 +23,7 @@ | |||
<dependency org="com.vaadin" name="vaadin-shared" | |||
rev="${vaadin.version}" conf="build -> default" /> | |||
<dependency org="com.vaadin" name="vaadin-server" | |||
rev="${vaadin.version}" conf="build" /> | |||
rev="${vaadin.version}" conf="build -> default" /> | |||
<dependency org="com.vaadin" name="vaadin-client" | |||
rev="${vaadin.version}" conf="build,test" /> | |||
<dependency org="com.vaadin" name="vaadin-sass-compiler" |
@@ -29,7 +29,7 @@ | |||
<exclude type="pom" conf="test" /> | |||
</dependency> | |||
<dependency org="com.vaadin" name="vaadin-server" | |||
rev="${vaadin.version}" conf="build,test->build"> | |||
rev="${vaadin.version}" conf="build,test->default"> | |||
<exclude type="pom" conf="test" /> | |||
</dependency> | |||
@@ -40,7 +40,7 @@ | |||
<module organisation="com.vaadin" name="vaadin-shared" | |||
resolver="local-maven" /> | |||
<module organisation="com.vaadin" name="vaadin-server" | |||
resolver="build-temp" /> | |||
resolver="local-maven" /> | |||
<module organisation="com.vaadin" name="vaadin-client" | |||
resolver="build-temp" /> | |||
<module organisation="com.vaadin" name="vaadin-client-compiler" |
@@ -24,7 +24,7 @@ | |||
<dependency org="com.vaadin" name="vaadin-push" | |||
rev="${vaadin.version}" conf="deps -> default" transitive="false" /> | |||
<dependency org="com.vaadin" name="vaadin-server" | |||
rev="${vaadin.version}" conf="deps -> build" transitive="false" /> | |||
rev="${vaadin.version}" conf="deps -> default" transitive="false" /> | |||
</dependencies> | |||
</ivy-module> |
@@ -1,72 +0,0 @@ | |||
<?xml version="1.0"?> | |||
<project name="vaadin-server" 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-server" /> | |||
<property name="module.symbolic" value="com.vaadin.server" /> | |||
<property name="result.dir" value="result" /> | |||
<path id="classpath.compile.custom" /> | |||
<path id="classpath.test.custom" /> | |||
<union id="jar.includes"> | |||
<union refid="server.gwt.includes" /> | |||
<fileset dir="${vaadin.basedir}/WebContent"> | |||
<include name="VAADIN/vaadinBootstrap.js" /> | |||
</fileset> | |||
<fileset dir="${result.dir}"> | |||
<include name="VAADIN/*" /> | |||
</fileset> | |||
</union> | |||
<target name="compress-files"> | |||
<mkdir dir="${result.dir}/VAADIN" /> | |||
<gzip src="${vaadin.basedir}/WebContent/VAADIN/vaadinBootstrap.js" | |||
destfile="${result.dir}/VAADIN/vaadinBootstrap.js.gz" /> | |||
</target> | |||
<target name="jar" depends="compress-files"> | |||
<property name="server.osgi.import" | |||
value="javax.servlet;version="2.4.0",javax.servlet.http;version="2.4.0",javax.validation;version="1.0.0.GA";resolution:=optional,org.jsoup;version="1.6.3",org.jsoup.parser;version="1.6.3",org.jsoup.nodes;version="1.6.3",org.jsoup.helper;version="1.6.3",org.jsoup.safety;version="1.6.3",org.jsoup.select;version="1.6.3",javax.portlet;version="[2.0,3)";resolution:=optional,javax.portlet.filter;version="[2.0,3)";resolution:=optional,com.liferay.portal.kernel.util;resolution:=optional" /> | |||
<property name="server.osgi.require" | |||
value="com.google.gwt.thirdparty.guava;bundle-version="16.0.1.vaadin1",com.vaadin.shared;bundle-version="${vaadin.version}",com.vaadin.push;bundle-version="${vaadin.version}";resolution:=optional,com.vaadin.sass-compiler;bundle-version="${vaadin.sass.version}";resolution:=optional" /> | |||
<antcall target="common.jar"> | |||
<param name="require-bundle" value="${server.osgi.require}" /> | |||
<param name="import-package" value="${server.osgi.import}" /> | |||
<param name="osgi.extra.package.prefixes" value="VAADIN" /> | |||
<reference torefid="extra.jar.includes" refid="jar.includes" /> | |||
</antcall> | |||
</target> | |||
<target name="publish-local" depends="jar"> | |||
<antcall target="common.sources.jar"> | |||
<reference torefid="extra.jar.includes" refid="server.gwt.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" /> | |||
</target> | |||
</project> |
@@ -8,87 +8,68 @@ | |||
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> | |||
<!-- API DEPENDENCIES --> | |||
<!-- Liferay Portal Service --> | |||
<dependency org="com.liferay.portal" name="portal-service" | |||
rev="6.0.2" conf="build-provided,ide -> default" /> | |||
rev="6.0.2" conf="ide -> default" /> | |||
<!--Servlet API version 3.0 --> | |||
<dependency org="javax.servlet" name="javax.servlet-api" | |||
rev="3.0.1" conf="build-provided,ide,test -> default" /> | |||
rev="3.0.1" conf="ide -> default" /> | |||
<!--Portlet API version 2.0 (JSR-286) --> | |||
<dependency org="javax.portlet" name="portlet-api" | |||
rev="2.0" conf="build-provided,ide,test -> default" /> | |||
rev="2.0" conf="ide -> default" /> | |||
<!-- Google App Engine --> | |||
<dependency org="com.google.appengine" name="appengine-api-1.0-sdk" | |||
rev="1.7.7" conf="build-provided,ide,test -> default" /> | |||
rev="1.7.7" conf="ide -> default" /> | |||
<!-- Bean Validation API --> | |||
<dependency org="javax.validation" name="validation-api" | |||
rev="1.0.0.GA" conf="build-provided,ide,test -> default" /> | |||
rev="1.0.0.GA" conf="ide -> default" /> | |||
<!-- Sass compiler --> | |||
<dependency org="com.vaadin" name="vaadin-sass-compiler" | |||
rev="${vaadin.sass.version}" conf="build,ide,test->default"> | |||
<exclude type="pom" conf="test" /> | |||
</dependency> | |||
<!-- LIBRARY DEPENDENCIES (compile time) --> | |||
<!-- Project modules --> | |||
<dependency org="com.vaadin" name="vaadin-shared" | |||
rev="${vaadin.version}" conf="build,test->default"> | |||
<exclude type="pom" conf="test" /> | |||
</dependency> | |||
<dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}" | |||
conf="build-provided,test->compile"> | |||
<exclude type="pom" conf="test" /> | |||
rev="${vaadin.sass.version}" conf="ide ->default"> | |||
<exclude type="pom" conf="ide" /> | |||
</dependency> | |||
<!-- Jsoup for BootstrapHandler --> | |||
<dependency org="org.jsoup" name="jsoup" rev="1.8.3" | |||
conf="build,ide,test -> default" /> | |||
conf="ide -> default" /> | |||
<!-- TESTING DEPENDENCIES --> | |||
<!-- Test frameworks & related --> | |||
<dependency org="junit" name="junit" rev="4.11" | |||
conf="test,ide -> default" /> | |||
conf="ide -> default" /> | |||
<dependency org="org.mockito" name="mockito-all" rev="1.9.5" | |||
conf="test,ide->default" /> | |||
conf="ide ->default" /> | |||
<dependency org="org.hamcrest" name="hamcrest-all" rev="1.3" | |||
conf="test,ide->default" /> | |||
conf="ide ->default" /> | |||
<dependency org="org.easymock" name="easymock" rev="3.0" | |||
conf="test,ide-> default" transitive="true" /> | |||
conf="ide -> default" transitive="true" /> | |||
<dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" | |||
conf="test,ide -> default" /> | |||
conf="ide -> default" /> | |||
<dependency org="commons-io" name="commons-io" rev="${commons-io.version}" | |||
conf="test->default" /> | |||
conf="ide->default" /> | |||
<dependency org="commons-lang" name="commons-lang" | |||
rev="2.6" conf="test,ide->default" /> | |||
rev="2.6" conf="ide ->default" /> | |||
<!-- Bean Validation implementation --> | |||
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" | |||
conf="test -> default" /> | |||
conf="ide -> default" /> | |||
<dependency org="org.hibernate" name="hibernate-validator" | |||
rev="4.2.0.Final" conf="test -> default" /> | |||
rev="4.2.0.Final" conf="ide -> default" /> | |||
<!-- For manual testing with PostgreSQL (see SQLTestConstants) --> | |||
<!-- <dependency org="postgresql" name="postgresql" rev="9.1-901.jdbc3" | |||
conf="test,ide->default" /> --> | |||
conf="ide" /> --> | |||
<!-- remove cssparser override once sass-compiler is updated --> | |||
<override org="net.sourceforge.cssparser" module="cssparser" |
@@ -0,0 +1,324 @@ | |||
<?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-parent</artifactId> | |||
<version>1.0.0</version> | |||
</parent> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-server</artifactId> | |||
<name>vaadin-server</name> | |||
<packaging>jar</packaging> | |||
<version>7.7.0-SNAPSHOT</version> | |||
<properties> | |||
<maven.compiler.source>1.6</maven.compiler.source> | |||
<maven.compiler.target>1.6</maven.compiler.target> | |||
<!-- Used version numbers for dependencies --> | |||
<vaadin.sass.version>0.9.13</vaadin.sass.version> | |||
<commons-io.version>2.4</commons-io.version> | |||
<guava.version>16.0.1.vaadin1</guava.version> | |||
<!-- TODO: Move to Parent --> | |||
<vaadin.gwt.version>2.7.0.vaadin3</vaadin.gwt.version> | |||
</properties> | |||
<organization> | |||
<name>Vaadin Ltd</name> | |||
</organization> | |||
<url>https://vaadin.com/</url> | |||
<description>Vaadin shared</description> | |||
<dependencies> | |||
<!-- API DEPENDENCIES --> | |||
<!-- Liferay Portal Service --> | |||
<dependency> | |||
<groupId>com.liferay.portal</groupId> | |||
<artifactId>portal-service</artifactId> | |||
<version>6.0.2</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<!--Servlet API version 3.0 --> | |||
<dependency> | |||
<groupId>javax.servlet</groupId> | |||
<artifactId>javax.servlet-api</artifactId> | |||
<version>3.0.1</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<!--Portlet API version 2.0 (JSR-286) --> | |||
<dependency> | |||
<groupId>javax.portlet</groupId> | |||
<artifactId>portlet-api</artifactId> | |||
<version>2.0</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<!-- Google App Engine --> | |||
<dependency> | |||
<groupId>com.google.appengine</groupId> | |||
<artifactId>appengine-api-1.0-sdk</artifactId> | |||
<version>1.7.7</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<!-- Bean Validation API --> | |||
<dependency> | |||
<groupId>javax.validation</groupId> | |||
<artifactId>validation-api</artifactId> | |||
<version>1.0.0.GA</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<!-- Sass compiler --> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-sass-compiler</artifactId> | |||
<version>${vaadin.sass.version}</version> | |||
</dependency> | |||
<!-- LIBRARY DEPENDENCIES (compile time) --> | |||
<!-- Project modules --> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-shared</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-push</artifactId> | |||
<version>${project.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<!-- Jsoup for BootstrapHandler --> | |||
<dependency> | |||
<groupId>org.jsoup</groupId> | |||
<artifactId>jsoup</artifactId> | |||
<version>1.8.3</version> | |||
</dependency> | |||
<!-- TESTING DEPENDENCIES --> | |||
<!-- Test frameworks & related --> | |||
<dependency> | |||
<groupId>junit</groupId> | |||
<artifactId>junit</artifactId> | |||
<version>4.11</version> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.mockito</groupId> | |||
<artifactId>mockito-all</artifactId> | |||
<version>1.9.5</version> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.hamcrest</groupId> | |||
<artifactId>hamcrest-all</artifactId> | |||
<version>1.3</version> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.easymock</groupId> | |||
<artifactId>easymock</artifactId> | |||
<version>3.0</version> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.hsqldb</groupId> | |||
<artifactId>hsqldb</artifactId> | |||
<version>2.2.6</version> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>commons-io</groupId> | |||
<artifactId>commons-io</artifactId> | |||
<version>${commons-io.version}</version> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>commons-lang</groupId> | |||
<artifactId>commons-lang</artifactId> | |||
<version>2.6</version> | |||
<scope>test</scope> | |||
</dependency> | |||
<!-- Bean Validation implementation --> | |||
<dependency> | |||
<groupId>org.slf4j</groupId> | |||
<artifactId>slf4j-log4j12</artifactId> | |||
<version>1.6.1</version> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.hibernate</groupId> | |||
<artifactId>hibernate-validator</artifactId> | |||
<version>4.2.0.Final</version> | |||
<scope>test</scope> | |||
</dependency> | |||
<!-- For manual testing with PostgreSQL (see SQLTestConstants) --> | |||
<!-- <dependency><groupId>postgresql</groupId><artifactId>postgresql</artifactId><version>9.1-901.jdbc3</version></dependency> --> | |||
<!-- Needed GWT dependencies. Required parts are packaged to jar --> | |||
<dependency> | |||
<groupId>com.vaadin.external.gwt</groupId> | |||
<artifactId>gwt-user</artifactId> | |||
<version>${vaadin.gwt.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin.external.gwt</groupId> | |||
<artifactId>gwt-elemental</artifactId> | |||
<version>${vaadin.gwt.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
</dependencies> | |||
<build> | |||
<plugins> | |||
<!-- Copy needed GWT dependencies to package --> | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-dependency-plugin</artifactId> | |||
<version>2.10</version> | |||
<executions> | |||
<execution> | |||
<id>unpack-dependencies</id> | |||
<phase>prepare-package</phase> | |||
<goals> | |||
<goal>unpack</goal> | |||
</goals> | |||
<configuration> | |||
<artifactItems> | |||
<artifactItem> | |||
<groupId>com.vaadin.external.gwt</groupId> | |||
<artifactId>gwt-user</artifactId> | |||
</artifactItem> | |||
</artifactItems> | |||
<includes>com/google/gwt/*/server/**</includes> | |||
<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/resources</directory> | |||
<filtering>false</filtering> | |||
</resource> | |||
<resource> | |||
<directory>src/main/java</directory> | |||
<filtering>false</filtering> | |||
</resource> | |||
</resources> | |||
</configuration> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<artifactId>maven-antrun-plugin</artifactId> | |||
<version>1.8</version> | |||
<executions> | |||
<execution> | |||
<id>compressbootstrap</id> | |||
<phase>prepare-package</phase> | |||
<goals> | |||
<goal>run</goal> | |||
</goals> | |||
<configuration> | |||
<target> | |||
<property name="vaadinBootstrap.js" | |||
location="${project.build.outputDirectory}/VAADIN/vaadinBootstrap.js" /> | |||
<!-- Gzipped version --> | |||
<gzip src="${vaadinBootstrap.js}" destfile="${vaadinBootstrap.js}.gz" /> | |||
</target> | |||
</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.*;version="${project.version}"</Export-Package> | |||
<Import-Package>javax.servlet;version="2.4.0", | |||
javax.servlet.http;version="2.4.0", | |||
javax.validation;version="1.0.0.GA";resolution:=optional, | |||
org.jsoup;version="1.8.3", | |||
org.jsoup.parser;version="1.8.3", | |||
org.jsoup.nodes;version="1.8.3", | |||
org.jsoup.helper;version="1.8.3", | |||
org.jsoup.safety;version="1.8.3", | |||
org.jsoup.select;version="1.8.3", | |||
javax.portlet;version="[2.0,3)";resolution:=optional, | |||
javax.portlet.filter;version="[2.0,3)";resolution:=optional, | |||
com.liferay.portal.kernel.util;resolution:=optional</Import-Package> | |||
<Require-Bundle>com.google.gwt.thirdparty.guava;bundle-version="${guava.version}", | |||
com.vaadin.shared;bundle-version="${project.version}", | |||
com.vaadin.push;bundle-version="${project.version}";resolution:=optional, | |||
com.vaadin.sass-compiler;bundle-version="${vaadin.sass.version}";resolution:=optional"</Require-Bundle> | |||
</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>false</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> | |||
</project> |