add dist script, move maven to lib dir

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@607 1c488680-804c-0410-94cd-c6b725194a0e
weld · Dec 19, 2008 · 114a7cb · 114a7cb
1 parent ca708d6
commit 114a7cb
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 3 deletions.
diff --git a/examples/build.xml b/examples/build.xml
@@ -2,7 +2,7 @@
 
 	<dirname property="wbri.dir" file="${ant.file.example.build.script}/../" />
 
-	<property name="maven.dir" location="${wbri.dir}/maven" />
+	<property name="maven.dir" location="${wbri.dir}/lib/maven" />
 
 	<property file="${wbri.dir}/jboss-as/build.properties"/>
 

diff --git a/jboss-as/build.xml b/jboss-as/build.xml
@@ -4,7 +4,7 @@
 	<path id="maven-ant-tasks.classpath" path="../lib/maven-ant-tasks.jar" />
 	<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
 
-	<property name="maven.dir" location="${basedir}/maven" />
+	<property name="maven.dir" location="${basedir}/lib/maven" />
 
 	<property file="build.properties" />
 
@@ -17,6 +17,7 @@
 		<fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
 
 		<delete dir="${jboss.home}/server/default/deployers/webbeans.deployer" failonerror="false" />
+		<delete dir="target/webbeans.deployer" failonerror="false"/>
 
 		<mkdir dir="target/webbeans.deployer"/>
 
@@ -102,4 +103,4 @@
 		</sequential>
 	</macrodef>
 
-</project>
+</project>
diff --git a/maven/LICENSE.txt → lib/maven/LICENSE.txt b/maven/LICENSE.txt → lib/maven/LICENSE.txt
diff --git a/maven/NOTICE.txt → lib/maven/NOTICE.txt b/maven/NOTICE.txt → lib/maven/NOTICE.txt
diff --git a/maven/README.txt → lib/maven/README.txt b/maven/README.txt → lib/maven/README.txt
diff --git a/maven/bin/m2 → lib/maven/bin/m2 b/maven/bin/m2 → lib/maven/bin/m2
diff --git a/maven/bin/m2.bat → lib/maven/bin/m2.bat b/maven/bin/m2.bat → lib/maven/bin/m2.bat
diff --git a/maven/bin/m2.conf → lib/maven/bin/m2.conf b/maven/bin/m2.conf → lib/maven/bin/m2.conf
diff --git a/maven/bin/mvn → lib/maven/bin/mvn b/maven/bin/mvn → lib/maven/bin/mvn
diff --git a/maven/bin/mvn.bat → lib/maven/bin/mvn.bat b/maven/bin/mvn.bat → lib/maven/bin/mvn.bat
diff --git a/maven/bin/mvnDebug → lib/maven/bin/mvnDebug b/maven/bin/mvnDebug → lib/maven/bin/mvnDebug
diff --git a/maven/bin/mvnDebug.bat → lib/maven/bin/mvnDebug.bat b/maven/bin/mvnDebug.bat → lib/maven/bin/mvnDebug.bat
diff --git a/maven/boot/classworlds-1.1.jar → lib/maven/boot/classworlds-1.1.jar b/maven/boot/classworlds-1.1.jar → lib/maven/boot/classworlds-1.1.jar
diff --git a/maven/conf/settings.xml → lib/maven/conf/settings.xml b/maven/conf/settings.xml → lib/maven/conf/settings.xml
diff --git a/maven/lib/maven-2.0.9-uber.jar → lib/maven/lib/maven-2.0.9-uber.jar b/maven/lib/maven-2.0.9-uber.jar → lib/maven/lib/maven-2.0.9-uber.jar