From beabb1fc19391d0821d42a11a125808102e1f71e Mon Sep 17 00:00:00 2001
From: samskivert <samskivert@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Tue, 25 Jan 2011 20:55:59 +0000
Subject: [PATCH] The Maven-based build moved the GWT resources into the main
 samskivert jar file a while back. Let's have the Ant-based build do the same.
 We can also get rid of samskivert-gwt, since it hasn't been necessary for
 some time.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2987 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 build.xml   | 12 ++----------
 gwt-pom.xml | 14 --------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 gwt-pom.xml

diff --git a/build.xml b/build.xml
index bdfc74f0..709f62f7 100644
--- a/build.xml
+++ b/build.xml
@@ -107,17 +107,14 @@
   </target>
 
   <target name="dist" depends="compile" description="Builds jar files.">
-    <jar destfile="${deploy.dir}/${ant.project.name}.jar" basedir="${classes.dir}"/>
     <!-- we export a small selection of classes for use by GWT -->
-    <mkdir dir="${gwtjar.dir}"/>
-    <copy todir="${gwtjar.dir}">
+    <copy todir="${classes.dir}">
       <fileset dir="src/main/resources" includes="com/samskivert/Utils.gwt.xml"/>
       <fileset dir="${src.dir}" includes="com/samskivert/text/MessageUtil.java"/>
       <fileset dir="${src.dir}" includes="com/samskivert/util/ByteEnum.java"/>
       <fileset dir="${src.dir}" includes="com/samskivert/util/ByteEnumUtil.java"/>
     </copy>
-    <jar basedir="${gwtjar.dir}" destfile="${deploy.dir}/${ant.project.name}-gwt.jar"/>
-    <delete dir="${gwtjar.dir}"/>
+    <jar destfile="${deploy.dir}/${ant.project.name}.jar" basedir="${classes.dir}"/>
   </target>
 
   <property name="maven.deploy.repo" value="file://${user.home}/.m2/repository"/>
@@ -129,10 +126,5 @@
       <pom refid="pom"/>
       <attach file="${deploy.dir}/${ant.project.name}-sources.jar" classifier="sources"/>
     </artifact:deploy>
-    <artifact:pom id="gwt-pom" file="gwt-pom.xml"/>
-    <artifact:deploy file="${deploy.dir}/${ant.project.name}-gwt.jar" uniqueVersion="false">
-      <remoteRepository url="${maven.deploy.repo}"/>
-      <pom refid="gwt-pom"/>
-    </artifact:deploy>
   </target>
 </project>
diff --git a/gwt-pom.xml b/gwt-pom.xml
deleted file mode 100644
index b1e52e5c..00000000
--- a/gwt-pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.samskivert</groupId>
-  <artifactId>samskivert-gwt</artifactId>
-  <packaging>jar</packaging>
-  <version>1.3-SNAPSHOT</version>
-  <name>samskivert-gwt</name>
-  <description>Source for classes that work with GWT.</description>
-
-  <dependencies>
-    <!-- none! -->
-  </dependencies>
-</project>