Clean up obsolete Ivy/Ant confs/targets

This change removes publishing related Ivy files and Ant targets etc.

Further cleanup will be done in later changesets.

Change-Id: Ibe430495e85a1b0f3538072a4823c627ddac2924

1 files changed, 0 insertions, 230 deletions

diff --git a/common.xml b/common.xml
index c624efce0c..d61a98bc3c 100644
--- a/common.xml
+++ b/common.xml
@@ -8,10 +8,6 @@
     <dirname property="vaadin.basedir" file="${ant.file.common}" />
     <property file="${vaadin.basedir}/build.properties" />
 
-    <property name="modules.producing.jar" value="shared,server,client,client-compiler,client-compiled,themes,push,widgets" />
-    <property name="modules.to.publish.to.maven" value="${modules.producing.jar},bom" />
-    <property name="modules.to.publish.to.download" value="${modules.to.publish.to.maven},all" />
-
     <ivy:settings file="${vaadin.basedir}/ivysettings.xml" />
     <ivy:settings file="${vaadin.basedir}/ivysettings.xml" id="ivysettings" />
     <ivy:resolve log="download-only" file="${vaadin.basedir}/ivy-taskdefs.xml" conf="taskdefs" />
@@ -21,217 +17,12 @@
     <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" />
 
     <!-- FIXME These are not available in other files -->
-    <antcontrib:propertyregex property="vaadin.version.major" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\1" />
-    <antcontrib:propertyregex property="vaadin.version.minor" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\2" />
-    <antcontrib:propertyregex property="vaadin.version.revision" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\3" />
     <filterset begintoken="@" endtoken="@" id="filter-vaadin.version">
         <filter token="version" value="${vaadin.version}" />
     </filterset>
 
     <union id="empty.reference" />
 
