more changes for builds to work from clean

This commit is contained in:
Timothy Prepscius 2013-09-28 19:26:54 -04:00
parent a5e423727a
commit 5c178f7bf2
7 changed files with 25 additions and 98 deletions

View File

@ -10,25 +10,6 @@
</manifest> </manifest>
<fileset dir="../../java/core/bin"/> <fileset dir="../../java/core/bin"/>
<fileset dir="../../java/ext/bouncycastle/bin"/> <fileset dir="../../java/ext/bouncycastle/bin"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/annotations-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-ant.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-ha.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-tribes.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/ecj-4.2.1.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/el-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jasper-el.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jasper.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jsp-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/servlet-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-coyote.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-dbcp.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-es.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-fr.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-ja.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-jdbc.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-util.jar"/>
<fileset dir="../../java/ext/jordanzimmerman/bin"/> <fileset dir="../../java/ext/jordanzimmerman/bin"/>
<fileset dir="../../java/ext/json/bin"/> <fileset dir="../../java/ext/json/bin"/>
<zipfileset excludes="META-INF/*.SF" src="../../java/core/lib/dropbox-java-sdk-1.3.jar"/> <zipfileset excludes="META-INF/*.SF" src="../../java/core/lib/dropbox-java-sdk-1.3.jar"/>

View File

@ -10,25 +10,6 @@
</manifest> </manifest>
<fileset dir="../../java/core/bin"/> <fileset dir="../../java/core/bin"/>
<fileset dir="../../java/ext/bouncycastle/bin"/> <fileset dir="../../java/ext/bouncycastle/bin"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/annotations-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-ant.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-ha.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-tribes.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/ecj-4.2.1.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/el-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jasper-el.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jasper.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jsp-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/servlet-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-coyote.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-dbcp.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-es.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-fr.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-ja.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-jdbc.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-util.jar"/>
<fileset dir="../../java/ext/jordanzimmerman/bin"/> <fileset dir="../../java/ext/jordanzimmerman/bin"/>
<fileset dir="../../java/ext/json/bin"/> <fileset dir="../../java/ext/json/bin"/>
<zipfileset excludes="META-INF/*.SF" src="../../java/core/lib/dropbox-java-sdk-1.3.jar"/> <zipfileset excludes="META-INF/*.SF" src="../../java/core/lib/dropbox-java-sdk-1.3.jar"/>

View File

@ -10,25 +10,6 @@
</manifest> </manifest>
<fileset dir="../../java/core/bin"/> <fileset dir="../../java/core/bin"/>
<fileset dir="../../java/ext/bc-packaged/bin"/> <fileset dir="../../java/ext/bc-packaged/bin"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/annotations-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/catalina-ant.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/catalina-ha.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/catalina-tribes.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/catalina.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/ecj-4.2.1.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/el-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/jasper-el.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/jasper.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/jsp-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/servlet-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-coyote.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-dbcp.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-es.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-fr.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-ja.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-jdbc.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat-7.0.37/lib/tomcat-util.jar"/>
<fileset dir="../../java/ext/jordanzimmerman/bin"/> <fileset dir="../../java/ext/jordanzimmerman/bin"/>
<fileset dir="../../java/ext/json/bin"/> <fileset dir="../../java/ext/json/bin"/>
<zipfileset excludes="META-INF/*.SF" src="../../java/core/lib/dropbox-java-sdk-1.3.jar"/> <zipfileset excludes="META-INF/*.SF" src="../../java/core/lib/dropbox-java-sdk-1.3.jar"/>

View File

