geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r419396 - in /geronimo/sandbox/svkmerge/trunk: ./ bootstrap build build.bat configs/client/pom.xml pom.xml
Date Thu, 06 Jul 2006 00:31:46 GMT
Author: jdillon
Date: Wed Jul  5 17:31:46 2006
New Revision: 419396

URL: http://svn.apache.org/viewvc?rev=419396&view=rev
Log:
Sync faux-trunk to latest m2migration fixes

Modified:
    geronimo/sandbox/svkmerge/trunk/   (props changed)
    geronimo/sandbox/svkmerge/trunk/bootstrap   (props changed)
    geronimo/sandbox/svkmerge/trunk/build   (props changed)
    geronimo/sandbox/svkmerge/trunk/build.bat   (contents, props changed)
    geronimo/sandbox/svkmerge/trunk/configs/client/pom.xml
    geronimo/sandbox/svkmerge/trunk/pom.xml

Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Jul  5 17:31:46 2006
@@ -1 +1 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419353
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395

Propchange: geronimo/sandbox/svkmerge/trunk/bootstrap
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: geronimo/sandbox/svkmerge/trunk/bootstrap
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/bootstrap
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/sandbox/svkmerge/trunk/build
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: geronimo/sandbox/svkmerge/trunk/build
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/sandbox/svkmerge/trunk/build
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/trunk/build
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/svkmerge/trunk/build.bat
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/build.bat?rev=419396&r1=419395&r2=419396&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/build.bat (original)
+++ geronimo/sandbox/svkmerge/trunk/build.bat Wed Jul  5 17:31:46 2006
@@ -1,43 +1,43 @@
-@if "%DEBUG%" == "" @echo off
-@rem 
-@rem $Id$
-@rem 
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%eval[2+2]" == "4" goto 4NT_args
-
-@rem Regular WinNT shell
-set CMD_LINE_ARGS=%*
-goto execute
-
-:win9xME_args
-@rem Slurp the command line arguments.  This loop allows for an unlimited number
-set CMD_LINE_ARGS=
-
-:win9xME_args_slurp
-if "x%1" == "x" goto execute
-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
-shift
-goto win9xME_args_slurp
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-
-mvn -Dstage=bootstrap %CMD_LINE_ARGS%
-mvn -Dstage=assemble %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" endlocal
-
-@rem Optional pause the batch file
-if "%DBCOPY_BATCH_PAUSE%" == "on" pause
-
+@if "%DEBUG%" == "" @echo off
+@rem 
+@rem $Id$
+@rem 
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%eval[2+2]" == "4" goto 4NT_args
+
+@rem Regular WinNT shell
+set CMD_LINE_ARGS=%*
+goto execute
+
+:win9xME_args
+@rem Slurp the command line arguments.  This loop allows for an unlimited number
+set CMD_LINE_ARGS=
+
+:win9xME_args_slurp
+if "x%1" == "x" goto execute
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto win9xME_args_slurp
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+
+mvn -Dstage=bootstrap %CMD_LINE_ARGS%
+mvn -Dstage=assemble %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" endlocal
+
+@rem Optional pause the batch file
+if "%DBCOPY_BATCH_PAUSE%" == "on" pause
+

Propchange: geronimo/sandbox/svkmerge/trunk/build.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Wed Jul  5 17:31:46 2006
@@ -1 +1 @@
-CRLF
+native

Propchange: geronimo/sandbox/svkmerge/trunk/build.bat
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: geronimo/sandbox/svkmerge/trunk/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/configs/client/pom.xml?rev=419396&r1=419395&r2=419396&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/configs/client/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/configs/client/pom.xml Wed Jul  5 17:31:46 2006
@@ -121,9 +121,10 @@
             <groupId>concurrent</groupId>
             <artifactId>concurrent</artifactId>
         </dependency>
-
+        
+        <!-- FIXME: Need to use the correct gid/aid for this dependency -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
+            <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-corba</artifactId>
         </dependency>
         

Modified: geronimo/sandbox/svkmerge/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/pom.xml?rev=419396&r1=419395&r2=419396&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/pom.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/pom.xml Wed Jul  5 17:31:46 2006
@@ -223,9 +223,10 @@
                 <artifactId>geronimo-activation_1.0.2_spec</artifactId>
                 <version>${geronimoSpecActivationVersion}</version>
             </dependency>
-
+            
+            <!-- FIXME: Need to use the correct gid/aid for this dependency -->
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
+                <groupId>geronimo-spec</groupId>
                 <artifactId>geronimo-spec-corba</artifactId>
                 <version>${geronimoSpecCorbaVersion}</version>
             </dependency>



Mime
View raw message