Update client-compiler-deps to 1.2.0. Fix classpaths for devmodes. Change-Id: I8452271594b4563bf476420ff7ab22985913e397tags/7.4.0.beta1
@@ -90,6 +90,16 @@ | |||
<td><a href="licenses/apache-license-version-2-0.txt">Apache License, Version 2.0</a></td> | |||
</tr> | |||
<tr> | |||
<td>Closure Stylesheets</td> | |||
<td><a href="licenses/apache-license-version-2-0.txt">Apache License, Version 2.0</a></td> | |||
</tr> | |||
<tr> | |||
<td>ASM</td> | |||
<td><a href="licenses/ow2-asm-license.txt">ASM Project License</a></td> | |||
</tr> | |||
<!-- In vaadin-shared-deps --> | |||
<tr> | |||
<td>Guava</td> | |||
@@ -99,7 +109,7 @@ | |||
<!-- In vaadin-shared-deps --> | |||
<tr> | |||
<td>JSON</td> | |||
<td><a href="licenses/the-json-license.txt">The JSON License</a></td> | |||
<td><a href="licenses/apache-license-version-2-0.txt">Apache License, Version 2.0</a></td> | |||
</tr> | |||
<!-- Used by vaadin-server --> |
@@ -0,0 +1,31 @@ | |||
http://asm.ow2.org/license.html | |||
Copyright (c) 2000-2011 INRIA, France Telecom | |||
All rights reserved. | |||
Redistribution and use in source and binary forms, with or without | |||
modification, are permitted provided that the following conditions | |||
are met: | |||
1. Redistributions of source code must retain the above copyright | |||
notice, this list of conditions and the following disclaimer. | |||
2. Redistributions in binary form must reproduce the above copyright | |||
notice, this list of conditions and the following disclaimer in the | |||
documentation and/or other materials provided with the distribution. | |||
3. Neither the name of the copyright holders nor the names of its | |||
contributors may be used to endorse or promote products derived from | |||
this software without specific prior written permission. | |||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | |||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |||
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | |||
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |||
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |||
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | |||
THE POSSIBILITY OF SUCH DAMAGE. |
@@ -6,5 +6,5 @@ vaadin.url=http://vaadin.com | |||
vaadin.java.version=1.6 | |||
vaadin.version=0.0.0.unversioned-development-build | |||
vaadin.sass.version=0.9.10 | |||
gwt.version=2.6.0.vaadin5 | |||
gwt.version=2.7.0.beta1vaadin1 | |||
commons-io.version=2.4 |
@@ -29,10 +29,10 @@ | |||
<path refid="client-compiler.deps" /> | |||
<path refid="server.deps" /> | |||
<path refid="shared.deps" /> | |||
<path refid="uitest.deps" /> | |||
<path refid="client.deps" /> | |||
<path refid="buildhelpers.deps" /> | |||
<path refid="gwt.deps" /> | |||
<path refid="uitest.deps" /> | |||
<path location="server/src" /> | |||
<path location="shared/src" /> | |||
<path location="uitest/src" /> | |||
@@ -163,6 +163,7 @@ | |||
<sysproperty key="vFailIfNotSerializable" value="true" /> | |||
<jvmarg value="-Xss8M" /> | |||
<jvmarg value="-Xmx1G" /> | |||
<jvmarg value="-XX:MaxPermSize=256M" /> | |||
<jvmarg value="-Djava.awt.headless=true" /> | |||
<jvmarg value="-Dgwt.usearchives=false" /> |
@@ -44,6 +44,12 @@ | |||
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"> | |||
@@ -88,7 +94,7 @@ | |||
conf="build,ide -> default" /> | |||
<dependency org="com.vaadin" name="vaadin-client-compiler-deps" | |||
rev="1.1.0" conf="build,ide -> default" /> | |||
rev="1.2.0" conf="build,ide -> default" /> | |||
</dependencies> | |||
@@ -32,10 +32,11 @@ import java.util.Locale; | |||
import java.util.ResourceBundle; | |||
import java.util.prefs.Preferences; | |||
import org.apache.commons.io.IOUtils; | |||
import elemental.json.JsonException; | |||
import elemental.json.JsonObject; | |||
import elemental.json.impl.JsonUtil; | |||
import org.apache.commons.io.IOUtils; | |||
/** | |||
* This class is able to validate the vaadin CVAL license. | |||
@@ -54,8 +55,8 @@ public final class CvalChecker { | |||
* It is not in a separate f le, so as it is easier to copy into any product | |||
* which does not depend on vaadin core. | |||
* | |||
* We are using org.json in order not to use additional dependency like | |||
* auto-beans, gson, etc. | |||
* We are using elemental.json in order not to use additional dependency | |||
* like auto-beans, gson, etc. | |||
*/ | |||
public static class CvalInfo { | |||
@@ -13,11 +13,7 @@ | |||
<inherits name="com.google.gwt.json.JSON" /> | |||
<inherits name="com.google.gwt.logging.Logging" /> | |||
<!-- Firebug handler is deprecated but for some reason still enabled | |||
by default --> | |||
<set-property name="gwt.logging.firebugHandler" value="DISABLED" /> | |||
<!-- Disable popup logging as we have our own popup logger --> | |||
<set-property name="gwt.logging.popupHandler" value="DISABLED" /> | |||
<set-property name="gwt.logging.enabled" value="TRUE" /> | |||
<inherits name="com.vaadin.VaadinBrowserSpecificOverrides" /> | |||
@@ -58,10 +54,9 @@ | |||
<!-- Use the new cross site linker to get a nocache.js without document.write --> | |||
<add-linker name="xsiframe" /> | |||
<extend-property name="user.agent" values="opera" /> | |||
<!-- Remove IE6/IE7 permutation as they are not supported --> | |||
<set-property name="user.agent" value="ie8,ie9,ie10,gecko1_8,safari,opera" /> | |||
<set-property name="user.agent" value="ie8,ie9,ie10,gecko1_8,safari" /> | |||
<!-- Pointer event support --> | |||
<define-property name="modernie" values="none,yes" /> |
@@ -15,9 +15,9 @@ | |||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="vaadin" type="1"/> "/> | |||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=client%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=" javaProject="vaadin" path="3" type="4"/> "/> | |||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=shared%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=" javaProject="vaadin" path="3" type="4"/> "/> | |||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=uitest%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D" javaProject="vaadin" path="3" type="4"/> "/> | |||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=push%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=" javaProject="vaadin" path="3" type="4"/> "/> | |||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=gwt%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D" javaProject="vaadin" path="3" type="4"/> "/> | |||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=uitest%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D" javaProject="vaadin" path="3" type="4"/> "/> | |||
</listAttribute> | |||
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/> | |||
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/> |
@@ -15,9 +15,9 @@ | |||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="vaadin" type="1"/> "/> | |||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=client%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=" javaProject="vaadin" path="3" type="4"/> "/> | |||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=shared%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=" javaProject="vaadin" path="3" type="4"/> "/> | |||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=uitest%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D" javaProject="vaadin" path="3" type="4"/> "/> | |||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=push%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=" javaProject="vaadin" path="3" type="4"/> "/> | |||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=gwt%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D" javaProject="vaadin" path="3" type="4"/> "/> | |||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=uitest%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D" javaProject="vaadin" path="3" type="4"/> "/> | |||
</listAttribute> | |||
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/> | |||
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.codeserver.CodeServer"/> |