You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/10/27 20:03:44 UTC
cvs commit: maven-components/maven-core/src/bin m2
jvanzyl 2004/10/27 11:03:44
Modified: maven-core/src/bin m2
Log:
o make the script resilient to changes in the classworlds JAR
Could someone try to do the same with the .bat file before I update
to a release version of classworlds?
Revision Changes Path
1.5 +3 -10 maven-components/maven-core/src/bin/m2
Index: m2
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/bin/m2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- m2 23 Oct 2004 13:37:18 -0000 1.4
+++ m2 27 Oct 2004 18:03:44 -0000 1.5
@@ -3,8 +3,6 @@
# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
# reserved.
-CLASSWORLDS_VERSION=1.1-SNAPSHOT
-
if [ -z "$MAVEN_OPTS" ] ; then
MAVEN_OPTS="-Xmx256m"
fi
@@ -65,9 +63,6 @@
M2_HOME=`dirname $BIN_DIR`
fi
-CLASSWORLDS_CONF="${M2_HOME}/bin/classworlds.conf"
-CP=${M2_HOME}/core/boot/classworlds-${CLASSWORLDS_VERSION}.jar
-
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
[ -n "$CP" ] && CP=`cygpath --path --windows "$CP"`
@@ -76,12 +71,10 @@
[ -n "$M2_HOME" ] && M2_HOME=`cygpath --path --windows "$M2_HOME"`
fi
-MAIN_CLASS=org.codehaus.classworlds.Launcher
-
$JAVACMD \
$MAVEN_OPTS \
- -classpath "$CP" \
- "-Dclassworlds.conf=$CLASSWORLDS_CONF" \
+ -classpath ${M2_HOME}/core/boot/classworlds-*.jar \
+ "-Dclassworlds.conf=${M2_HOME}/bin/classworlds.conf" \
"-Dmaven.home=$M2_HOME" \
- $MAIN_CLASS $@
+ org.codehaus.classworlds.Launcher $@
Re: cvs commit: maven-components/maven-core/src/bin m2
Posted by Jason van Zyl <jv...@maven.org>.
On Thu, 2004-10-28 at 17:12, Emmanuel Venisse wrote:
> Done. I fixed it too in plexus-runtime-builder.
Nice, I can live with not allowing spaces in the M2_HOME.
--
jvz.
Jason van Zyl
jason@maven.org
http://maven.apache.org
happiness is like a butterfly: the more you chase it, the more it will
elude you, but if you turn your attention to other things, it will come
and sit softly on your shoulder ...
-- Thoreau
Re: cvs commit: maven-components/maven-core/src/bin m2
Posted by Emmanuel Venisse <em...@venisse.net>.
----- Original Message -----
From: "Jason van Zyl" <jv...@maven.org>
To: "Maven 2 Developers List" <m2...@maven.apache.org>
Sent: Thursday, October 28, 2004 10:43 PM
Subject: Re: cvs commit: maven-components/maven-core/src/bin m2
> On Thu, 2004-10-28 at 16:24, Emmanuel Venisse wrote:
> > > jvanzyl 2004/10/27 11:03:44
> > >
> > > Modified: maven-core/src/bin m2
> > > Log:
> > > o make the script resilient to changes in the classworlds JAR
> > >
> > > Could someone try to do the same with the .bat file before I
update
> > > to a release version of classworlds?
> > >
> > I think it isn't possible for .bat.
> > I'll investigate.
>
> Cool, thanks.
Done. I fixed it too in plexus-runtime-builder.
>
> > Emmanuel
>
> --
> jvz.
>
> Jason van Zyl
> jason@maven.org
> http://maven.apache.org
>
> happiness is like a butterfly: the more you chase it, the more it will
> elude you, but if you turn your attention to other things, it will come
> and sit softly on your shoulder ...
>
> -- Thoreau
>
>
Re: cvs commit: maven-components/maven-core/src/bin m2
Posted by Jason van Zyl <jv...@maven.org>.
On Thu, 2004-10-28 at 16:24, Emmanuel Venisse wrote:
> > jvanzyl 2004/10/27 11:03:44
> >
> > Modified: maven-core/src/bin m2
> > Log:
> > o make the script resilient to changes in the classworlds JAR
> >
> > Could someone try to do the same with the .bat file before I update
> > to a release version of classworlds?
> >
> I think it isn't possible for .bat.
> I'll investigate.
Cool, thanks.
> Emmanuel
--
jvz.
Jason van Zyl
jason@maven.org
http://maven.apache.org
happiness is like a butterfly: the more you chase it, the more it will
elude you, but if you turn your attention to other things, it will come
and sit softly on your shoulder ...
-- Thoreau
Re: cvs commit: maven-components/maven-core/src/bin m2
Posted by Jason van Zyl <jv...@maven.org>.
On Thu, 2004-10-28 at 16:26, Brett Porter wrote:
> If not, what about filtering the value into the bat file as the dist is
> built?
All the silly things that must be done for windows ...
Sure, we could do that but let's see if the simple way works first.
> - Brett
>
> Emmanuel Venisse wrote:
>
> >>jvanzyl 2004/10/27 11:03:44
> >>
> >> Modified: maven-core/src/bin m2
> >> Log:
> >> o make the script resilient to changes in the classworlds JAR
> >>
> >> Could someone try to do the same with the .bat file before I update
> >> to a release version of classworlds?
> >>
> >>
> >>
> >I think it isn't possible for .bat.
> >I'll investigate.
> >
> >Emmanuel
> >
> >
> >
> >
> >
> >
>
--
jvz.
Jason van Zyl
jason@maven.org
http://maven.apache.org
happiness is like a butterfly: the more you chase it, the more it will
elude you, but if you turn your attention to other things, it will come
and sit softly on your shoulder ...
-- Thoreau
Re: cvs commit: maven-components/maven-core/src/bin m2
Posted by Brett Porter <br...@apache.org>.
If not, what about filtering the value into the bat file as the dist is
built?
- Brett
Emmanuel Venisse wrote:
>>jvanzyl 2004/10/27 11:03:44
>>
>> Modified: maven-core/src/bin m2
>> Log:
>> o make the script resilient to changes in the classworlds JAR
>>
>> Could someone try to do the same with the .bat file before I update
>> to a release version of classworlds?
>>
>>
>>
>I think it isn't possible for .bat.
>I'll investigate.
>
>Emmanuel
>
>
>
>
>
>
Re: cvs commit: maven-components/maven-core/src/bin m2
Posted by Emmanuel Venisse <em...@venisse.net>.
> jvanzyl 2004/10/27 11:03:44
>
> Modified: maven-core/src/bin m2
> Log:
> o make the script resilient to changes in the classworlds JAR
>
> Could someone try to do the same with the .bat file before I update
> to a release version of classworlds?
>
I think it isn't possible for .bat.
I'll investigate.
Emmanuel