You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by js...@apache.org on 2005/12/11 22:06:19 UTC

svn commit: r356022 [20/22] - in /geronimo/branches/1.0: ./ applications/ applications/daytrader/ applications/daytrader/bin/ applications/daytrader/core/ applications/daytrader/derby/ applications/daytrader/ear/ applications/daytrader/ear/src/applicat...

Modified: geronimo/branches/1.0/modules/scripts/src/resources/bin/setjavaenv.bat
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/scripts/src/resources/bin/setjavaenv.bat?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/scripts/src/resources/bin/setjavaenv.bat (original)
+++ geronimo/branches/1.0/modules/scripts/src/resources/bin/setjavaenv.bat Sun Dec 11 12:58:34 2005
@@ -1,91 +1,91 @@
-@REM
-@REM  Copyright 2005 The Apache Software Foundation
-@REM
-@REM   Licensed under the Apache License, Version 2.0 (the "License");
-@REM   you may not use this file except in compliance with the License.
-@REM   You may obtain a copy of the License at
-@REM
-@REM      http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM   Unless required by applicable law or agreed to in writing, software
-@REM   distributed under the License is distributed on an "AS IS" BASIS,
-@REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM   See the License for the specific language governing permissions and
-@REM   limitations under the License.
-@REM
-@REM --------------------------------------------------------------------
-@REM Set environment variables relating to the execution of java commands
-@REM
-@REM This batch file is called by the geronimo.bat file.
-@REM
-@REM (based upon Apache Tomcat 5.5.12's setclasspath.bat although modified
-@REM to be more consistent with the shell script version's support of
-@REM JDK_HOME and JRE_HOME)
-@REM
-@REM $Rev$ $Date$
-@REM --------------------------------------------------------------------
-
-@REM Begin all @REM lines with '@' in case GERONIMO_BATCH_ECHO is 'on'
-@if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
-@if not "%GERONIMO_BATCH_ECHO%" == "on"  echo off
-
-@REM check that either JAVA_HOME or JRE_HOME are set
-set jdkOrJreHomeSet=0
-if not "%JAVA_HOME%" == "" set jdkOrJreHomeSet=1
-if not "%JRE_HOME%" == "" set jdkOrJreHomeSet=1
-if "%jdkOrJreHomeSet%" == "1" goto gotJdkOrJreHome
-echo Neither the JAVA_HOME nor the JRE_HOME environment variable is defined
-echo At least one of these environment variable is needed to run this program
-set ERRORLEVEL=1
-goto end
-
-@REM If we get this far we have either JAVA_HOME or JRE_HOME set
-@REM now check whether the command requires the JDK and if so
-@REM check that JAVA_HOME is really pointing to the JDK files.
-:gotJdkOrJreHome
-set _REQUIRE_JDK=0
-if "%1" == "debug" set _REQUIRE_JDK=1
-if "%_REQUIRE_JDK%" == "0" goto okJdkFileCheck
-
-set jdkNotFound=0
-if not exist "%JAVA_HOME%\bin\java.exe" set jdkNotFound=1
-if not exist "%JAVA_HOME%\bin\javaw.exe" set jdkNotFound=1
-if not exist "%JAVA_HOME%\bin\jdb.exe" set jdkNotFound=1
-if not exist "%JAVA_HOME%\bin\javac.exe" set jdkNotFound=1
-if %jdkNotFound% == 0 goto okJdkFileCheck
-echo The JAVA_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-echo NB: JAVA_HOME should point to a JDK not a JRE
-set ERRORLEVEL=1
-goto end
-
-:okJdkFileCheck
-@REM default JRE_HOME to JAVA_HOME if not set.
-if "%JRE_HOME%" == "" set JRE_HOME=%JAVA_HOME%
-
-if not "%BASEDIR%" == "" goto gotBasedir
-echo The BASEDIR environment variable is not defined
-echo This environment variable is needed to run this program
-set ERRORLEVEL=1
-goto end
-
-:gotBasedir
-if exist "%BASEDIR%\bin\setjavaenv.bat" goto okBasedir
-echo The BASEDIR environment variable is not defined correctly
-echo This environment variable is needed to run this program
-set ERRORLEVEL=1
-goto end
-
-:okBasedir
-@REM Set standard command for invoking Java.
-@REM Note that NT requires a window name argument when using start.
-@REM Also note the quoting as JAVA_HOME may contain spaces.
-set _RUNJAVA="%JRE_HOME%\bin\java"
-set _RUNJAVAW="%JRE_HOME%\bin\javaw"
-set _RUNJDB="%JAVA_HOME%\bin\jdb"
-
-goto end
-
-:end
-@REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
-if "%GERONIMO_BATCH_PAUSE%" == "on" pause
+@REM
+@REM  Copyright 2005 The Apache Software Foundation
+@REM
+@REM   Licensed under the Apache License, Version 2.0 (the "License");
+@REM   you may not use this file except in compliance with the License.
+@REM   You may obtain a copy of the License at
+@REM
+@REM      http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM   Unless required by applicable law or agreed to in writing, software
+@REM   distributed under the License is distributed on an "AS IS" BASIS,
+@REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM   See the License for the specific language governing permissions and
+@REM   limitations under the License.
+@REM
+@REM --------------------------------------------------------------------
+@REM Set environment variables relating to the execution of java commands
+@REM
+@REM This batch file is called by the geronimo.bat file.
+@REM
+@REM (based upon Apache Tomcat 5.5.12's setclasspath.bat although modified
+@REM to be more consistent with the shell script version's support of
+@REM JDK_HOME and JRE_HOME)
+@REM
+@REM $Rev$ $Date$
+@REM --------------------------------------------------------------------
+
+@REM Begin all @REM lines with '@' in case GERONIMO_BATCH_ECHO is 'on'
+@if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
+@if not "%GERONIMO_BATCH_ECHO%" == "on"  echo off
+
+@REM check that either JAVA_HOME or JRE_HOME are set
+set jdkOrJreHomeSet=0
+if not "%JAVA_HOME%" == "" set jdkOrJreHomeSet=1
+if not "%JRE_HOME%" == "" set jdkOrJreHomeSet=1
+if "%jdkOrJreHomeSet%" == "1" goto gotJdkOrJreHome
+echo Neither the JAVA_HOME nor the JRE_HOME environment variable is defined
+echo At least one of these environment variable is needed to run this program
+set ERRORLEVEL=1
+goto end
+
+@REM If we get this far we have either JAVA_HOME or JRE_HOME set
+@REM now check whether the command requires the JDK and if so
+@REM check that JAVA_HOME is really pointing to the JDK files.
+:gotJdkOrJreHome
+set _REQUIRE_JDK=0
+if "%1" == "debug" set _REQUIRE_JDK=1
+if "%_REQUIRE_JDK%" == "0" goto okJdkFileCheck
+
+set jdkNotFound=0
+if not exist "%JAVA_HOME%\bin\java.exe" set jdkNotFound=1
+if not exist "%JAVA_HOME%\bin\javaw.exe" set jdkNotFound=1
+if not exist "%JAVA_HOME%\bin\jdb.exe" set jdkNotFound=1
+if not exist "%JAVA_HOME%\bin\javac.exe" set jdkNotFound=1
+if %jdkNotFound% == 0 goto okJdkFileCheck
+echo The JAVA_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+echo NB: JAVA_HOME should point to a JDK not a JRE
+set ERRORLEVEL=1
+goto end
+
+:okJdkFileCheck
+@REM default JRE_HOME to JAVA_HOME if not set.
+if "%JRE_HOME%" == "" set JRE_HOME=%JAVA_HOME%
+
+if not "%BASEDIR%" == "" goto gotBasedir
+echo The BASEDIR environment variable is not defined
+echo This environment variable is needed to run this program
+set ERRORLEVEL=1
+goto end
+
+:gotBasedir
+if exist "%BASEDIR%\bin\setjavaenv.bat" goto okBasedir
+echo The BASEDIR environment variable is not defined correctly
+echo This environment variable is needed to run this program
+set ERRORLEVEL=1
+goto end
+
+:okBasedir
+@REM Set standard command for invoking Java.
+@REM Note that NT requires a window name argument when using start.
+@REM Also note the quoting as JAVA_HOME may contain spaces.
+set _RUNJAVA="%JRE_HOME%\bin\java"
+set _RUNJAVAW="%JRE_HOME%\bin\javaw"
+set _RUNJDB="%JAVA_HOME%\bin\jdb"
+
+goto end
+
+:end
+@REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
+if "%GERONIMO_BATCH_PAUSE%" == "on" pause

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/setjavaenv.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-native
+CRLF

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/setjavaenv.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/setjavaenv.sh
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Author Date Id Revision
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/setjavaenv.sh
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/scripts/src/resources/bin/shutdown.bat
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/scripts/src/resources/bin/shutdown.bat?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/scripts/src/resources/bin/shutdown.bat (original)
+++ geronimo/branches/1.0/modules/scripts/src/resources/bin/shutdown.bat Sun Dec 11 12:58:34 2005
@@ -1,77 +1,77 @@
-@echo off
-rem
-rem  Copyright 2005 The Apache Software Foundation
-rem
-rem   Licensed under the Apache License, Version 2.0 (the "License");
-rem   you may not use this file except in compliance with the License.
-rem   You may obtain a copy of the License at
-rem
-rem      http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem   Unless required by applicable law or agreed to in writing, software
-rem   distributed under the License is distributed on an "AS IS" BASIS,
-rem   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem   See the License for the specific language governing permissions and
-rem   limitations under the License.
-rem
-rem --------------------------------------------------------------------
-rem $Rev$ $Date$
-rem --------------------------------------------------------------------
-rem
-rem --------------------------------------------------------------------
-rem Shutdown batch file for Geronimo.
-rem
-rem This batch file calls the geronimo.bat script passing "stop" as the
-rem first argument followed by the arguments supplied by the caller.
-rem
-rem Refer to the documentation in the geronimo.bat file for information
-rem on environment variables etc.
-rem
-rem This batch file is based upon Tomcat's shutdown.bat file to enable
-rem those familiar with Tomcat to easily stop Geronimo.
-rem 
-rem Alternatively you can use the more comprehensive geronimo.bat file 
-rem directly.
-rem
-rem Usage:  shutdown [geronimo_args ...]
-rem
-rem $Rev$ $Date$
-rem --------------------------------------------------------------------
-if "%OS%" == "Windows_NT" setlocal
-
-rem Guess GERONIMO_HOME if not defined
-set CURRENT_DIR=%cd%
-if not "%GERONIMO_HOME%" == "" goto gotHome
-set GERONIMO_HOME=%CURRENT_DIR%
-if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
-cd ..
-set GERONIMO_HOME=%cd%
-cd %CURRENT_DIR%
-:gotHome
-if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
-echo The GERONIMO_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-goto end
-:okHome
-
-set EXECUTABLE=%GERONIMO_HOME%\bin\geronimo.bat
-
-rem Check that target executable exists
-if exist "%EXECUTABLE%" goto okExec
-echo Cannot find %EXECUTABLE%
-echo This file is needed to run this program
-goto end
-:okExec
-
-rem Get remaining unshifted command line arguments and save them in the
-set CMD_LINE_ARGS=
-:setArgs
-if ""%1""=="""" goto doneSetArgs
-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
-shift
-goto setArgs
-:doneSetArgs
-
-call "%EXECUTABLE%" stop %CMD_LINE_ARGS%
-
-:end
+@echo off
+rem
+rem  Copyright 2005 The Apache Software Foundation
+rem
+rem   Licensed under the Apache License, Version 2.0 (the "License");
+rem   you may not use this file except in compliance with the License.
+rem   You may obtain a copy of the License at
+rem
+rem      http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem   Unless required by applicable law or agreed to in writing, software
+rem   distributed under the License is distributed on an "AS IS" BASIS,
+rem   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem   See the License for the specific language governing permissions and
+rem   limitations under the License.
+rem
+rem --------------------------------------------------------------------
+rem $Rev$ $Date$
+rem --------------------------------------------------------------------
+rem
+rem --------------------------------------------------------------------
+rem Shutdown batch file for Geronimo.
+rem
+rem This batch file calls the geronimo.bat script passing "stop" as the
+rem first argument followed by the arguments supplied by the caller.
+rem
+rem Refer to the documentation in the geronimo.bat file for information
+rem on environment variables etc.
+rem
+rem This batch file is based upon Tomcat's shutdown.bat file to enable
+rem those familiar with Tomcat to easily stop Geronimo.
+rem 
+rem Alternatively you can use the more comprehensive geronimo.bat file 
+rem directly.
+rem
+rem Usage:  shutdown [geronimo_args ...]
+rem
+rem $Rev$ $Date$
+rem --------------------------------------------------------------------
+if "%OS%" == "Windows_NT" setlocal
+
+rem Guess GERONIMO_HOME if not defined
+set CURRENT_DIR=%cd%
+if not "%GERONIMO_HOME%" == "" goto gotHome
+set GERONIMO_HOME=%CURRENT_DIR%
+if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
+cd ..
+set GERONIMO_HOME=%cd%
+cd %CURRENT_DIR%
+:gotHome
+if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
+echo The GERONIMO_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+:okHome
+
+set EXECUTABLE=%GERONIMO_HOME%\bin\geronimo.bat
+
+rem Check that target executable exists
+if exist "%EXECUTABLE%" goto okExec
+echo Cannot find %EXECUTABLE%
+echo This file is needed to run this program
+goto end
+:okExec
+
+rem Get remaining unshifted command line arguments and save them in the
+set CMD_LINE_ARGS=
+:setArgs
+if ""%1""=="""" goto doneSetArgs
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto setArgs
+:doneSetArgs
+
+call "%EXECUTABLE%" stop %CMD_LINE_ARGS%
+
+:end

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/shutdown.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-native
+CRLF

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/shutdown.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/shutdown.sh
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Author Date Id Revision
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/shutdown.sh
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/scripts/src/resources/bin/startup.bat
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/scripts/src/resources/bin/startup.bat?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/scripts/src/resources/bin/startup.bat (original)
+++ geronimo/branches/1.0/modules/scripts/src/resources/bin/startup.bat Sun Dec 11 12:58:34 2005
@@ -1,78 +1,78 @@
-@REM
-@REM  Copyright 2005 The Apache Software Foundation
-@REM
-@REM   Licensed under the Apache License, Version 2.0 (the "License");
-@REM   you may not use this file except in compliance with the License.
-@REM   You may obtain a copy of the License at
-@REM
-@REM      http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM   Unless required by applicable law or agreed to in writing, software
-@REM   distributed under the License is distributed on an "AS IS" BASIS,
-@REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM   See the License for the specific language governing permissions and
-@REM   limitations under the License.
-@REM
-@REM --------------------------------------------------------------------
-@REM Startup batch file for Geronimo that starts Geronimo in a new window.
-@REM
-@REM This batch file calls the geronimo.bat script passing "start" as the
-@REM first argument followed by the arguments supplied by the caller.
-@REM
-@REM Refer to the documentation in the geronimo.bat file for information
-@REM on environment variables etc.
-@REM
-@REM This batch file is based upon Tomcat's startup.bat file to enable
-@REM those familiar with Tomcat to quickly get started with Geronimo.
-@REM 
-@REM Alternatively you can use the more comprehensive geronimo.bat file 
-@REM directly.
-@REM
-@REM Usage:  startup [geronimo.bat_args] [geronimo_args ...]
-@REM
-@REM $Rev$ $Date$
-@REM --------------------------------------------------------------------
-
-if "%OS%" == "Windows_NT" setlocal
-
-@REM Guess GERONIMO_HOME if not defined
-set CURRENT_DIR=%cd%
-if not "%GERONIMO_HOME%" == "" goto gotHome
-set GERONIMO_HOME=%CURRENT_DIR%
-if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
-cd ..
-set GERONIMO_HOME=%cd%
-cd %CURRENT_DIR%
-:gotHome
-if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
-echo The GERONIMO_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-set ERRORLEVEL=1
-goto end
-:okHome
-
-set EXECUTABLE=%GERONIMO_HOME%\bin\geronimo.bat
-
-@REM Check that target executable exists
-if exist "%EXECUTABLE%" goto okExec
-echo Cannot find %EXECUTABLE%
-echo This file is needed to run this program
-set ERRORLEVEL=1
-goto end
-:okExec
-
-@REM Get remaining unshifted command line arguments and save them in the
-set CMD_LINE_ARGS=
-:setArgs
-if ""%1""=="""" goto doneSetArgs
-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
-shift
-goto setArgs
-:doneSetArgs
-
-call "%EXECUTABLE%" start %CMD_LINE_ARGS%
-
-:end
-
-@REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
-if "%GERONIMO_BATCH_PAUSE%" == "on" pause
+@REM
+@REM  Copyright 2005 The Apache Software Foundation
+@REM
+@REM   Licensed under the Apache License, Version 2.0 (the "License");
+@REM   you may not use this file except in compliance with the License.
+@REM   You may obtain a copy of the License at
+@REM
+@REM      http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM   Unless required by applicable law or agreed to in writing, software
+@REM   distributed under the License is distributed on an "AS IS" BASIS,
+@REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM   See the License for the specific language governing permissions and
+@REM   limitations under the License.
+@REM
+@REM --------------------------------------------------------------------
+@REM Startup batch file for Geronimo that starts Geronimo in a new window.
+@REM
+@REM This batch file calls the geronimo.bat script passing "start" as the
+@REM first argument followed by the arguments supplied by the caller.
+@REM
+@REM Refer to the documentation in the geronimo.bat file for information
+@REM on environment variables etc.
+@REM
+@REM This batch file is based upon Tomcat's startup.bat file to enable
+@REM those familiar with Tomcat to quickly get started with Geronimo.
+@REM 
+@REM Alternatively you can use the more comprehensive geronimo.bat file 
+@REM directly.
+@REM
+@REM Usage:  startup [geronimo.bat_args] [geronimo_args ...]
+@REM
+@REM $Rev$ $Date$
+@REM --------------------------------------------------------------------
+
+if "%OS%" == "Windows_NT" setlocal
+
+@REM Guess GERONIMO_HOME if not defined
+set CURRENT_DIR=%cd%
+if not "%GERONIMO_HOME%" == "" goto gotHome
+set GERONIMO_HOME=%CURRENT_DIR%
+if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
+cd ..
+set GERONIMO_HOME=%cd%
+cd %CURRENT_DIR%
+:gotHome
+if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
+echo The GERONIMO_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+set ERRORLEVEL=1
+goto end
+:okHome
+
+set EXECUTABLE=%GERONIMO_HOME%\bin\geronimo.bat
+
+@REM Check that target executable exists
+if exist "%EXECUTABLE%" goto okExec
+echo Cannot find %EXECUTABLE%
+echo This file is needed to run this program
+set ERRORLEVEL=1
+goto end
+:okExec
+
+@REM Get remaining unshifted command line arguments and save them in the
+set CMD_LINE_ARGS=
+:setArgs
+if ""%1""=="""" goto doneSetArgs
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto setArgs
+:doneSetArgs
+
+call "%EXECUTABLE%" start %CMD_LINE_ARGS%
+
+:end
+
+@REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
+if "%GERONIMO_BATCH_PAUSE%" == "on" pause

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/startup.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-native
+CRLF

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/startup.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/startup.sh
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Author Date Id Revision
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/startup.sh
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/security-builder/LICENSE.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/security-builder/LICENSE.txt?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/security-builder/LICENSE.txt (original)
+++ geronimo/branches/1.0/modules/security-builder/LICENSE.txt Sun Dec 11 12:58:34 2005
@@ -1,203 +1,203 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Propchange: geronimo/branches/1.0/modules/security-builder/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/security-builder/LICENSE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/security-builder/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/security-builder/project.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/security-builder/project.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/security-builder/src/schema/geronimo-login-config-1.0.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/security-builder/src/schema/geronimo-login-config-1.0.xsd
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/security-builder/src/schema/geronimo-login-config-1.0.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/branches/1.0/modules/security-builder/src/schema/geronimo-security-1.1.xsd
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/security-builder/src/schema/geronimo-security-1.1.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/branches/1.0/modules/security/LICENSE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/security/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/security/NOTICE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/security/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/security/log4j.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/security/log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/security/project.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/security/project.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/security/src/test-data/data/groups.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/security/src/test-data/data/groups.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/security/src/test-data/data/mapping.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/security/src/test-data/data/mapping.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/security/src/test-data/data/users.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/security/src/test-data/data/users.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/security/xdocs/index.html
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/security/xdocs/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Propchange: geronimo/branches/1.0/modules/service-builder/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/service-builder/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/service-builder/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/service-builder/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/service-builder/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/service-builder/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/service-builder/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/service-builder/project.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/service-builder/project.properties (original)
+++ geronimo/branches/1.0/modules/service-builder/project.properties Sun Dec 11 12:58:34 2005
@@ -1,5 +1,5 @@
 ##