@ -11,25 +11,6 @@
<fileset dir="../../java/app/tools/bin"/> <fileset dir="../../java/app/tools/bin"/>
<fileset dir="../../java/core/bin"/> <fileset dir="../../java/core/bin"/>
<fileset dir="../../java/ext/bouncycastle/bin"/> <fileset dir="../../java/ext/bouncycastle/bin"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/annotations-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-ant.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-ha.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina-tribes.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/catalina.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/ecj-4.2.1.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/el-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jasper-el.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jasper.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/jsp-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/servlet-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-api.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-coyote.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-dbcp.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-es.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-fr.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-i18n-ja.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-jdbc.jar"/>
<zipfileset excludes="META-INF/*.SF" src="../../ext/apache-tomcat/lib/tomcat-util.jar"/>
<fileset dir="../../java/ext/jordanzimmerman/bin"/> <fileset dir="../../java/ext/jordanzimmerman/bin"/>
<fileset dir="../../java/ext/json/bin"/> <fileset dir="../../java/ext/json/bin"/>
<zipfileset excludes="META-INF/*.SF" src="../../java/core/lib/dropbox-java-sdk-1.3.jar"/> <zipfileset excludes="META-INF/*.SF" src="../../java/core/lib/dropbox-java-sdk-1.3.jar"/>

3
ext/.gitignore vendored
View File

@ -1,3 +1,2 @@
*.tar.gz *
*.zip

View File

@ -8,7 +8,7 @@
<property environment="env"/> <property environment="env"/>
<property name="ECLIPSE_HOME" value="../../../../../Desktop/eclipse"/> <property name="ECLIPSE_HOME" value="../../../../../Desktop/eclipse"/>
<property name="Mailiverse.Ext.Apache.location" value="../../ext/apache"/> <property name="Mailiverse.Ext.Apache.location" value="../../ext/apache"/>
<property name="Mailiverse.Ext.BouncyCastle.location" value="../../ext/lcrypto-jdk15on-148"/> <property name="Mailiverse.Ext.BouncyCastle.location" value="../../ext/bouncycastle"/>
<property name="Mailiverse.Ext.JordanZimmerman.location" value="../../ext/jordanzimmerman"/> <property name="Mailiverse.Ext.JordanZimmerman.location" value="../../ext/jordanzimmerman"/>
<property name="Mailiverse.Ext.Json.location" value="../../ext/json"/> <property name="Mailiverse.Ext.Json.location" value="../../ext/json"/>
<property name="Mailiverse.Core.location" value="../../core"/> <property name="Mailiverse.Core.location" value="../../core"/>
@ -17,25 +17,25 @@
<property name="source" value="1.6"/> <property name="source" value="1.6"/>
<path id="EAR Libraries.libraryclasspath"/> <path id="EAR Libraries.libraryclasspath"/>
<path id="Apache Tomcat v7.0 [Apache Tomcat v7.0].libraryclasspath"> <path id="Apache Tomcat v7.0 [Apache Tomcat v7.0].libraryclasspath">
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/annotations-api.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/annotations-api.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/catalina-ant.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/catalina-ant.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/catalina-ha.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/catalina-ha.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/catalina-tribes.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/catalina-tribes.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/catalina.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/catalina.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/ecj-4.2.1.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/ecj-4.2.1.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/el-api.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/el-api.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/jasper-el.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/jasper-el.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/jasper.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/jasper.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/jsp-api.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/jsp-api.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/servlet-api.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/servlet-api.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-api.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/tomcat-api.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-coyote.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/tomcat-coyote.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-dbcp.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/tomcat-dbcp.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-es.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/tomcat-i18n-es.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-fr.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/tomcat-i18n-fr.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-ja.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/tomcat-i18n-ja.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-jdbc.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/tomcat-jdbc.jar"/>
<pathelement location="../../../ext/apache-tomcat-7.0.37/lib/tomcat-util.jar"/> <pathelement location="../../../ext/apache-tomcat/lib/tomcat-util.jar"/>
</path> </path>
<path id="Mailiverse.Ext.BouncyCastle.classpath"> <path id="Mailiverse.Ext.BouncyCastle.classpath">
<pathelement location="${Mailiverse.Ext.BouncyCastle.location}/bin"/> <pathelement location="${Mailiverse.Ext.BouncyCastle.location}/bin"/>

View File

@ -1,3 +1,7 @@
pushd app/tools
ant clean && ant
popd
pushd core pushd core
ant clean && ant ant clean && ant
popd popd