You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2002/12/02 14:40:40 UTC
cvs commit: jakarta-turbine-maven build-bootstrap.xml
dion 2002/12/02 05:40:40
Modified: src/bin maven.bat maven
. build-bootstrap.xml
Log:
Make jdk 1.3 and 1.4 booty
Revision Changes Path
1.26 +2 -1 jakarta-turbine-maven/src/bin/maven.bat
Index: maven.bat
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bin/maven.bat,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- maven.bat 1 Dec 2002 23:49:40 -0000 1.25
+++ maven.bat 2 Dec 2002 13:40:39 -0000 1.26
@@ -54,9 +54,10 @@
SET JAVA="%JAVA_HOME%\bin\java"
SET MAVEN_CLASSPATH="%MAVEN_HOME%\lib\forehead-1.0-beta-4.jar"
SET MAVEN_MAIN=com.werken.forehead.Forehead
+SET MAVEN_ENDORSED="-Djava.endorsed.dirs=%JAVA_HOME%\lib\endorsed;%MAVEN_HOME%\lib\endorsed"
REM %JAVA% -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl "-Dmaven.home=%MAVEN_HOME%" "-Dtools.jar=%JAVA_HOME%\lib\tools.jar" "-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf" %MAVEN_SYS_OPTS% %MAVEN_OPTS% -classpath %MAVEN_CLASSPATH% %MAVEN_MAIN% %MAVEN_CMD_LINE_ARGS%
-%JAVA% -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl "-Dmaven.home=%MAVEN_HOME%" "-Dtools.jar=%JAVA_HOME%\lib\tools.jar" "-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf" %MAVEN_SYS_OPTS% %MAVEN_OPTS% -classpath %MAVEN_CLASSPATH% %MAVEN_MAIN% %MAVEN_CMD_LINE_ARGS%
+%JAVA% -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl "-Dmaven.home=%MAVEN_HOME%" "-Dtools.jar=%JAVA_HOME%\lib\tools.jar" "-Dforehead.conf.file=%MAVEN_HOME%\bin\forehead.conf" %MAVEN_ENDORSED% %MAVEN_SYS_OPTS% %MAVEN_OPTS% -classpath %MAVEN_CLASSPATH% %MAVEN_MAIN% %MAVEN_CMD_LINE_ARGS%
goto end
:ErrNoEnv
1.22 +1 -0 jakarta-turbine-maven/src/bin/maven
Index: maven
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bin/maven,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- maven 1 Dec 2002 23:49:40 -0000 1.21
+++ maven 2 Dec 2002 13:40:39 -0000 1.22
@@ -109,6 +109,7 @@
$MAVEN_OPTS \
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
+ "-Djava.endorsed.dirs=${JAVA_HOME}/lib/endorsed:${MAVEN_HOME}/lib/endorsed" \
-classpath "${MAVEN_HOME}/lib/forehead-${FOREHEAD_VERSION}.jar" \
"-Dforehead.conf.file=${MAVEN_HOME}/bin/forehead.conf" \
"-Dtools.jar=$TOOLS_JAR" \
1.177 +11 -0 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- build-bootstrap.xml 1 Dec 2002 04:37:55 -0000 1.176
+++ build-bootstrap.xml 2 Dec 2002 13:40:39 -0000 1.177
@@ -145,6 +145,17 @@
<patternset refid="bootstrap-patternset"/>
</fileset>
</copy>
+
+
+ <!-- make the endorsed dir -->
+ <mkdir dir="${maven.bootstrap.install.dir}/lib/endorsed" />
+ <copy todir="${maven.bootstrap.install.dir}/lib/endorsed">
+ <fileset dir="${maven.bootstrap.install.dir}/lib">
+ <include name="xml-apis*.jar" />
+ <include name="xerces*.jar" />
+ <include name="piccolo*.jar" />
+ </fileset>
+ </copy>
<!-- Install maven in the lib directory -->