You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/08/10 19:03:37 UTC
svn commit: r984122 [5/40] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/ac-macros/ build/generator/ build/generator/swig/
build/generator/templates/ build/generator/util/ build/hudson/
build/hudson/jobs/ build/hudson/jobs/subversion-1.6....
Modified: subversion/branches/ignore-mergeinfo/packages/windows-innosetup/templates/mk_htmlhelp.bat
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/packages/windows-innosetup/templates/mk_htmlhelp.bat?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/packages/windows-innosetup/templates/mk_htmlhelp.bat (original)
+++ subversion/branches/ignore-mergeinfo/packages/windows-innosetup/templates/mk_htmlhelp.bat Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@ REM ####################################
REM FILE mk_htmlhelp.bat
REM PURPOSE Making MS HTML help file out of the svn-book sources
REM ====================================================================
-REM Licensed to the Subversion Corporation (SVN Corp.) under one
+REM Licensed to the Apache Software Foundation (ASF) under one
REM or more contributor license agreements. See the NOTICE file
REM distributed with this work for additional information
-REM regarding copyright ownership. The SVN Corp. licenses this file
+REM regarding copyright ownership. The ASF licenses this file
REM to you under the Apache License, Version 2.0 (the
REM "License"); you may not use this file except in compliance
REM with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/packages/windows-innosetup/templates/svn-doc.css
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/packages/windows-innosetup/templates/svn-doc.css?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/packages/windows-innosetup/templates/svn-doc.css (original)
+++ subversion/branches/ignore-mergeinfo/packages/windows-innosetup/templates/svn-doc.css Tue Aug 10 17:03:06 2010
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ *
+ */
+
body
{
background-image: url(svn_bck.png);
Modified: subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/cmn.pl
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/cmn.pl?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/cmn.pl (original)
+++ subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/cmn.pl Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
# ==============================================================================
# Common Perl routines for the inno setup Perl helper scripts.
# ==============================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/mk_distro.bat
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/mk_distro.bat?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/mk_distro.bat (original)
+++ subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/mk_distro.bat Tue Aug 10 17:03:06 2010
@@ -16,10 +16,10 @@ goto endofperl
# FILE mk_distro.bat
# PURPOSE General Interface for making a Windows distribution
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/mk_distro.pl
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/mk_distro.pl?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/mk_distro.pl (original)
+++ subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/mk_distro.pl Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
# FILE mk_distro.pl
# PURPOSE General Interface for making a Windows distribution
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/mk_svndoc.pl
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/mk_svndoc.pl?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/mk_svndoc.pl (original)
+++ subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/mk_svndoc.pl Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
# FILE mk_svndoc
# PURPOSE Making MS HTML-help from the Subversion source documentation
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/set_version.pl
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/set_version.pl?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/set_version.pl (original)
+++ subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/set_version.pl Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
# FILE set_version.pl
# PURPOSE Setting version info on misc. files for Inno Setup
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/svnpath/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/svnpath/main.c?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/svnpath/main.c (original)
+++ subversion/branches/ignore-mergeinfo/packages/windows-innosetup/tools/svnpath/main.c Tue Aug 10 17:03:06 2010
@@ -5,10 +5,10 @@
* svnpath --help
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/auth.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/auth.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/auth.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/auth.py Tue Aug 10 17:03:06 2010
@@ -1,7 +1,7 @@
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/core/__init__.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/core/__init__.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/core/__init__.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/core/__init__.py Tue Aug 10 17:03:06 2010
@@ -1,7 +1,7 @@
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/core/functions.py.in
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/core/functions.py.in?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/core/functions.py.in (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/core/functions.py.in Tue Aug 10 17:03:06 2010
@@ -1,7 +1,7 @@
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py Tue Aug 10 17:03:06 2010
@@ -1,7 +1,7 @@
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/ext/listmixin.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/ext/listmixin.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/ext/listmixin.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/ext/listmixin.py Tue Aug 10 17:03:06 2010
@@ -1,7 +1,7 @@
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/repos.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/repos.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/repos.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/repos.py Tue Aug 10 17:03:06 2010
@@ -1,7 +1,7 @@
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/txn.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/txn.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/txn.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/txn.py Tue Aug 10 17:03:06 2010
@@ -1,7 +1,7 @@
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/types.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/types.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/types.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/types.py Tue Aug 10 17:03:06 2010
@@ -1,7 +1,7 @@
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/wc.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/wc.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/wc.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/wc.py Tue Aug 10 17:03:06 2010
@@ -1,7 +1,7 @@
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/example.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/example.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/example.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/example.py Tue Aug 10 17:03:06 2010
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/log.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/log.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/log.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/log.py Tue Aug 10 17:03:06 2010
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/mucc.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/mucc.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/mucc.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/mucc.py Tue Aug 10 17:03:06 2010
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/trunkify.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/trunkify.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/trunkify.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/trunkify.py Tue Aug 10 17:03:06 2010
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/setup.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/setup.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/setup.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/setup.py Tue Aug 10 17:03:06 2010
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
@@ -473,6 +473,7 @@ setup(cmdclass={'build': build, 'clean':
author_email='dev@subversion.tigris.org',
url='http://subversion.tigris.org',
packages=['csvn', 'csvn.core', 'csvn.ext'],
+ license='Apache License, Version 2.0',
)
# TODO: We need to create our own bdist_rpm implementation so that we can pass
Propchange: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Aug 10 17:03:06 2010
@@ -0,0 +1 @@
+*.pyc
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/localrepos.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/localrepos.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/localrepos.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/localrepos.py Tue Aug 10 17:03:06 2010
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/remoterepos.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/remoterepos.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/remoterepos.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/remoterepos.py Tue Aug 10 17:03:06 2010
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/run_all.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/run_all.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/run_all.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/run_all.py Tue Aug 10 17:03:06 2010
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/setup_path.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/setup_path.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/setup_path.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/setup_path.py Tue Aug 10 17:03:06 2010
@@ -1,8 +1,8 @@
#!/usr/bin/python -i
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/svntypes.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/svntypes.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/svntypes.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/svntypes.py Tue Aug 10 17:03:06 2010
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/wc.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/wc.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/wc.py (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/wc.py Tue Aug 10 17:03:06 2010
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/build/build.xml
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/build/build.xml?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/build/build.xml (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/build/build.xml Tue Aug 10 17:03:06 2010
@@ -1,4 +1,25 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+
+-->
+
<project name="svnjavahl" default="build" basedir="..">
<target name="generate-header-files"
description="Generate C header files for the bindings">
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/BlameCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/BlameCallback.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/BlameCallback.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/BlameCallback.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
@@ -25,6 +25,7 @@
*/
#include "BlameCallback.h"
+#include "ProplistCallback.h"
#include "JNIUtil.h"
#include "svn_time.h"
/**
@@ -48,40 +49,32 @@ svn_error_t *
BlameCallback::callback(void *baton,
apr_int64_t line_no,
svn_revnum_t revision,
- const char *author,
- const char *date,
+ apr_hash_t *rev_props,
svn_revnum_t merged_revision,
- const char *merged_author,
- const char *merged_date,
+ apr_hash_t *merged_rev_props,
const char *merged_path,
const char *line,
+ svn_boolean_t local_change,
apr_pool_t *pool)
{
if (baton)
- return ((BlameCallback *)baton)->singleLine(revision, author, date,
- merged_revision, merged_author,
- merged_date, merged_path, line,
- pool);
+ return ((BlameCallback *)baton)->singleLine(line_no, revision, rev_props,
+ merged_revision,
+ merged_rev_props, merged_path,
+ line, local_change, pool);
return SVN_NO_ERROR;
}
/**
* Callback called for a single line in the file, for which the blame
- * information was requested
- * @param revision the revision number, when the line was last changed
- * or -1, if not changed during the request revision
- * interval
- * @param author the author, who performed the last change of the line
- * @param date the date of the last change of the line
- * @param line the content of the line
- * @param pool memory pool for the use of this function
+ * information was requested. See the Java-doc for more information.
*/
svn_error_t *
-BlameCallback::singleLine(svn_revnum_t revision, const char *author,
- const char *date, svn_revnum_t mergedRevision,
- const char *mergedAuthor, const char *mergedDate,
- const char *mergedPath, const char *line,
+BlameCallback::singleLine(apr_int64_t line_no, svn_revnum_t revision,
+ apr_hash_t *revProps, svn_revnum_t mergedRevision,
+ apr_hash_t *mergedRevProps, const char *mergedPath,
+ const char *line, svn_boolean_t localChange,
apr_pool_t *pool)
{
JNIEnv *env = JNIUtil::getEnv();
@@ -91,14 +84,13 @@ BlameCallback::singleLine(svn_revnum_t r
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/BlameCallback2");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/BlameCallback3");
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
mid = env->GetMethodID(clazz, "singleLine",
- "(Ljava/util/Date;JLjava/lang/String;"
- "Ljava/util/Date;JLjava/lang/String;"
- "Ljava/lang/String;Ljava/lang/String;)V");
+ "(JJLjava/util/Map;JLjava/util/Map;"
+ "Ljava/lang/String;Ljava/lang/String;Z)V");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
return SVN_NO_ERROR;
@@ -108,36 +100,14 @@ BlameCallback::singleLine(svn_revnum_t r
}
// convert the parameters to their Java relatives
- jstring jauthor = JNIUtil::makeJString(author);
+ jobject jrevProps = ProplistCallback::makeMapFromHash(revProps, pool);
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
- jobject jdate = NULL;
- if (date != NULL && *date != '\0')
+ jobject jmergedRevProps = NULL;
+ if (mergedRevProps != NULL)
{
- apr_time_t timeTemp;
- svn_error_t *err = svn_time_from_cstring(&timeTemp, date, pool);
- if (err != SVN_NO_ERROR)
- return err;
-
- jdate = JNIUtil::createDate(timeTemp);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
- }
-
- jstring jmergedAuthor = JNIUtil::makeJString(mergedAuthor);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
-
- jobject jmergedDate = NULL;
- if (mergedDate != NULL && *mergedDate != '\0')
- {
- apr_time_t timeTemp;
- svn_error_t *err = svn_time_from_cstring(&timeTemp, mergedDate, pool);
- if (err != SVN_NO_ERROR)
- return err;
-
- jmergedDate = JNIUtil::createDate(timeTemp);
+ jmergedRevProps = ProplistCallback::makeMapFromHash(mergedRevProps, pool);
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
}
@@ -151,26 +121,18 @@ BlameCallback::singleLine(svn_revnum_t r
return SVN_NO_ERROR;
// call the Java method
- env->CallVoidMethod(m_callback, mid, jdate, (jlong)revision, jauthor,
- jmergedDate, (jlong)mergedRevision, jmergedAuthor,
- jmergedPath, jline);
+ env->CallVoidMethod(m_callback, mid, (jlong)line_no, (jlong)revision,
+ jrevProps, (jlong)mergedRevision, jmergedRevProps,
+ jmergedPath, jline, (jboolean)localChange);
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
// cleanup the temporary Java objects
- env->DeleteLocalRef(jauthor);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
-
- env->DeleteLocalRef(jdate);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
-
- env->DeleteLocalRef(jmergedAuthor);
+ env->DeleteLocalRef(jrevProps);
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
- env->DeleteLocalRef(jmergedDate);
+ env->DeleteLocalRef(jmergedRevProps);
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/BlameCallback.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/BlameCallback.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/BlameCallback.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/BlameCallback.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
@@ -43,20 +43,23 @@ class BlameCallback
static svn_error_t *callback(void *baton,
apr_int64_t line_no,
svn_revnum_t revision,
- const char *author,
- const char *date,
+ apr_hash_t *rev_props,
svn_revnum_t merged_revision,
- const char *merged_author,
- const char *merged_date,
+ apr_hash_t *merged_rev_props,
const char *merged_path,
const char *line,
+ svn_boolean_t local_change,
apr_pool_t *pool);
protected:
- svn_error_t *singleLine(svn_revnum_t revision, const char *author,
- const char *date, svn_revnum_t mergedRevision,
- const char *mergedAuthor, const char *mergedDate,
- const char *mergedPath, const char *line,
+ svn_error_t *singleLine(apr_int64_t line_no,
+ svn_revnum_t revision,
+ apr_hash_t *rev_props,
+ svn_revnum_t merged_revision,
+ apr_hash_t *merged_rev_props,
+ const char *merged_path,
+ const char *line,
+ svn_boolean_t local_change,
apr_pool_t *pool);
private:
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ChangelistCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ChangelistCallback.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ChangelistCallback.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ChangelistCallback.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ChangelistCallback.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ChangelistCallback.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ChangelistCallback.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ChangelistCallback.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CommitMessage.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CommitMessage.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CommitMessage.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CommitMessage.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CommitMessage.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CommitMessage.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CommitMessage.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CommitMessage.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ConflictResolverCallback.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ConflictResolverCallback.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ConflictResolverCallback.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ConflictResolverCallback.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ConflictResolverCallback.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ConflictResolverCallback.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ConflictResolverCallback.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CopySources.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CopySources.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CopySources.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CopySources.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CopySources.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CopySources.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CopySources.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CopySources.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/DiffSummaryReceiver.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/DiffSummaryReceiver.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/DiffSummaryReceiver.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/DiffSummaryReceiver.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/InfoCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/InfoCallback.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/InfoCallback.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/InfoCallback.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/InfoCallback.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/InfoCallback.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/InfoCallback.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/InfoCallback.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Inputer.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Inputer.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Inputer.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Inputer.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Inputer.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Inputer.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Inputer.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Inputer.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIByteArray.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIByteArray.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIByteArray.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIByteArray.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIByteArray.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIByteArray.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIByteArray.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIByteArray.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNICriticalSection.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNICriticalSection.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNICriticalSection.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNICriticalSection.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNICriticalSection.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNICriticalSection.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNICriticalSection.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNICriticalSection.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIMutex.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIMutex.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIMutex.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIMutex.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIMutex.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIMutex.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIMutex.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIMutex.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStackElement.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStackElement.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStackElement.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStackElement.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStackElement.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStackElement.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStackElement.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStackElement.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStringHolder.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStringHolder.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStringHolder.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStringHolder.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStringHolder.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStringHolder.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStringHolder.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStringHolder.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIThreadData.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIThreadData.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIThreadData.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIThreadData.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIThreadData.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIThreadData.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIThreadData.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIThreadData.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIUtil.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIUtil.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
@@ -814,6 +814,9 @@ svn_error_t *JNIUtil::preprocessPath(con
*/
path = svn_path_internal_style(path, pool);
+
+ /* For kicks and giggles, let's absolutize it. */
+ SVN_ERR(svn_dirent_get_absolute(&path, path, pool));
}
/* strip any trailing '/' */
path = svn_path_canonicalize(path, pool);
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIUtil.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIUtil.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIUtil.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIUtil.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
@@ -33,7 +33,6 @@ struct apr_pool_t;
struct svn_error;
class JNIMutex;
class SVNBase;
-class SVN::Pool;
#include <jni.h>
#include <fstream>
#include <apr_time.h>
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ListCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ListCallback.cpp?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ListCallback.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ListCallback.cpp Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ListCallback.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ListCallback.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ListCallback.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ListCallback.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you 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