geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r544594 - in /geronimo/sandbox/j2g/src/main/resources: j2g-configure.bat jdesc2g.bat jres2g.bat jsrc2g.bat
Date Tue, 05 Jun 2007 18:57:47 GMT
Author: dwoods
Date: Tue Jun  5 11:57:46 2007
New Revision: 544594

URL: http://svn.apache.org/viewvc?view=rev&rev=544594
Log:
GERONIMO-3214 - j2g batch files broken with Eclipse SDK 3.3M7

Modified:
    geronimo/sandbox/j2g/src/main/resources/j2g-configure.bat
    geronimo/sandbox/j2g/src/main/resources/jdesc2g.bat
    geronimo/sandbox/j2g/src/main/resources/jres2g.bat
    geronimo/sandbox/j2g/src/main/resources/jsrc2g.bat

Modified: geronimo/sandbox/j2g/src/main/resources/j2g-configure.bat
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/src/main/resources/j2g-configure.bat?view=diff&rev=544594&r1=544593&r2=544594
==============================================================================
--- geronimo/sandbox/j2g/src/main/resources/j2g-configure.bat (original)
+++ geronimo/sandbox/j2g/src/main/resources/j2g-configure.bat Tue Jun  5 11:57:46 2007
@@ -17,7 +17,6 @@
 @REM --------------------------------------------------------------------
 @REM $Rev: 381214 $ $Date: 2006-02-26 20:12:56 -0500 (Sun, 26 Feb 2006) $
 @REM --------------------------------------------------------------------
-
 @if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
 @if not "%GERONIMO_BATCH_ECHO%" == "on"  echo off
 
@@ -35,9 +34,9 @@
 
 :NO_ECLIPSE_HOME
 ECHO.
-ECHO ECLIPSE_HOME not found in your environment.
-ECHO Please specify the path to your Eclipse SDK now, or define it as an environment variable
and restart this tool.
-ECHO (Note: This will ONLY be in effect for this command prompt session).
+ECHO ERROR: ECLIPSE_HOME not found in the environment.
+ECHO Please specify the path to the Eclipse SDK now, or define it as an environment variable
and restart this tool.
+ECHO (Note: This will ONLY be in effect for this session).
 ECHO.
 SET /P ECLIPSE_HOME=ECLIPSE_HOME=
 
@@ -53,4 +52,5 @@
 @REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
 if "%GERONIMO_BATCH_PAUSE%" == "on" pause
 @endlocal
+
 

Modified: geronimo/sandbox/j2g/src/main/resources/jdesc2g.bat
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/src/main/resources/jdesc2g.bat?view=diff&rev=544594&r1=544593&r2=544594
==============================================================================
--- geronimo/sandbox/j2g/src/main/resources/jdesc2g.bat (original)
+++ geronimo/sandbox/j2g/src/main/resources/jdesc2g.bat Tue Jun  5 11:57:46 2007
@@ -30,21 +30,17 @@
 @setlocal enableextensions
 @set ERRORLEVEL=0
 
-IF NOT DEFINED STARTUP_JAR (IF DEFINED ECLIPSE_HOME SET STARTUP_JAR=%ECLIPSE_HOME%) ELSE
ECHO.
-
 :ENV_CHECKS
 IF NOT DEFINED ECLIPSE_HOME GOTO NO_ECLIPSE_HOME 
 	
 IF NOT DEFINED WORKSPACE GOTO NO_WORKSPACE
-
-IF NOT EXIST %STARTUP_JAR%\startup.jar GOTO NO_STARTUP_JAR
 GOTO GO
 
 :NO_ECLIPSE_HOME
 ECHO.
-ECHO ERROR: ECLIPSE_HOME not found in your environment.
+ECHO ERROR: ECLIPSE_HOME not found in the environment.
 ECHO Please specify the path to the Eclipse SDK now, or define it as an environment variable
and restart this tool.
-ECHO (Note: This will ONLY be in effect for this command prompt session).
+ECHO (Note: This will ONLY be in effect for this session).
 ECHO.
 SET /P ECLIPSE_HOME=ECLIPSE_HOME=
 SET STARTUP_JAR=%ECLIPSE_HOME%
@@ -53,29 +49,19 @@
 
 :NO_WORKSPACE
 ECHO.