-    <target name="pom.xml" description="Generates a pom.xml based on the Ivy configuration. Either for a snapshot or a release version" depends="pom.xml.release,pom.xml.snapshot">
-    </target>
-
-    <property name="common.jarfiles.dir" location="${vaadin.basedir}/buildhelpers/result/WebContent" />
-
-    <target name="pom.xml.release" if="build.release">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <property name="ivy.xml" location="${result.dir}/../ivy.xml" />
-        <property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
-        <property name="conf" value="build, build-provided" />
-        <property name="vaadin.maven.version" value="${vaadin.version}" />
-
-        <ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="${conf}">
-            <mapping conf="build" scope="compile" />
-            <mapping conf="build-provided" scope="provided" />
-        </ivy:makepom>
-    </target>
-
-    <target name="pom.xml.snapshot" unless="build.release">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <property name="ivy.xml" location="${result.dir}/../ivy.xml" />
-        <property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
-        <property name="temp.pom.xml" location="${pom.xml}.temp" />
-        <property name="conf" value="build, build-provided" />
-        <property name="vaadin.maven.version" value="${vaadin.version.major}.${vaadin.version.minor}-SNAPSHOT" />
-
-        <ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${temp.pom.xml}" conf="${conf}">
-            <mapping conf="build" scope="compile" />
-            <mapping conf="build-provided" scope="provided" />
-        </ivy:makepom>
-        <copy file="${temp.pom.xml}" tofile="${pom.xml}">
-            <filterchain>
-                <replacestring from="${vaadin.version}" to="${vaadin.maven.version}" />
-            </filterchain>
-        </copy>
-        <delete file="${temp.pom.xml}" />
-    </target>
-
-
-    <target name="sources.jar" depends="compile">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <fail unless="module.name" message="No module.name parameter given" />
-        <fail unless="src" message="No src directory parameter given" />
-
-        <property name="sources.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}-sources.jar" />
-
-        <jar file="${sources.jar}" compress="true">
-            <fileset dir="${src}">
-                <patternset>
-                    <include name="**/*.java" />
-                    <include name="**/*.properties" />
-                </patternset>
-            </fileset>
-<!--            <fileset dir="${common.jarfiles.dir}" /> -->
-            <restrict>
-                <union refid="extra.jar.includes" />
-                <name name="*.java" />
-            </restrict>
-        </jar>
-
-    </target>
-
-    <target name="javadoc.jar" depends="dependencies">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <fail unless="module.name" message="No module.name parameter given" />
-        <property name="src" location="{$result.dir}/../src" />
-        <property name="javadoc.dir" value="${result.dir}/javadoc" />
-        <property name="javadoc.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}-javadoc.jar" />
-
-        <antcontrib:if>
-            <!--
-              Most straight forward way to skip javadocs is to provide
-              an empty javadoc.jar. Ivy publish won't allow leaving the file
-              out without using conf attribute. Using conf would make internal
-              dependency resolution unnecessary complicated.
-             -->
-            <isset property="nojavadoc" />
-            <then>
-                <jar file="${javadoc.jar}" compress="true">
-             		<!-- <fileset dir="${common.jarfiles.dir}" /> -->
-                </jar>
-            </then>
-            <else>
-                <javadoc destdir="${javadoc.dir}" author="true" version="true" use="true" windowtitle="${module.name}">
-                    <packageset dir="${src}" excludes="${classes.exclude}" />
-
-                    <doctitle>&lt;h1>${module.name}&lt;/h1></doctitle>
-                    <!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> -->
-                    <bottom>${javadoc.bottom}</bottom>
-                    <link offline="true" href="http://docs.oracle.com/javase/6/docs/api/" packagelistLoc="build/javadoc/j2se-1.6.0" />
-                    <link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" packagelistLoc="build/javadoc/j2ee-1.4" />
-                    <classpath refid="classpath.compile.dependencies" />
-                </javadoc>
-
-                <!-- Create a javadoc jar -->
-                <jar file="${javadoc.jar}" compress="true">
-                    <fileset dir="${javadoc.dir}" />
-                    <!-- <fileset dir="${common.jarfiles.dir}" /> -->
-                </jar>
-            </else>
-        </antcontrib:if>
-    </target>
-
-    <target name="jar" depends="compile, pom.xml">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <fail unless="module.name" message="No module.name parameter given" />
-
-        <property name="result.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
-        <property name="classes" location="{$result.dir}/classes" />
-        <property name="src" location="{$result.dir}/../src" />
-
-        <union id="jar.files">
-            <fileset dir="${classes}" excludes="${classes.exclude}" erroronmissingdir="false" />
-            <fileset dir="${src}" excludes="${jar.exclude}" erroronmissingdir="false" />
-            <!-- <fileset dir="${common.jarfiles.dir}" /> -->
-            <union refid="extra.jar.includes" />
-        </union>
-
-        <jar destfile="${result.jar}" duplicate="fail" index="true">
-            <manifest>
-                <attribute name="Implementation-Vendor" value="${vaadin.vendor}" />
-                <attribute name="Implementation-URL" value="${vaadin.url}" />
-                <attribute name="Implementation-Version" value="${vaadin.version}" />
-            </manifest>
-            <union refid="jar.files" />
-        </jar>
-
-        <antcall target="common.make-osgi-bundle">
-            <param name="jar" value="${result.jar}" />
-            <param name="bundle-version" value="${vaadin.version}" />
-            <param name="bundle-name" value="${module.name}" />
-            <param name="bundle-symbolic" value="${module.symbolic}" />
-            <param name="bundle-vendor" value="${vaadin.vendor}" />
-            <param name="includeNumberPackages" value="${osgi.includeNumberPackages}" />
-        </antcall>
-
-    </target>
-
-    <!-- Add OSGi attributes to the manifest of the given jar -->
-    <target name="make-osgi-bundle">
-        <fail unless="jar" message="No jar parameter given" />
-        <fail unless="bundle-name" message="No bundle-name parameter given" />
-        <fail unless="bundle-symbolic" message="No bundle-symbolic parameter given" />
-        <fail unless="bundle-version" message="No bundle-version parameter given" />
-        <fail unless="bundle-vendor" message="No bundle-vendor parameter given" />
-        <fail unless="includeNumberPackages" message="No includeNumberPackages parameter given" />
-        <property name="bundle-manifestversion" value="2" />
-
-        <jar file="${jar}" update="true">
-            <manifest>
-                <attribute name="Bundle-Version" value="${bundle-version}" />
-                <attribute name="Bundle-ManifestVersion" value="${bundle-manifestversion}" />
-                <attribute name="Bundle-Name" value="${bundle-name}" />
-                <attribute name="Bundle-SymbolicName" value="${bundle-symbolic}" />
-                <attribute name="Bundle-Vendor" value="${bundle-vendor}" />
-                <attribute name="Bundle-RequiredExecutionEnvironment" value="JavaSE-${vaadin.java.version}" />
-            </manifest>
-        </jar>
-
-        <antcontrib:if>
-            <isset property="import-package" />
-            <then>
-                <jar file="${result.jar}" update="true">
-                    <manifest>
-                        <attribute name="Import-Package" value="${import-package}" />
-                    </manifest>
-                </jar>
-            </then>
-        </antcontrib:if>
-        <antcontrib:if>
-            <isset property="require-bundle" />
-            <then>
-                <jar file="${result.jar}" update="true">
-                    <manifest>
-                        <attribute name="Require-Bundle" value="${require-bundle}" />
-                    </manifest>
-                </jar>
-            </then>
-        </antcontrib:if>
-        <antcontrib:if>
-            <isset property="export-package" />
-            <then>
-                <jar file="${result.jar}" update="true">
-                    <manifest>
-                        <attribute name="Export-Package" value="${export-package}" />
-                    </manifest>
-                </jar>
-            </then>
-        </antcontrib:if>
-
-        <ivy:resolve inline="true" organisation="com.vaadin" module="vaadin-buildhelpers" revision="${vaadin.version}" keep="true" />
-        <ivy:cachepath pathid="buildhelpers.classpath" />
-
-        <!-- Generate the Export-Package attribute in the manifest -->
-        <java classname="com.vaadin.buildhelpers.GeneratePackageExports" failonerror="true" fork="yes">
-            <arg value="${jar}" />
-            <arg line="com/vaadin com/google ${osgi.extra.package.prefixes}" />
-            <classpath refid="buildhelpers.classpath" />
-            <jvmarg value="-Dvaadin.version=${vaadin.version}" />
-            <jvmarg value="-DincludeNumberPackages=${includeNumberPackages}" />
-        </java>
-    </target>
 
     <target name="compile" description="Compiles the module" depends="dependencies, directories" if="src-exists">
         <fail unless="module.name" message="No module name given" />
@@ -331,27 +122,6 @@
         <delete dir="${result.dir}" />
     </target>
 
-    <target name="publish-local" description="Publishes the given module to the local repository">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <property name="conf" value="*(public)" />
-
-        <ivy:resolve log="download-only" conf="${conf}" />
-        <ivy:publish settingsref="ivysettings" conf="${conf}" resolver="build-temp" overwrite="true" forcedeliver="true">
-            <!-- <artifacts pattern="${result.dir}/[artifact]-[revision].[ext]" 
-                /> -->
-            <artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" />
-
-        </ivy:publish>
-    </target>
-
-    <target name="publish.to.local.maven">
-        <property name="conf" value="*(public)" />
-
-        <ivy:resolve log="download-only" conf="${conf}" />
-        <ivy:publish conf="${conf}" resolver="local-maven" overwrite="true">
-        </ivy:publish>
-    </target>
-
     <!-- Checkstyle conf -->
     <property name="cs.dir" location="${vaadin.basedir}/checkstyle" />
     <property name="cs.xml" location="${cs.dir}/vaadin-checkstyle.xml" />