-## $Rev: 56981 $ $Date: 2004-11-08 20:01:27 -0500 (Mon, 08 Nov 2004) $
+## $Rev$ $Date$
 ##
 
 # Include the generated xmlbean classes in the eclipse classpath

Propchange: geronimo/branches/1.0/modules/service-builder/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/service-builder/project.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/service-builder/project.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/service-builder/src/schema/geronimo-config-1.0.xsd
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/service-builder/src/schema/geronimo-config-1.0.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/branches/1.0/modules/service-builder/src/schema/geronimo-javabean-xmlattribute-1.0.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/service-builder/src/schema/geronimo-javabean-xmlattribute-1.0.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/service-builder/src/schema/geronimo-javabean-xmlattribute-1.0.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/branches/1.0/modules/service-builder/src/test-resources/services/service2.jar
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+application/java-archive

Propchange: geronimo/branches/1.0/modules/system/LICENSE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/system/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/system/NOTICE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/system/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/system/project.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/system/project.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/system/src/schema/local-attribute.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/system/src/schema/local-attribute.xsd
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/system/src/schema/local-attribute.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/branches/1.0/modules/system/src/test-data/org/apache/geronimo/system/url/resource/resource.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/system/src/test-data/org/apache/geronimo/system/url/resource/resource.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/system/src/test-data/resource.properties
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/system/src/test-data/resource.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/system/xdocs/index.html
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Rev Date
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/system/xdocs/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Propchange: geronimo/branches/1.0/modules/test-ddbean/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/test-ddbean/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/test-ddbean/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/test-ddbean/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/test-ddbean/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/test-ddbean/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/test-ddbean/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/test-ddbean/project.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/test-ddbean/project.properties (original)
+++ geronimo/branches/1.0/modules/test-ddbean/project.properties Sun Dec 11 12:58:34 2005
@@ -1,4 +1,4 @@
 ##
