jvanzyl 2004/05/29 20:21:35
Modified: maven-core bootstrap.sh
maven-core/src/bin classworlds.conf
maven-core/src/main/resources/org/apache/maven plexus.xml
Log:
o cleaning up the distribution setup
Revision Changes Path
1.15 +6 -6 maven-components/maven-core/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/maven-components/maven-core/bootstrap.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bootstrap.sh 28 May 2004 03:23:34 -0000 1.14
+++ bootstrap.sh 30 May 2004 03:21:35 -0000 1.15
@@ -10,7 +10,7 @@
mkdir -p ${DIST}/bin
mkdir -p ${DIST}/lib
mkdir -p ${DIST}/core
-mkdir -p ${DIST}/plugins/plexus
+mkdir -p ${DIST}/plugins
cp target/maven*.jar ${DIST}/lib
@@ -42,11 +42,11 @@
cp "$repoLocal/$i" ${DIST}/lib
done
-#rm -f ${DIST}/lib/plexus*.jar > /dev/null 2>&1
+rm -f ${DIST}/lib/plexus-0.14-SNAPSHOT.jar > /dev/null 2>&1
rm -f ${DIST}/lib/classworlds*.jar > /dev/null 2>&1
-#rm -f ${DIST}/lib/xpp3*.jar > /dev/null 2>&1
-#rm -f ${DIST}/lib/xstream*.jar > /dev/null 2>&1
-#rm -f ${DIST}/lib/junit*.jar > /dev/null 2>&1
+rm -f ${DIST}/lib/xpp3*.jar > /dev/null 2>&1
+rm -f ${DIST}/lib/xstream*.jar > /dev/null 2>&1
+rm -f ${DIST}/lib/junit*.jar > /dev/null 2>&1
# Install parent plugin model
@@ -80,7 +80,7 @@
mboot
)
- cp ../maven-plugins/${plugin}/target/${plugin}*.jar ${DIST}/plugins/plexus
+ cp ../maven-plugins/${plugin}/target/${plugin}*.jar ${DIST}/plugins
done
1.6 +3 -0 maven-components/maven-core/src/bin/classworlds.conf
Index: classworlds.conf
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/bin/classworlds.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- classworlds.conf 7 May 2004 18:01:42 -0000 1.5
+++ classworlds.conf 30 May 2004 03:21:35 -0000 1.6
@@ -3,4 +3,7 @@
set maven.home using ${user.home}/maven.properties default ${user.home}/m2
[core]
+load ${maven.home}/core/plexus-0.14-SNAPSHOT.jar
+load ${maven.home}/core/xstream-1.0-SNAPSHOT.jar
+load ${maven.home}/core/xpp3-1.1.3.3.jar
load ${maven.home}/lib/*.jar
1.16 +1 -1
maven-components/maven-core/src/main/resources/org/apache/maven/plexus.xml
Index: plexus.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/plexus.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plexus.xml 21 May 2004 03:43:28 -0000 1.15
+++ plexus.xml 30 May 2004 03:21:35 -0000 1.16
@@ -10,7 +10,7 @@
</component-discoverers>
</component-discoverer-manager>
<resources>
- <jar-repository>${maven.home}/plugins/plexus</jar-repository>
+ <jar-repository>${maven.home}/plugins</jar-repository>
</resources>
<components>
<component>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