-ECHO ERROR: WORKSPACE not found in your environment.
-ECHO Please specify a path for a Eclipse workspace now, or define it as an environment variable
and restart this tool.
-ECHO (Note: This will ONLY be in effect for this command prompt session).
+ECHO ERROR: WORKSPACE not found in the environment.
+ECHO Please specify a path for an Eclipse workspace now, or define it as an environment variable
and restart this tool.
+ECHO (Note: This will ONLY be in effect for this session).
 ECHO.
 SET /P WORKSPACE=WORKSPACE=
 GOTO ENV_CHECKS
 
-:NO_STARTUP_JAR
-ECHO.
-ECHO ERROR: startup.jar could not be located in %STARTUP_JAR%.
-ECHO Please specify the path to directory that contains the Eclipse SDK startup.jar file.
-ECHO.
-ECHO This may be located in %ECLIPSE_HOME%\plugins\org.eclipse.platform_X.X.XXX.vXXXXXXXX,
where X indicates the version number.
-ECHO (Note: This will ONLY be in effect for this command prompt session).
-ECHO.
-SET /P STARTUP_JAR=STARTUP_JAR=
-GOTO ENV_CHECKS
-
 :GO
-java -classpath %STARTUP_JAR%\startup.jar org.eclipse.core.launcher.Main -application org.apache.geronimo.j2g.descriptors.tool
-data %WORKSPACE% -configuration %ECLIPSE_HOME%\configuration %*
+java -classpath %ECLIPSE_HOME%\plugins\org.eclipse.equinox.launcher_*.jar org.eclipse.core.launcher.Main
-application org.apache.geronimo.j2g.descriptors.tool -data %WORKSPACE% -configuration %ECLIPSE_HOME%\configuration
%*
 
 :end
 @REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
 if "%GERONIMO_BATCH_PAUSE%" == "on" pause
 @endlocal
+
 

Modified: geronimo/sandbox/j2g/src/main/resources/jres2g.bat
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/src/main/resources/jres2g.bat?view=diff&rev=544594&r1=544593&r2=544594
==============================================================================
--- geronimo/sandbox/j2g/src/main/resources/jres2g.bat (original)
+++ geronimo/sandbox/j2g/src/main/resources/jres2g.bat Tue Jun  5 11:57:46 2007
@@ -30,21 +30,17 @@
 @setlocal enableextensions
 @set ERRORLEVEL=0
 
-IF NOT DEFINED STARTUP_JAR (IF DEFINED ECLIPSE_HOME SET STARTUP_JAR=%ECLIPSE_HOME%) ELSE
ECHO.
-
 :ENV_CHECKS
 IF NOT DEFINED ECLIPSE_HOME GOTO NO_ECLIPSE_HOME 
 	
 IF NOT DEFINED WORKSPACE GOTO NO_WORKSPACE
-
-IF NOT EXIST %STARTUP_JAR%\startup.jar GOTO NO_STARTUP_JAR
 GOTO GO
 
 :NO_ECLIPSE_HOME
 ECHO.
-ECHO ERROR: ECLIPSE_HOME not found in your environment.
+ECHO ERROR: ECLIPSE_HOME not found in the environment.
 ECHO Please specify the path to the Eclipse SDK now, or define it as an environment variable
and restart this tool.
-ECHO (Note: This will ONLY be in effect for this command prompt session).
+ECHO (Note: This will ONLY be in effect for this session).
 ECHO.
 SET /P ECLIPSE_HOME=ECLIPSE_HOME=
 SET STARTUP_JAR=%ECLIPSE_HOME%
@@ -53,29 +49,19 @@
 
 :NO_WORKSPACE
 ECHO.
-ECHO ERROR: WORKSPACE not found in your environment.
-ECHO Please specify a path for a Eclipse workspace now, or define it as an environment variable
and restart this tool.
-ECHO (Note: This will ONLY be in effect for this command prompt session).
+ECHO ERROR: WORKSPACE not found in the environment.
+ECHO Please specify a path for an Eclipse workspace now, or define it as an environment variable
and restart this tool.
+ECHO (Note: This will ONLY be in effect for this session).
 ECHO.
 SET /P WORKSPACE=WORKSPACE=
 GOTO ENV_CHECKS
 
-:NO_STARTUP_JAR
-ECHO.
-ECHO ERROR: startup.jar could not be located in %STARTUP_JAR%.
-ECHO Please specify the path to directory that contains the Eclipse SDK startup.jar file.
-ECHO.
-ECHO This may be located in %ECLIPSE_HOME%\plugins\org.eclipse.platform_X.X.XXX.vXXXXXXXX,
where X indicates the version number.
-ECHO (Note: This will ONLY be in effect for this command prompt session).
-ECHO.
-SET /P STARTUP_JAR=STARTUP_JAR=
-GOTO ENV_CHECKS
-
 :GO