-## $Rev: 56981 $ $Date: 2004-11-08 20:01:27 -0500 (Mon, 08 Nov 2004) $
+## $Rev$ $Date$
 ##
 

Propchange: geronimo/branches/1.0/modules/test-ddbean/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/test-ddbean/project.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/test-ddbean/project.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/test-ddbean/src/test-resources/deployables/app-client1.jar
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-application/octet-stream
+application/java-archive

Propchange: geronimo/branches/1.0/modules/timer/LICENSE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/timer/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/timer/NOTICE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/timer/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/tomcat-builder/LICENSE.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/tomcat-builder/LICENSE.txt?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/tomcat-builder/LICENSE.txt (original)
+++ geronimo/branches/1.0/modules/tomcat-builder/LICENSE.txt Sun Dec 11 12:58:34 2005
@@ -1,203 +1,203 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Propchange: geronimo/branches/1.0/modules/tomcat-builder/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/tomcat-builder/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/tomcat-builder/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/tomcat-builder/NOTICE.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/tomcat-builder/NOTICE.txt?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/tomcat-builder/NOTICE.txt (original)
+++ geronimo/branches/1.0/modules/tomcat-builder/NOTICE.txt Sun Dec 11 12:58:34 2005
@@ -1,3 +1,3 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/branches/1.0/modules/tomcat-builder/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/tomcat-builder/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/tomcat-builder/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/tomcat-builder/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/tomcat-builder/project.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/tomcat-builder/project.properties (original)
+++ geronimo/branches/1.0/modules/tomcat-builder/project.properties Sun Dec 11 12:58:34 2005
@@ -1,5 +1,5 @@
 ##
-## $Rev: 151530 $ $Date: 2005-02-05 16:47:24 -0700 (Sat, 05 Feb 2005) $
+## $Rev$ $Date$
 ##
 
 maven.junit.jvmargs=-Djava.security.auth.login.config=src/test-resources/data/login.config -ea

Propchange: geronimo/branches/1.0/modules/tomcat-builder/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/tomcat-builder/project.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/tomcat-builder/project.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain