diff options
| -rw-r--r-- | client-compiler/ivy.xml | 103 | ||||
| -rw-r--r-- | gwt-files.xml | 63 |
2 files changed, 108 insertions, 58 deletions
diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml index ee36e4e261..7185c12a89 100644 --- a/client-compiler/ivy.xml +++ b/client-compiler/ivy.xml @@ -1,57 +1,62 @@ <?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"> + 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}" /> + <info organisation="com.vaadin" module="vaadin-client-compiler" + revision="${vaadin.version}" /> - <configurations> - <conf name="build" /> - <conf name="build-provided" /> - <conf name="ide" 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" /> + <configurations> + <conf name="build" /> + <conf name="build-provided" /> + <conf name="ide" 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" /> <dependency org="com.vaadin" name="vaadin-theme-compiler" rev="${vaadin.version}" conf="build" /> - - <dependency org="commons-collections" name="commons-collections" - rev="3.1" 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.5" 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.mortbay.jetty" name="jetty" rev="6.1.11" - conf="build,ide -> default" /> - <dependency org="org.mortbay.jetty" name="jetty-util" - rev="6.1.11" 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.3" conf="build,ide -> default" /> - <dependency org="commons-io" name="commons-io" rev="1.4" - conf="build,ide -> default" /> - <dependency org="commons-lang" name="commons-lang" - rev="2.6" conf="build,ide -> default" /> - <dependency org="org.apache.james" name="apache-mime4j" - rev="0.6" conf="build,ide -> default" /> - </dependencies> + + <dependency org="commons-collections" name="commons-collections" + rev="3.1" conf="build,ide -> default" /> + <dependency org="commons-logging" name="commons-logging" + rev="1.1.1" 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.5" 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.mortbay.jetty" name="jetty" rev="6.1.11" + conf="build,ide -> default" /> + <dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.11" + 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.3" + conf="build,ide -> default" /> + <dependency org="commons-io" name="commons-io" rev="1.4" + conf="build,ide -> default" /> + <dependency org="commons-lang" name="commons-lang" rev="2.6" + conf="build,ide -> default" /> + <dependency org="org.apache.james" name="apache-mime4j" + rev="0.6" conf="build,ide -> default" /> + + <dependency org="com.vaadin" name="vaadin-client-compiler-deps" + rev="0.9.0" conf="build,ide,tests->default" /> + + </dependencies> </ivy-module> diff --git a/gwt-files.xml b/gwt-files.xml index 69e6c04e70..33aba795ef 100644 --- a/gwt-files.xml +++ b/gwt-files.xml @@ -57,17 +57,62 @@ <!-- cssparser --> <exclude name="com/steadystate/css/**" /> <!-- Ant & AntLauncher --> - <exclude name="org/apache/tools/**"/> + <exclude name="org/apache/tools/**" /> <!-- Jetty & jetty-util --> - <exclude name="org/mortbay/**"/> + <exclude name="org/mortbay/**" /> <!-- Swing Worker--> - <exclude name="org/jdesktop/swingworker/**"/> - <!-- Apache commons codec & io & lang --> - <exclude name="org/apache/commons/codec/**"/> - <exclude name="org/apache/commons/io/**"/> - <exclude name="org/apache/commons/lang/**"/> + <exclude name="org/jdesktop/swingworker/**" /> + <!-- Apache commons codec & io & lang & collections & logging --> + <exclude name="org/apache/commons/codec/**" /> + <exclude name="org/apache/commons/io/**" /> + <exclude name="org/apache/commons/lang/**" /> + <exclude name="org/apache/commons/collections/**" /> + <exclude name="org/apache/commons/logging/**" /> <!-- apache mime4j --> - <exclude name="org/apache/james/mime4j/**"/> + <exclude name="org/apache/james/mime4j/**" /> + + <!-- client-compiler-deps --> + <exclude name="com/gargoylesoftware/" /> + <exclude name="com/google/common/" /> + <exclude name="com/google/debugging/" /> + <exclude name="com/google/gwt/dev/protobuf/" /> + <exclude name="com/google/gwt/thirdparty/debugging/" /> + <exclude name="com/google/gwt/thirdparty/javascript/" /> + <exclude name="com/google/gwt/thirdparty/mozilla/" /> + <exclude name="com/ibm/" /> + <exclude name="externs.zip" /> + <exclude name="java_cup/" /> + <exclude name="javax/annotation/" /> + <exclude name="net/sourceforge/htmlunit/" /> + <exclude name="org/apache/bcel/" /> + <exclude name="org/apache/html/" /> + <exclude name="org/apache/http/" /> + <exclude name="org/apache/NOTICE" /> + <exclude name="org/apache/regexp/" /> + <exclude name="org/apache/tapestry/" /> + <exclude name="org/apache/wml/" /> + <exclude name="org/apache/xalan/" /> + <exclude name="org/apache/xerces/" /> + <exclude name="org/apache/xml/" /> + <exclude name="org/apache/xmlcommons/" /> + <exclude name="org/apache/xpath/" /> + <exclude name="org/cyberneko/" /> + <exclude name="org/eclipse/" /> + <exclude name="org/kohsuke/" /> + <exclude name="org/w3c/" /> + <exclude name="org/xml/" /> + <exclude name="rhino_ast/" /> + <exclude name="rhinoDiff.txt" /> + <exclude name="trax/" /> + <exclude name="unicode-license.txt" /> + <exclude name="org/json" /> + + <exclude name="license/NOTICE" /> + <exclude name="license/LICENSE.dom-documentation.txt" /> + <exclude name="license/LICENSE.dom-software.txt" /> + <exclude name="license/LICENSE" /> + <exclude name="license/README.dom.txt" /> + <exclude name="license/README.sax.txt" /> <!-- Overridden in Vaadin --> <exclude name="com/google/gwt/dev/About.properties" /> @@ -105,7 +150,7 @@ <exclude name="com/google/gwt/*/shared/**" /> <exclude name="com/google/gwt/*/*/shared/**" /> <exclude name="com/google/web/bindery/*/shared/**" /> - + <!-- Used by the server, in wrong package in GWT --> <exclude name="com/google/gwt/user/client/rpc/IsSerializable.*" /> |