-java -classpath %STARTUP_JAR%\startup.jar org.eclipse.core.launcher.Main -application org.apache.geronimo.j2g.resources.tool
-data %WORKSPACE% -configuration %ECLIPSE_HOME%\configuration %*
+java -classpath %ECLIPSE_HOME%\plugins\org.eclipse.equinox.launcher_*.jar org.eclipse.core.launcher.Main
-application org.apache.geronimo.j2g.resources.tool -data %WORKSPACE% -configuration %ECLIPSE_HOME%\configuration
%*
 
 :end
 @REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
 if "%GERONIMO_BATCH_PAUSE%" == "on" pause
 @endlocal
+
 

Modified: geronimo/sandbox/j2g/src/main/resources/jsrc2g.bat
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/src/main/resources/jsrc2g.bat?view=diff&rev=544594&r1=544593&r2=544594
==============================================================================
--- geronimo/sandbox/j2g/src/main/resources/jsrc2g.bat (original)
+++ geronimo/sandbox/j2g/src/main/resources/jsrc2g.bat Tue Jun  5 11:57:46 2007
@@ -30,21 +30,17 @@
 @setlocal enableextensions
 @set ERRORLEVEL=0
 
-IF NOT DEFINED STARTUP_JAR (IF DEFINED ECLIPSE_HOME SET STARTUP_JAR=%ECLIPSE_HOME%) ELSE
ECHO.
-
 :ENV_CHECKS
 IF NOT DEFINED ECLIPSE_HOME GOTO NO_ECLIPSE_HOME 
 	
 IF NOT DEFINED WORKSPACE GOTO NO_WORKSPACE
-
-IF NOT EXIST %STARTUP_JAR%\startup.jar GOTO NO_STARTUP_JAR
 GOTO GO
 
 :NO_ECLIPSE_HOME
 ECHO.
-ECHO ERROR: ECLIPSE_HOME not found in your environment.
+ECHO ERROR: ECLIPSE_HOME not found in the environment.
 ECHO Please specify the path to the Eclipse SDK now, or define it as an environment variable
and restart this tool.
-ECHO (Note: This will ONLY be in effect for this command prompt session).
+ECHO (Note: This will ONLY be in effect for this session).
 ECHO.
 SET /P ECLIPSE_HOME=ECLIPSE_HOME=
 SET STARTUP_JAR=%ECLIPSE_HOME%
@@ -53,29 +49,19 @@
 
 :NO_WORKSPACE
 ECHO.
-ECHO ERROR: WORKSPACE not found in your environment.
-ECHO Please specify a path for a Eclipse workspace now, or define it as an environment variable
and restart this tool.
-ECHO (Note: This will ONLY be in effect for this command prompt session).
+ECHO ERROR: WORKSPACE not found in the environment.
+ECHO Please specify a path for an Eclipse workspace now, or define it as an environment variable
and restart this tool.
+ECHO (Note: This will ONLY be in effect for this session).
 ECHO.
 SET /P WORKSPACE=WORKSPACE=
 GOTO ENV_CHECKS
 
-:NO_STARTUP_JAR
-ECHO.
-ECHO ERROR: startup.jar could not be located in %STARTUP_JAR%.
-ECHO Please specify the path to directory that contains the Eclipse SDK startup.jar file,
or define STARTUP_JAR as an environment variable and restart this tool.
-ECHO.
-ECHO This may be located in %ECLIPSE_HOME%\plugins\org.eclipse.platform_X.X.XXX.vXXXXXXXX,
where X indicates the version number.
-ECHO (Note: This will ONLY be in effect for this command prompt session).
-ECHO.
-SET /P STARTUP_JAR=STARTUP_JAR=
-GOTO ENV_CHECKS
-
 :GO
-java -classpath %STARTUP_JAR%\startup.jar org.eclipse.core.launcher.Main -application org.apache.geronimo.j2g.sources.tool
-data %WORKSPACE% -configuration %ECLIPSE_HOME%\configuration %*
+java -classpath %ECLIPSE_HOME%\plugins\org.eclipse.equinox.launcher_*.jar org.eclipse.core.launcher.Main
-application org.apache.geronimo.j2g.sources.tool -data %WORKSPACE% -configuration %ECLIPSE_HOME%\configuration
%* 
 
 :end
 @REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
 if "%GERONIMO_BATCH_PAUSE%" == "on" pause
 @endlocal
+
 



Mime
View raw message