You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by vm...@apache.org on 2012/05/29 03:39:49 UTC
svn commit: r1343447 [27/27] - in /subversion/branches/javahl-ra: ./ build/
build/ac-macros/ build/generator/ build/generator/templates/ build/win32/
contrib/client-side/emacs/ contrib/server-side/ notes/
notes/api-errata/1.8/ notes/merge-tracking/ sub...
Modified: subversion/branches/javahl-ra/tools/server-side/svnpubsub/example.conf
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/server-side/svnpubsub/example.conf?rev=1343447&r1=1343446&r2=1343447&view=diff
==============================================================================
--- subversion/branches/javahl-ra/tools/server-side/svnpubsub/example.conf (original)
+++ subversion/branches/javahl-ra/tools/server-side/svnpubsub/example.conf Tue May 29 01:39:41 2012
@@ -2,115 +2,16 @@
[DEFAULT]
svnbin: /usr/local/bin/svn
-streams: http://svn-master.apache.org:2069/commits/xml
- http://dist.apache.org:2069/commits/xml
+streams: http://svn.example.org:2069/commits/xml
-ASF: http://svn-master.apache.org/repos/asf
-INFRA: https://svn-master.apache.org/repos/infra
-CMS: %(INFRA)s/websites/production
-DIST: https://dist.apache.org/repos/dist
+## The values below are used by ConfigParser's interpolation syntax.
+## See http://docs.python.org/library/configparser
+SOME_REPOS: svn://svn.example.org/repos/chaos
[env]
-HOME: /home/svnwc
+HOME: /home/svn
LANG: en_US.UTF-8
[track]
-/x1/www/apr.apache.org: %(ASF)s/apr/site/trunk/docs
-/x1/www/apr.apache.org/dev/dist: %(DIST)s/dev/apr
-/x1/www/www.apache.org/dist/apr: %(DIST)s/release/apr
-/x1/www/www.apache.org/dist/poi: %(DIST)s/release/poi
-/x1/www/www.apache.org/dist/pivot: %(DIST)s/release/pivot
-/x1/www/www.apache.org/dist/httpd: %(DIST)s/release/httpd
-/x1/www/www.apache.org/dist/incubator/airavata: %(DIST)s/release/incubator/airavata
-/x1/www/www.apache.org/: %(CMS)s/www
-/x1/www/httpd.apache.org/: %(ASF)s/httpd/site/trunk/docs
-/x1/www/httpd.apache.org/docs/2.0: %(ASF)s/httpd/httpd/branches/2.0.x/docs/manual
-/x1/www/httpd.apache.org/docs/2.2: %(ASF)s/httpd/httpd/branches/2.2.x/docs/manual
-/x1/www/httpd.apache.org/docs/1.3: %(ASF)s/httpd/httpd/branches/1.3.x/htdocs/manual
-/x1/www/httpd.apache.org/docs/2.4: %(ASF)s/httpd/httpd/branches/2.4.x/docs/manual
-/x1/www/httpd.apache.org/docs/trunk: %(ASF)s/httpd/httpd/trunk/docs/manual
-/x1/www/httpd.apache.org/mod_fcgid/mod: %(ASF)s/httpd/mod_fcgid/trunk/docs/manual/mod
-/x1/www/httpd.apache.org/mod_fcgid/style: %(ASF)s/httpd/httpd/trunk/docs/manual/style
-/x1/www/httpd.apache.org/mod_fcgid/images: %(ASF)s/httpd/httpd/trunk/docs/manual/images
-/x1/www/httpd.apache.org/dev/dist: %(DIST)s/dev/httpd
-/x1/www/httpd.apache.org/mod_ftp/mod: %(ASF)s/httpd/mod_ftp/trunk/docs/manual/mod
-/x1/www/httpd.apache.org/mod_ftp/style: %(ASF)s/httpd/httpd/trunk/docs/manual/style
-/x1/www/httpd.apache.org/mod_ftp/images: %(ASF)s/httpd/httpd/trunk/docs/manual/images
-/x1/www/httpd.apache.org/mod_ftp/ftp: %(ASF)s/httpd/mod_ftp/trunk/docs/manual/ftp
-/x1/www/libcloud.apache.org: %(CMS)s/libcloud
-/x1/www/river.apache.org: %(CMS)s/river/content
-/x1/www/incubator.apache.org/stanbol: %(CMS)s/stanbol/content/stanbol
-/x1/www/incubator.apache.org/kitty: %(CMS)s/kitty/content/kitty
-/x1/www/www.apache.org/dist/trafficserver: %(DIST)s/release/trafficserver
-/x1/staging/harmony.apache.org/eclipse/update: %(ASF)s/harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.site
-/x1/staging/harmony.apache.org/externals/security: %(ASF)s/harmony/enhanced/java/trunk/classlib/doc/security
-/x1/staging/harmony.apache.org/externals/regex: %(ASF)s/harmony/enhanced/java/trunk/classlib/doc/regex
-/x1/staging/harmony.apache.org: %(ASF)s/harmony/standard/site/trunk/docs
-/x1/www/harmony.apache.org/eclipse/update: %(ASF)s/harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.site
-/x1/www/harmony.apache.org/externals/security: %(ASF)s/harmony/enhanced/java/trunk/classlib/doc/security
-/x1/www/harmony.apache.org/externals/regex: %(ASF)s/harmony/enhanced/java/trunk/classlib/doc/regex
-/x1/www/harmony.apache.org: %(ASF)s/harmony/standard/site/branches/live/docs
-/x1/www/subversion.apache.org/: %(ASF)s/subversion/site
-/x1/www/trafficserver.apache.org/: %(CMS)s/trafficserver
-/x1/www/qpid.apache.org: %(ASF)s/qpid/site/docs
-/x1/www/pdfbox.apache.org: %(ASF)s/pdfbox/site/publish
-/x1/www/cassandra.apache.org: %(ASF)s/cassandra/site/publish
-/x1/www/community.apache.org: %(CMS)s/community
-/x1/www/nutch.apache.org: %(ASF)s/nutch/site/publish
-/x1/www/wicket.apache.org: %(ASF)s/wicket/common/site/trunk/_site
-/x1/www/wicket.apache.org/apidocs: %(ASF)s/wicket/common/site/apidocs
-/x1/www/incubator.apache.org/callback: %(CMS)s/callback/content/callback
-/x1/www/incubator.apache.org/zetacomponents: %(ASF)s/incubator/zetacomponents/website/htdocs
-/x1/www/incubator.apache.org/flex: %(CMS)s/flex/content/flex
-/x1/www/incubator.apache.org/jena: %(CMS)s/jena/content/jena
-/x1/www/incubator.apache.org/celix: %(CMS)s/celix/content/celix
-/x1/www/incubator.apache.org/lucene.net: %(CMS)s/lucene.net/content/lucene.net
-/x1/www/incubator.apache.org/easyant: %(ASF)s/incubator/easyant/site/production
-/x1/www/incubator.apache.org/etch: %(CMS)s/etch/content/etch
-/x1/www/incubator.apache.org/rave: %(CMS)s/rave/content/rave
-/x1/www/incubator.apache.org/wave: %(CMS)s/wave/content/wave
-/x1/www/incubator.apache.org/lucy: %(CMS)s/lucy/content/lucy
-/x1/www/incubator.apache.org/openmeetings: %(ASF)s/incubator/openmeetings/trunk/singlewebapp/docs
-/x1/www/incubator.apache.org/openofficeorg: %(CMS)s/openofficeorg/content/openofficeorg
-/x1/www/incubator.apache.org/odftoolkit: %(CMS)s/odftoolkit/content/odftoolkit
-/x1/www/incubator.apache.org/airavata: %(CMS)s/airavata/content/airavata
-/x1/www/incubator.apache.org/wookie: %(CMS)s/wookie/content/wookie
-/x1/www/incubator.apache.org/accumulo: %(CMS)s/accumulo/content/accumulo
-/x1/www/gora.apache.org: %(ASF)s/gora/site/publish
-/x1/www/incubator.apache.org/devicemap: %(CMS)s/devicemap/content/devicemap
-/x1/www/aries.apache.org: %(CMS)s/aries/content
-/x1/www/tika.apache.org: %(ASF)s/tika/site/publish
-/x1/www/uima.apache.org/pubsub: %(ASF)s/uima/site/trunk/uima-website/docs
-/x1/www/zookeeper.apache.org: %(CMS)s/zookeeper
-/x1/www/chemistry.apache.org: %(CMS)s/chemistry
-/x1/www/ant.apache.org: %(ASF)s/ant/site/ant/production
-/x1/www/ant.apache.org/ivy: %(ASF)s/ant/site/ivy/production
-/x1/www/ant.apache.org/ivy/ivyde: %(ASF)s/ant/site/ivyde/production
-/x1/www/www.apache.org/dist/esme: %(DIST)s/release/esme
-/x1/www/www.apache.org/dist/libcloud: %(DIST)s/release/libcloud
-/x1/www/archive.apachecon.com: %(INFRA)s/apachecon/archive.apachecon.com
-/x1/www/oodt.apache.org: %(ASF)s/oodt/site
-/x1/www/esme.apache.org: %(CMS)s/esme/content
-/x1/www/ooo-site.apache.org: %(CMS)s/ooo-site
-/x1/www/openejb.apache.org: %(CMS)s/openejb
-/x1/www/deltacloud.apache.org: %(ASF)s/deltacloud/trunk/site/output
-/x1/www/ace.apache.org: %(CMS)s/ace
-/x1/www/stdcxx.apache.org/doc: %(ASF)s/stdcxx/trunk/doc
-/x1/www/stdcxx.apache.org: %(ASF)s/stdcxx/site
-/x1/www/www.apache.org/dist/tomcat: %(DIST)s/release/tomcat
-/x1/www/incubator.apache.org/any23: %(ASF)s/incubator/any23/site
-/x1/www/incubator.apache.org/bloodhound: %(ASF)s/incubator/bloodhound/site
-/x1/www/labs.apache.org/: %(CMS)s/labs
-/x1/www/lucene.apache.org: %(CMS)s/lucene
-/x1/www/lucene.apache.org/content/core/old_versioned_docs: %(ASF)s/lucene/old_versioned_docs
-/x1/www/pivot.apache.org: %(ASF)s/pivot/site/trunk/deploy
-/x1/www/www.apache.org/dist/empire-db: %(DIST)s/release/empire-db
-/x1/www/empire-db.apache.org: %(ASF)s/empire-db/site
-/x1/www/www.apache.org/dist/subversion: %(DIST)s/release/subversion
-/x1/www/avro.apache.org: %(ASF)s/avro/site/publish
-/x1/www/incubator.apache.org/cordova: %(ASF)s/incubator/cordova/site/public
-/x1/www/mahout.apache.org: %(ASF)s/mahout/site/new_website
-/x1/www/opennlp.apache.org: %(CMS)s/opennlp
-/x1/www/gump.apache.org: %(ASF)s/gump/site
-/x1/www/incubator.apache.org/syncope: %(ASF)s/incubator/syncope/site
-/x1/staging/www.apache.org: %(ASF)s/infrastructure/site/branches/flamebait/docs
+/usr/local/foo/prod: %(SOME_REPOS)/foo/production
+/usr/local/foo/dev: %(SOME_REPOS)/foo/trunk
Modified: subversion/branches/javahl-ra/tools/server-side/svnpubsub/svntweet.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/server-side/svnpubsub/svntweet.py?rev=1343447&r1=1343446&r2=1343447&view=diff
==============================================================================
--- subversion/branches/javahl-ra/tools/server-side/svnpubsub/svntweet.py (original)
+++ subversion/branches/javahl-ra/tools/server-side/svnpubsub/svntweet.py Tue May 29 01:39:41 2012
@@ -23,7 +23,7 @@
# svntweet.py my-config.json
#
# With my-config.json containing stream paths and the twitter auth info:
-# {"stream": "http://svn-master.apache.org:2069/commits/xml",
+# {"stream": "http://svn.apache.org:2069/commits/xml",
# "username": "asfcommits",
# "password": "MyLuggageComboIs1234"}
#
Modified: subversion/branches/javahl-ra/tools/server-side/svnpubsub/svnwcsub.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/server-side/svnpubsub/svnwcsub.py?rev=1343447&r1=1343446&r2=1343447&view=diff
==============================================================================
--- subversion/branches/javahl-ra/tools/server-side/svnpubsub/svnwcsub.py (original)
+++ subversion/branches/javahl-ra/tools/server-side/svnpubsub/svnwcsub.py Tue May 29 01:39:41 2012
@@ -110,6 +110,8 @@ class WorkingCopy(object):
logging.info("autopopulate %s from %s" % (self.path, self.url))
subprocess.check_call([svnbin, 'co', '-q',
'--non-interactive',
+ '--config-option',
+ 'config:miscellany:use-commit-times=on',
'--', self.url, self.path],
env=env)
@@ -242,6 +244,8 @@ class BackgroundWorker(threading.Thread)
'--non-interactive',
'--trust-server-cert',
'--ignore-externals',
+ '--config-option',
+ 'config:miscellany:use-commit-times=on',
wc.path]
subprocess.check_call(args, env=self.env)
@@ -257,6 +261,8 @@ class BackgroundWorker(threading.Thread)
args = [self.svnbin, 'cleanup',
'--non-interactive',
'--trust-server-cert',
+ '--config-option',
+ 'config:miscellany:use-commit-times=on',
wc.path]
subprocess.check_call(args, env=self.env)
Modified: subversion/branches/javahl-ra/win-tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/win-tests.py?rev=1343447&r1=1343446&r2=1343447&view=diff
==============================================================================
--- subversion/branches/javahl-ra/win-tests.py (original)
+++ subversion/branches/javahl-ra/win-tests.py Tue May 29 01:39:41 2012
@@ -65,6 +65,8 @@ def _usage_exit():
print(" -t, --test=TEST : Run the TEST test (all is default); use")
print(" TEST#n to run a particular test number,")
print(" multiples also accepted e.g. '2,4-7'")
+ print(" --log-level=LEVEL : Set log level to LEVEL (E.g. DEBUG)")
+ print(" --log-to-stdout : Write log results to stdout")
print(" --svnserve-args=list : comma-separated list of arguments for")
print(" svnserve")
@@ -93,10 +95,9 @@ def _usage_exit():
print(" -p, --parallel : run multiple tests in parallel")
print(" --server-minor-version : the minor version of the server being")
print(" tested")
- print(" --config-file : Configuration file for tests")
- print(" --fsfs-sharding : Specify shard size (for fsfs)")
- print(" --fsfs-packing : Run 'svnadmin pack' automatically")
- print(" --log-to-stdout : Write log results to stdout")
+ print(" --config-file : Configuration file for tests")
+ print(" --fsfs-sharding : Specify shard size (for fsfs)")
+ print(" --fsfs-packing : Run 'svnadmin pack' automatically")
sys.exit(0)
@@ -130,7 +131,7 @@ opts, args = my_getopt(sys.argv[1:], 'hr
'disable-http-v2', 'disable-bulk-updates', 'help',
'fsfs-packing', 'fsfs-sharding=', 'javahl',
'list', 'enable-sasl', 'bin=', 'parallel',
- 'config-file=', 'server-minor-version=',
+ 'config-file=', 'server-minor-version=', 'log-level=',
'log-to-stdout', 'mode-filter=', 'milestone-filter='])
if len(args) > 1:
print('Warning: non-option arguments after the first one will be ignored')
@@ -163,6 +164,7 @@ config_file = None
log_to_stdout = None
mode_filter=None
tests_to_run = []
+log_level = None
for opt, val in opts:
if opt in ('-h', '--help'):
@@ -230,6 +232,8 @@ for opt, val in opts:
config_file = val
elif opt == '--log-to-stdout':
log_to_stdout = 1
+ elif opt == '--log-level':
+ log_level = val
# Calculate the source and test directory names
abs_srcdir = os.path.abspath("")
@@ -656,8 +660,6 @@ if create_dirs:
baton = copied_execs
for dirpath, dirs, files in os.walk('subversion'):
copy_execs(baton, dirpath, dirs + files)
- for dirpath, dirs, files in os.walk('tools/client-side/svnmucc'):
- copy_execs(baton, dirpath, dirs + files)
except:
os.chdir(old_cwd)
raise
@@ -736,7 +738,8 @@ if not test_javahl:
cleanup, enable_sasl, parallel, config_file,
fsfs_sharding, fsfs_packing,
list_tests, svn_bin, mode_filter,
- milestone_filter)
+ milestone_filter,
+ set_log_level=log_level)
old_cwd = os.getcwd()
try:
os.chdir(abs_builddir)