From fae0a3486d92185c03658ba974ab04d0bf8f05e7 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 10 Sep 2012 13:47:04 +0300
Subject: Removed files which are no longer needed (#9299)

---
 build/ivy/buildhelpers-ivy.xml                     | 19 --------
 build/ivy/ivy.xml                                  | 52 ----------------------
 build/ivy/ivysettings.xml                          | 24 ----------
 build/ivy/module/smartsprites-ivy-0.2.3-itmill.xml | 38 ----------------
 4 files changed, 133 deletions(-)
 delete mode 100644 build/ivy/buildhelpers-ivy.xml
 delete mode 100644 build/ivy/ivy.xml
 delete mode 100644 build/ivy/ivysettings.xml
 delete mode 100644 build/ivy/module/smartsprites-ivy-0.2.3-itmill.xml

(limited to 'build/ivy')

diff --git a/build/ivy/buildhelpers-ivy.xml b/build/ivy/buildhelpers-ivy.xml
deleted file mode 100644
index 13e89eb734..0000000000
--- a/build/ivy/buildhelpers-ivy.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<ivy-module version="2.0" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd">
-    
-    <info organisation="com.vaadin" module="buildhelpers"/>
-    <configurations>
-        <conf name="compile" visibility="private"/>       
-    </configurations>
-    <publications />        
-    <dependencies>
-        <dependency org="com.carrotsearch" name="smartsprites" rev="0.2.3-itmill" conf="compile->compile(*),master(*)"/>
-        
-        <!-- These come with GWT for Vaadin JAR but are needed to compile CompileDefaultTheme -->
-        <!-- 
-        <dependency org="org.w3c.css" name="sac" rev="1.3" conf="compile->compile(*),master(*)"/>
-        <dependency org="org.w3c" name="flute" rev="1.2" conf="compile->compile(*),master(*)"/>
-        -->
-    </dependencies>
-</ivy-module>
\ No newline at end of file
diff --git a/build/ivy/ivy.xml b/build/ivy/ivy.xml
deleted file mode 100644
index df30458e25..0000000000
--- a/build/ivy/ivy.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<ivy-module version="2.0" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd">
-    
-    <info organisation="com.vaadin" module="vaadin"/>
-    <configurations>
-   		<conf name="server.extdep" extends="client.extdep" description="Server side compilation dependencies" visibility="private"/>
-   		<conf name="shared.extdep" extends="server.extdep" description="Shared compilation dependencies" visibility="private"/>
-   		<conf name="client.extdep" description="Client side compilation dependencies" visibility="private"/>
-   		<conf name="client-compiler.extdep" description="Client side compilation dependencies" visibility="private"/>
-   		<conf name="server.tests.extdep" extends="server.extdep" description="Test compilation dependencies" visibility="private"/>
-   		<conf name="taskdefs" description="Ant task definitions" visibility="private" />
-	</configurations>
-    <publications />        
-	<dependencies defaultconf="server.extdep" defaultconfmapping="server.extdep->master">
-
-		<!--Servlet API version 2.5 -->
-		<dependency org="javax.servlet" name="servlet-api" rev="2.5" />   		
-
-   		<!-- Liferay Portal Service -->
-		<dependency org="com.liferay.portal" name="portal-service" rev="6.0.2" />
-		<!--Portlet API version 2.0 (JSR-286) -->
-		<dependency org="javax.portlet" name="portlet-api" rev="2.0" />   		
-   		<!-- Google App Engine -->
-   		<dependency org="com.google.appengine" name="appengine-api-1.0-sdk" rev="1.2.1" />  
-     
-        <!-- GWT dependencies (validation-api) -->
-        <dependency org="javax.validation" name="validation-api" rev="1.0.0.GA" conf="client.extdep->master,sources" />
-         
-   		<!-- Test frameworks & related -->
-   		<dependency org="junit" name="junit" rev="4.5" conf="server.tests.extdep -> master"/>
-   		<dependency org="org.easymock" name="easymock" rev="3.0" conf="server.tests.extdep -> master, runtime(*)"/>  
-   		<dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" conf="server.tests.extdep -> master, runtime(*)"/>  
-
-   		<!-- Additional libraries used by tests - also included from GWT -->
-   		<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.26" conf="server.tests.extdep -> master"/>
-   		<dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.26" conf="server.tests.extdep -> master"/>
-   		<dependency org="commons-lang" name="commons-lang" rev="2.6" conf="server.tests.extdep -> master"/>
-   		<dependency org="commons-io" name="commons-io" rev="2.3" conf="server.tests.extdep -> master"/>
-   		<dependency org="commons-codec" name="commons-codec" rev="1.6" conf="server.tests.extdep -> master"/>
-
-   		<!-- Ant tasks -->   	
-   		<dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="taskdefs ->master"/>
-   		<dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.0.10" conf="taskdefs ->master"/>
-   		<dependency org="com.googlecode.jarjar" name="jarjar" rev="1.3" conf="taskdefs ->master"/>
-   	   	   		
-        <!-- Bean Validation implementation -->
-        <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" conf="server.tests.extdep -> default"/>
-        <dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="server.tests.extdep -> default"/>
-	</dependencies>
-
-</ivy-module>
\ No newline at end of file
diff --git a/build/ivy/ivysettings.xml b/build/ivy/ivysettings.xml
deleted file mode 100644
index 613b8d9ffe..0000000000
--- a/build/ivy/ivysettings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivysettings>
-    <settings defaultResolver="public" />
-    <resolvers>
-        <ibiblio name="public" m2compatible="true"/>        
-        <url name="gwt-redist">            
-            <artifact pattern="http://google-web-toolkit.googlecode.com/svn/tools/redist/[organisation]/[artifact](-[revision]).[ext]" />
-        </url>
-        <dual name="custom-smartsprites">
-            <filesystem name="smartsprites-ivy">
-                 <ivy pattern="${basedir}/build/ivy/module/[module]-ivy-[revision].xml" />
-            </filesystem>
-            <url name="smartsprites-artifact">
-                <artifact pattern="http://dev.vaadin.com/svn/versions/6.8/build/smartsprites/lib/[artifact](-[revision]).[ext]" />
-            </url>
-        </dual>
-    </resolvers>     
-    <modules>
-        <!-- GWT patched Emma -->
-        <module organisation="emma" name="emma" resolver="gwt-redist"/>
-         <!-- IT Mill patched SmartSprites -->
-        <module organisation="com.carrotsearch" name="smartsprites" revision="0.2.3-itmill" resolver="custom-smartsprites"/>   
-    </modules>
-</ivysettings>
\ No newline at end of file
diff --git a/build/ivy/module/smartsprites-ivy-0.2.3-itmill.xml b/build/ivy/module/smartsprites-ivy-0.2.3-itmill.xml
deleted file mode 100644
index 495b6d00c9..0000000000
--- a/build/ivy/module/smartsprites-ivy-0.2.3-itmill.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
-    <info organisation="com.carrotsearch"
-        module="smartsprites"
-        revision="0.2.3-itmill"
-        status="release"
-        publication="20111130000000">
-        <license name="BSD license" url="http://csssprites.org/smartsprites.LICENSE" />
-        <description homepage="http://csssprites.org">
-        CSS Sprites Generator Done Right. SmartSprites maintains CSS sprites in your designs, 
-    fully automatically. No tedious copying and pasting to your CSS when adding or changing 
-    sprited images.
-        </description>
-        </info>
-    <configurations>
-        <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
-        <conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
-        <conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/>
-        <conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
-        <conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
-        <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." extends="runtime"/>
-        <conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
-        <conf name="sources" visibility="public" description="this configuration contains the source artifact of this module, if any."/>
-        <conf name="javadoc" visibility="public" description="this configuration contains the javadoc artifact of this module, if any."/>
-        <conf name="optional" visibility="public" description="contains all optional dependencies"/>
-    </configurations>
-    <publications>
-        <artifact name="smartsprites" type="jar" ext="jar" conf="master"/>
-    </publications>
-    <dependencies>
-        <dependency org="com.google.collections" name="google-collections" rev="0.9" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-        <dependency org="args4j" name="args4j" rev="2.0.9" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-        <dependency org="commons-math" name="commons-math" rev="1.1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-        <dependency org="commons-io" name="commons-io" rev="1.4" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-        <dependency org="commons-lang" name="commons-lang" rev="2.3" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-        <dependency org="junit" name="junit" rev="4.4" force="true" conf="test->runtime(*),master(*)"/>
-    </dependencies>
-</ivy-module>
-- 
cgit v1.2.3