You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/04/28 10:08:10 UTC
svn commit: r1097349 - in /incubator/lcf/trunk: ./
connectors/filenet/server-scripts/ framework/scripts/
Author: kwright
Date: Thu Apr 28 08:08:10 2011
New Revision: 1097349
URL: http://svn.apache.org/viewvc?rev=1097349&view=rev
Log:
Fix for CONNECTORS-191.
Modified:
incubator/lcf/trunk/CHANGES.txt
incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat (contents, props changed)
incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat (contents, props changed)
incubator/lcf/trunk/framework/scripts/executecommand.bat (contents, props changed)
incubator/lcf/trunk/framework/scripts/setclasspath.bat (contents, props changed)
incubator/lcf/trunk/framework/scripts/setdefine.bat (contents, props changed)
Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1097349&r1=1097348&r2=1097349&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Thu Apr 28 08:08:10 2011
@@ -3,6 +3,10 @@ $Id$
======================= 0.3-dev =========================
+CONNECTORS-191: Fix eol-style attribute for .bat files to always be
+CRLF.
+(Karl Wright)
+
CONNECTORS-190: Fix busted link to JSON stuff.
(Karl Wright)
Modified: incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat?rev=1097349&r1=1097348&r2=1097349&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat (original)
+++ incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat Thu Apr 28 08:08:10 2011
@@ -1,39 +1,39 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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 check that JAVA_HOME and MCF_HOME are set
-if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
-if not exist "%MCF_HOME%\properties.xml" goto nolcfhome
-rem save existing path here
-set OLDDIR=%CD%
-cd "%MCF_HOME%\filenet-server-process"
-set CLASSPATH=.
-for %%f in (jar/*) do call script\setclasspath.bat %%f
-rem restore old path here
-cd "%OLDDIR%"
-set WASP_STATEMENT=
-if defined WASP_HOME set WASP_STATEMENT="-Dwasp.location=%WASP_HOME%"
-set LIB_STATEMENT=
-if defined JAVA_LIB_PATH set LIB_STATEMENT="-Djava.library.path=%JAVA_LIB_PATH%"
-"%JAVA_HOME%\bin\java" -Xmx512m -Xms32m %WASP_STATEMENT% %LIB_STATEMENT% -classpath "%CLASSPATH%" org.apache.manifoldcf.crawler.server.filenet.Filenet
-goto done
-:nojavahome
-echo Environment variable JAVA_HOME is not set properly.
-goto done
-:nolcfhome
-echo Environment variable MCF_HOME is not set properly.
-goto done
-:done
+@echo off
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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 check that JAVA_HOME and MCF_HOME are set
+if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
+if not exist "%MCF_HOME%\properties.xml" goto nolcfhome
+rem save existing path here
+set OLDDIR=%CD%
+cd "%MCF_HOME%\filenet-server-process"
+set CLASSPATH=.
+for %%f in (jar/*) do call script\setclasspath.bat %%f
+rem restore old path here
+cd "%OLDDIR%"
+set WASP_STATEMENT=
+if defined WASP_HOME set WASP_STATEMENT="-Dwasp.location=%WASP_HOME%"
+set LIB_STATEMENT=
+if defined JAVA_LIB_PATH set LIB_STATEMENT="-Djava.library.path=%JAVA_LIB_PATH%"
+"%JAVA_HOME%\bin\java" -Xmx512m -Xms32m %WASP_STATEMENT% %LIB_STATEMENT% -classpath "%CLASSPATH%" org.apache.manifoldcf.crawler.server.filenet.Filenet
+goto done
+:nojavahome
+echo Environment variable JAVA_HOME is not set properly.
+goto done
+:nolcfhome
+echo Environment variable MCF_HOME is not set properly.
+goto done
+:done
Propchange: incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Thu Apr 28 08:08:10 2011
@@ -1 +1 @@
-native
+CRLF
Modified: incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat?rev=1097349&r1=1097348&r2=1097349&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat (original)
+++ incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat Thu Apr 28 08:08:10 2011
@@ -1,16 +1,16 @@
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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.
-
-set CLASSPATH=%CLASSPATH%;%MCF_HOME%\filenet-server-process\jar\%1
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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.
+
+set CLASSPATH=%CLASSPATH%;%MCF_HOME%\filenet-server-process\jar\%1
Propchange: incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Thu Apr 28 08:08:10 2011
@@ -1 +1 @@
-native
+CRLF
Modified: incubator/lcf/trunk/framework/scripts/executecommand.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/scripts/executecommand.bat?rev=1097349&r1=1097348&r2=1097349&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/scripts/executecommand.bat (original)
+++ incubator/lcf/trunk/framework/scripts/executecommand.bat Thu Apr 28 08:08:10 2011
@@ -1,37 +1,37 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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 check that JAVA_HOME and MCF_HOME are set
-if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
-if not exist "%MCF_HOME%\properties.xml" goto nolcfhome
-rem save existing path here
-set OLDDIR=%CD%
-cd "%MCF_HOME%\processes"
-set CLASSPATH=.
-for %%f in (jar/*) do call script\setclasspath.bat %%f
-set JAVADEFINES=
-for %%g in (define/*) do call script\setdefine.bat %%g
-rem restore old path here
-cd "%OLDDIR%"
-"%JAVA_HOME%\bin\java" "-Dorg.apache.manifoldcf.configfile=%MCF_HOME%\properties.xml" %JAVADEFINES% -classpath "%CLASSPATH%" %*
-goto done
-:nojavahome
-echo Environment variable JAVA_HOME is not set properly.
-goto done
-:nolcfhome
-echo Environment variable MCF_HOME is not set properly.
-goto done
-:done
+@echo off
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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 check that JAVA_HOME and MCF_HOME are set
+if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
+if not exist "%MCF_HOME%\properties.xml" goto nolcfhome
+rem save existing path here
+set OLDDIR=%CD%
+cd "%MCF_HOME%\processes"
+set CLASSPATH=.
+for %%f in (jar/*) do call script\setclasspath.bat %%f
+set JAVADEFINES=
+for %%g in (define/*) do call script\setdefine.bat %%g
+rem restore old path here
+cd "%OLDDIR%"
+"%JAVA_HOME%\bin\java" "-Dorg.apache.manifoldcf.configfile=%MCF_HOME%\properties.xml" %JAVADEFINES% -classpath "%CLASSPATH%" %*
+goto done
+:nojavahome
+echo Environment variable JAVA_HOME is not set properly.
+goto done
+:nolcfhome
+echo Environment variable MCF_HOME is not set properly.
+goto done
+:done
Propchange: incubator/lcf/trunk/framework/scripts/executecommand.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Thu Apr 28 08:08:10 2011
@@ -1 +1 @@
-native
+CRLF
Modified: incubator/lcf/trunk/framework/scripts/setclasspath.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/scripts/setclasspath.bat?rev=1097349&r1=1097348&r2=1097349&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/scripts/setclasspath.bat (original)
+++ incubator/lcf/trunk/framework/scripts/setclasspath.bat Thu Apr 28 08:08:10 2011
@@ -1,16 +1,16 @@
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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.
-
-set CLASSPATH=%CLASSPATH%;%MCF_HOME%\processes\jar\%1
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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.
+
+set CLASSPATH=%CLASSPATH%;%MCF_HOME%\processes\jar\%1
Propchange: incubator/lcf/trunk/framework/scripts/setclasspath.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Thu Apr 28 08:08:10 2011
@@ -1 +1 @@
-native
+CRLF
Modified: incubator/lcf/trunk/framework/scripts/setdefine.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/scripts/setdefine.bat?rev=1097349&r1=1097348&r2=1097349&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/scripts/setdefine.bat (original)
+++ incubator/lcf/trunk/framework/scripts/setdefine.bat Thu Apr 28 08:08:10 2011
@@ -1,16 +1,16 @@
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. 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.
-
-for /f "delims=" %%a in ('type %MCF_HOME%\processes\define\%1') do set JAVADEFINES=-D%1=%%a %JAVADEFINES%
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. 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.
+
+for /f "delims=" %%a in ('type %MCF_HOME%\processes\define\%1') do set JAVADEFINES=-D%1=%%a %JAVADEFINES%
Propchange: incubator/lcf/trunk/framework/scripts/setdefine.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Thu Apr 28 08:08:10 2011
@@ -1 +1 @@
-native
+CRLF