socialtext-commits Mailing List for Socialtext Open wiki
Brought to you by:
socialtextrocks
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(187) |
Sep
(149) |
Oct
(42) |
Nov
(265) |
Dec
(144) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(208) |
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <pet...@us...> - 2007-02-07 20:55:14
|
Revision: 1008 http://svn.sourceforge.net/socialtext/?rev=1008&view=rev Author: petdance Date: 2007-02-07 12:54:52 -0800 (Wed, 07 Feb 2007) Log Message: ----------- Wiping out all source, leaving only a README pointing to the stoss page Added Paths: ----------- trunk/README Added: trunk/README =================================================================== --- trunk/README (rev 0) +++ trunk/README 2007-02-07 20:54:52 UTC (rev 1008) @@ -0,0 +1,8 @@ +The Socialtext source code has moved to our own internal Subversion +server. The final state of the code here at SourceForge is at: + +https://socialtext.svn.sourceforge.net/svnroot/socialtext/tags/moving-to-socialtext-repository/ + +For the new source code repository, see: + +https://www.socialtext.net/stoss/index.cgi?socialtext_open_source_code This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-02-07 20:53:30
|
Revision: 1007 http://svn.sourceforge.net/socialtext/?rev=1007&view=rev Author: petdance Date: 2007-02-07 12:53:25 -0800 (Wed, 07 Feb 2007) Log Message: ----------- Wiping out all source, leaving only a README pointing to the stoss page Removed Paths: ------------- trunk/COPYRIGHT trunk/Changes trunk/DIFF.SKIP trunk/INSTALL trunk/LICENSE trunk/MANIFEST.SKIP trunk/README trunk/SUPPORT trunk/UPGRADE trunk/bin/ trunk/build/ trunk/configure trunk/dev-bin/ trunk/docs/ trunk/etc/ trunk/lib/ trunk/share/ trunk/t/ Deleted: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2007-02-07 20:46:30 UTC (rev 1006) +++ trunk/COPYRIGHT 2007-02-07 20:53:25 UTC (rev 1007) @@ -1 +0,0 @@ -@COPYRIGHT@ Deleted: trunk/Changes =================================================================== --- trunk/Changes 2007-02-07 20:46:30 UTC (rev 1006) +++ trunk/Changes 2007-02-07 20:53:25 UTC (rev 1007) @@ -1,490 +0,0 @@ -Change log for Socialtext Open - -Synced with ST-based trunk -r15177 - -2.7.1.0 Thu Jan 11 20:07:41 CST 2007 - - [FIXES] - Introduced new portable init scripts that should start up apache-perl - and ceqltron without all the cross-platform headaches we've had. - - Fixed a problem where access to the database was getting done as - the wrong user name, if the "www-data" or "wwwrun" user had to be - added manually. - - Fixed a bug in the installer when certain run-time directories were - not getting their permissions set correctly. - - [INTERNALS] - Moving to HTML::Mason 1.33 allows us to pass over some kludgy code - that we had to have when checking module dependencies. - - -2.7.0.2 Fri Jan 5 15:26:20 CST 2007 - - NOTE: This version requires extra upgrade steps. Please read - docs/UPGRADE.to-2.7 for details. - - [FEATURES] - We now support searching with the KinoSearch search engine. - KinoSearch is faster, more robust and more modern than Plucene - that we used before. If you're upgrading to 2.6.2 from a previous - installation, please be sure to read docs/UPGRADE.to-2.7 - - KinoSearch also supports searching on: - * Version and part numbers, such as 1-229669712-23, 767-25A1234, - 1.9.16 - * Mixed alphanumerics, such as 100, S2, 37signals, l33t - * Symbols such as $10.23, -100.4, 8.82%, -19%, 0.80%, .80%, $100 - * Reliable wildcard matching on the ends of words: search for wiki* - will match wiki, wiki-wiki, and wikinomics. - * Reliable indexing and search on UTF-8 encoded tokens, particularly - multi-byte character sets such as Chinese. - - [FIXES] - Fixed some compatability problems under Mac OS X. - - [INTERNALS] - Changed how the help workspace gets created at install time. - - -2.5.0.2 Fri Dec 15 10:58:39 CST 2006 - - [FEATURES] - - Socialtext Unplugged is a way of creating an "airplane" wiki that - allows a user to "unplug" some segment of pages from a wiki, take - them away offline, edit them, and resynch them back to the workspace - when the user returns to the Internet. - - The code being released is of beta quality. It has been developed so - it is only available to those workspaces which have been configured - to use it. The Socialtext Unplugged capability can be turned on in - a workspace with the following st-admin command: - - st-admin set-workspace-config --workspace <workspace name> enable_unplugged 1 - - This will cause an unplug icon to be displayed on page displays, - recent changes lists, watchlist displays and some other page listing - screens. When the unplug icon is clicked, a zipped archive of those - pages will be saved to the user's computer. Inside that archive is - a file named index.html that, when opened, is a TiddlyWiki version - of the pages that were unplugged. - - Socialtext Unplugged currently works best with Firefox. The results - pages with Internet Explorer are a bit unclear, and Safari doesn't - work at all yet. - - For more about Socialtext Unplugged, see the FAQ at - https://www.socialtext.net/exchange/index.cgi?socialtext_unplugged_faq - - - [FIXES] - Reversed the change in 2.3.0.1 that changes how config files are included. - Now, Apache Includes conf.d/*.conf as before. - - Undeleting a page with utf8 characters in the title caused an app error. - - Removed a stray period from the end of a line in the email template - so that the link works if you click it in all mail clients. - - The "Duplicate page" popup now sets focus to the name field. - - Nav bar was missing when invalid action returns to homepage. - - Orphans list action now works correctly. - - Rationalized link ordering in nav bar and list view. - - Fixed incorrect instructions on My Workspaces interface page. - - Images with a query string would not get displayed. - - - [INTERNALS] - Socialtext::WeblogUpdates was getting loaded into Apache - unnecessarily. - - Setting of default values of server-admin and support-address are - now done in build/defaults.pl, instead of configure. - - The t/*.t tests have been streamlined in some cases to use fewer test - fixtures. All I did on this branch was review the tests and try to - make them use fewer fixtures. For example, there were several tests - using the "workspaces" fixture that only needed "admin" or "foobar". - - -2.3.1.0 Mon Nov 27 11:57:18 CST 2006 - - This is an important update that fixes two big bugs in 2.3.0.1. - - [FIXES] - File attachment uploads and page tagging didn't work because their - handlers were missing in the Apache config. - - Fixed filename of the Excel worksheet extractor. - - The ConfigureValues.pm file was getting created at the wrong time. - - [ENHANCEMENTS] - XML::SAX is now optional, not required. This saves two CPAN - distributions to install. - - -2.3.0.1 Mon Nov 20 12:57:26 CST 2006 - - [FEATURES] - - Tags may now be deleted. Tags that are not used on any page are - automatically removed. To delete an unwanted tag, go to the list - of tags, view all pages with that tag, and remove the tag from any - pages that contain it. - - Improved support for HTML email. When a user sends rich email to the - workspace, it is converted to formatted wikitext with inline images. - - Brought back the option to see "recently viewed" and "what's new" - in sidebar boxes, temporarily removed in Socialtext 2.0. - - Extensive new searching features for file attachments. With optional - external programs installed, the Socialtext page indexer can also - index the contents of many different file types, including: - * Microsoft Word and Excel documents - * RTF, PDF and PostScript documents - * HTML documents - * MP3 audio - * generic XML documents - * compressed zip files - - The REST API has been updated. Primary new features include: - * /data/workspaces/:ws/homepage redirects to the current homepage - of the workspace - * /data/version contains the version number of the API - * page collections have better titles - * collections now support order=alpha - * attachments are sortable by name (alpha) and size - * utf8 path names are allowed - * JSON representation is available for PUTting pages (helps with - wiki imports) - * when retrieving a JSON representation of a workspace, admins get - a bunch of good info, non-admins get a small amount of information - (still useful) - * Dynamically generated WSDL file, instead of a statically - served file. - - The list view that shows pages with a specific tag now enables - column sorting. - - Reduced the size of headings. Headings (H1-H6) are, in general, too - large. As a result users often resort to starting with H2 or H3. That - breaks any chance of meaningful hierarchical data in wikitext. Users - are breaking semantics to get desired look-and-feel. - - We now show tags in revision views. - - The parameters for Apache::SizeLimit are now set in the httpd.conf. - These are read by Socialtext::Handler::Cleanup at startup time. - No more hardcoded values in the .pm files. - - Includes in the Apache *.conf files now include "[^.#]*", instead of - the more limiting "*.conf". - - In the "Save As" box for downloading attachments, we now suggest - a filename. - - [FIXES] - An old version of Text::Balanced was causing attachment indexing - to slow down because of the use of the $& special variable. We now - require v1.99.0 of Text::Balanced that doesn't cause this problem. - - User was able to add a tag while editing a page, which would stay - even if the page was canceled. - - Tag deletion used to increment the revision number. - - If you click on the "Your Watchlist" link on the dashboard, you are - taken to the watchlist page, but the Watchlist tab is not highlighted. - Now fixed. - - Show "1 view" instead of "1 views". - - Many other smaller fixes, and fixes in import-workspace and - export-workspace. - - - [DOCUMENTATION] - Added .html to the Edit Tips refcard page. - - Added permissions note to the UPGRADE docs. Thanks to Dobrica - Pavlinusic for catching the error. - - - [INTERNALS] - All config files are now generated with Template Toolkit, not - HTML::Mason. This brings us a step closer to removing Mason from - Socialtext Open. - - Removed unused /st-archive handler from Socialtext Open. - - Added the --server-admin parameter to set the ServerAdmin parameter - in the Apache config. - - Added the --support-address parameter to set the default support - address if it's not set in /etc/socialtext/socialtext.conf. - - Removed dependency on File::Copy::Recursive. - - Removed HTTP::BrowserDetect, replaced it with four lines of code in - two functions in Socialtext::BrowserDetect. Saves 889K bytes of - memory usage in mod_perl. - - Socialtext::Workspace::Importer no longer gets loaded in Apache, - since it's only used by the st-import-workspace utility. Another 118K - saved. - - All Perl and Javascript files now have copyright notices, plus - a t/copyright.t test to make sure new ones don't get added - without copyright. - - - [DEVELOPMENT] - Added an explicit --dev option to configure. This is now available - as get_build_setting('dev'). - - Removed Apache::Reload as a prerequisite, unless you configure - with --dev. - - dev-bin/list-module-deps now lets you pass --dev and --socialtext-open - options, which will load DevDeps.yaml and omit EnterpriseDeps.yaml, - respectively. - - Added a test file so that all .t files have shebang lines, strict - and warnings. - - -2.0.0.1 Sat Nov 4 23:15:06 CST 2006 - - Changes here are massive, since it includes all our Socialtext 2.0 - improvements. They won't all be listed here. - - [FIXES] - Removed a warning in the error log if apache-perl wasn't forwarded. - - [INTERNALS] - Added t/case-conflict.t to watch for filenames that differ only - in case. This protects against conflicts on case-insensitive - filesystems like HFS on Mac OS X. - - Updated all the Test::Socialtext-using programs to use the new - fixture()-as-a-function method of specifying fixtures. - - Made the tests that use Test::MockObject skip_all if T::MO isn't - installed. We don't want to make another module install requirement - for three tests. - ---- Socialtext 1.x --- - -1.10.7.4 Fri Sep 29 16:37:29 CDT 2006 - - [FIXES] - Fixed a potential problem with configure hanging. Thanks, Luke Closs. - - [ENHANCEMENTS] - The /etc/init.d/ scripts now work on Fedora Core. - - You can now specify the locate of your Apache module directories with - --apache-perl-moduledir and --apache2-moduledir at ./configure time. - This also removes the directory hunting from gen-config. - - Apache config no longer loads the mod_cgi module, since everything - goes through mod_perl anyway. - - Removed more unused files that were only useful inside Socialtext - the company. - - Removed all experimental code for FCGI and lighttpd. - - [DOCUMENTATION] - Extensive docs on BSD now in docs/INSTALL.freebsd. Thanks to - Jason Crome. - - -1.10.7.1 Tue Sep 19 22:16:59 CDT 2006 - -This release incoroporates some bug fixing work done on the main line -of work inside Socialtext. We're working towards some big new REST -API improvements. - - [ENHANCEMENTS] - Added st-admin --rename-workspace. - - Added --no-export flag for st-admin delete-workspace. - - Easier to understand sign-in/invitation emails - - [FIXES] - The Apache status ExtendedStatus directive was in the wrong part of - the apache-perl config file. - - Bug #19943: Deleted pages were showing up in searches. - - -1.10.5.1 Fri Sep 15 23:44:09 CDT 2006 - -This release works hard to improve portability and efficiency of memory -usage. Not everyone has a couple of gigs to throw at their wiki server, -so we've been cleaning things up a bit. - -The /etc/init.d scripts should now work whether you're running a -Debian-based distro, like Ubuntu, or a RedHat or SuSe distro. - -A reminder: If you're using Socialtext Open on a public site, please add -it to https://www.socialtext.net/stoss/index.cgi?socialtext_open_sites. -We'd love to see who's using Socialtext Open. - - - [THINGS THAT MAY BREAK YOUR CODE] - - Removed the /etc/init.d/ceqlotron wrapper around /etc/init.d/st-apache - and /etc/init.d/ceqlotron. If you already have a Socialtext install, - delete your /etc/init.d/socialtext, and instead use the st-apache - and ceqlotron init scripts directly. - - - [ENHANCEMENTS] - /etc/init.d scripts should now run whether your system uses - start-stop-daemon (Debian, Ubuntu), startproc (Red Hat, SuSe), - or neither. - - Added /status and /perl-status URLs when configured with - --apache-status. - - The user/group that ST runs on is now configurable with --st-user - and --st-group flags to configure. - - No longer tries to load unused Apache modules: autoindex, status, - db_auth. - - Removed unused handlers etc. from the Apache configurations. - - Socialtext::Ceqltron was getting loaded by Apache when it shouldn't - have. - - Updated the invitation email to not be so likely to trip spam - triggers. - - st-admin --help is now much easier to read. - - - [FIXES] - Installer is smarter and won't try to install vim backup files - as scripts. - - Added "bc" package to the required package lists. - - Fixed some errors in the help documentation. - - Many other little bug fixes. - - -1.10.4.1 Wed Aug 30 15:25:13 CDT 2006 - -Socialtext Open is a major new release, with a new REST API available, -albeit in alpha stage. - -This also allows you take advantage of the Socialtext Conversion Toolbox -(https://www.socialtext.net/stoss/index.cgi?socialtext_conversion_toolbox) -for converting from other wiki packages. - - [FIXES] - Fixed dependency on Test::Base. - - [IMPROVEMENTS] - Removed dependencies on File::Find::Rule, Number::Compare and - Text::Glob. - - Removed specific version dependency on Carp. - - [INTERNALS] - Removed dependency on Socialtext::AppConfig in Socialtext::File. - - Removed dev-bin/deptree. It is now included in the CPAN - distribution Module::Depends::Tree. - - Values defined by configure are now contained/restricted to - Socialtext::Build::ConfigureValues. - - All calls to GetOptions() die if any invalid options are passed. - - -1.10.0.5 Fri Aug 11 21:29:10 CDT 2006 - - [IMPROVEMENTS] - If --hostname is specific when calling ./configure, it is now - passed into /etc/socialtext/socialtext.conf as email_hostname and - web_hostname. - - Removed the dependency on Plucene::Simple. Plucene::Simple is now - integrated into Socialtext::Search::Plucene::Simple. - - Removing Plucene::Simple also removed five dependent modules. - - -1.10.0.4 Wed Aug 9 22:15:37 CDT 2006 - -This is the first version we're not calling "beta". - - [IMPROVEMENTS] - Removed 9 module dependencies, to help minimize install times. - - [FIXED] - Fixed some tests that may have failed on some systems, depending on - if you had Image::Magick or elinks installed. - - [DOCUMENTATION] - Added documentation to INSTALL about the test user and test - database that you need to have in Postgres. - - - -1.10.0.3-beta Fri Aug 4 16:00:40 CDT 2006 - -Configuration has changed slightly. Now, if your HOSTNAME isn't fully -qualified, you can specify it before calling ./configure. It used to -be you'd specify URL, but this is simpler, as in: - - HOSTNAME=mywiki.mysite.com ./configure - -You only need to do this if your hostname is just the host's name, as in -"mywiki". - - [FIXES] - Fixed a problem with redirections in the Apache configuration file. - Also removed many extraneous mod_rewrite directives that aren't used - for Socialtext Open. Thanks, David Singer. - - The /var/run/socialtext directory is now created and given correct - permissions on install. Thanks, David Singer. - - Apache::SizeLimit is no longer required. - - Fixed a performance issue with Recent Changes. - - -1.10.0.2-beta Thu Aug 3 15:00:19 CDT 2006 - - [FIXES] - Bug #1530704: Regex for URL doesn't allow dash in t/page-to-absolute.t - - [FEATURES] - Updated to include features most recently in v1.10.1.1 on the - hosted service. - - [DOCUMENTATION] - Updates to the INSTALL file. - - -1.10.0.0-beta Mon Jul 24 07:24:06 PDT 2006 - - The first public beta of Socialtext Open. - Deleted: trunk/DIFF.SKIP =================================================================== --- trunk/DIFF.SKIP 2007-02-07 20:46:30 UTC (rev 1006) +++ trunk/DIFF.SKIP 2007-02-07 20:53:25 UTC (rev 1007) @@ -1,94 +0,0 @@ -# This is a list of files that should not be checked when diffing -# SF vs. ST. It's used by dev-bin/sf-st-diff. - -# The metacharacters are: -# ^ match the beginning of the string, as in Perl -# $ match the end of the string, as in Perl -# . match a period, as in file-globbing -# * match any string, as in file-globbing -# = match this string exactly, if at the beginning of the pattern -# "=x" is identical to "^=$", but is more readable -# -# However, I should make these match MANIFEST.SKIP - -# Appliance- and hosted-building items. -# Not stored in SF repo -^appliance-bin/ -^build/tarballs/ -^build/custom-ws-config/ - -# Workspace-specific build items -# Not stored in SF repo -^share/*/angel/ -^share/*/drkw/ -^share/*/dvp/ -^share/*/glg/ -^share/*/ideo/ -^share/*/lp/ -^share/*/referencemd/ -^share/*/rhio/ -^share/*/sap/ -^share/*/symantec/ -^share/*/target/ -^share/*/web2con/ - -# Dev items not useful to the general public -# Not stored in SF repo -^bench/ -=build/bin/st-install -=dev-bin/add-dependency -=dev-bin/bad-bot-does-not-follow-redirect -=dev-bin/catch.cgi -=dev-bin/convert-to-db4.2 -=dev-bin/dev-ceqlotron-runner -=dev-bin/import-user-data-1 -=dev-bin/import-workspace-user-data-2 -=dev-bin/install-tarballs -=dev-bin/make-branch -=dev-bin/make-release -=dev-bin/memory-watchdog -=dev-bin/migration/migrate-to-kinosearch -=dev-bin/move-htaccess-files -=dev-bin/nlwcommit -=dev-bin/nlw-downgrade -=dev-bin/nlw-upgrade -=dev-bin/poster.pl -=dev-bin/uj-demo-update -=dev-bin/update-st-bundles -=dev-bin/upload-deb -^share/js-test/ -^t/selenium/ -^t/Test-Less/ - -# Plucene doesn't ship with OSR any more -^lib/Socialtext/Search/Plucene/ -^t/Socialtext/Search/Plucene/ - -# Part of the control panel, which doesn't ship with OSR -# Not stored in SF repo -=lib/Socialtext/WebApp/Control.pm -=lib/Socialtext/AccessHandler/IsBusinessAdmin.pm -^share/mason/nlw/control/ - -# Test data -# Not stored in SF repo -^t/test-data/page-stats-log/ - -# Residue of doing work and/or builds. These are listed here because -# I always forget to do a "make clean" before diffing my trees. -^blib/ -^pm_to_blib -^build/tmp/ -^t/tmp*/ -=etc/init.d/ceqlotron -=etc/init.d/st-apache -=share/html/502.html -=share/wsdl/0.9.wsdl -=Makefile -=lib/Socialtext/Build/ConfigureValues.pm - -# Other detritrus that might be lying around. -.orig$ -.rej$ -tmp-*$ -~$ Deleted: trunk/INSTALL =================================================================== --- trunk/INSTALL 2007-02-07 20:46:30 UTC (rev 1006) +++ trunk/INSTALL 2007-02-07 20:53:25 UTC (rev 1007) @@ -1,295 +0,0 @@ -INSTALL -- How to install Socialtext Open - -@COPYRIGHT@ - -== Overview == - -Thanks for downloading Socialtext Open. Socialtext Open has a huge -number of capabilities, so installation may take some time. We -trust you'll find it worth the effort. - -Here's the high-level overview to installing Socialtext Open, with -pointers to more detailed information. - -* Install apache-perl - - apache-perl is the name of the Debian package that contains - Apache1 with mod_perl support. We've kept that nomenclature. - See docs/INSTALL.apache-perl for instructions on how to build - your own from source if your distribution does not include such - a package. - -* Install Apache2 if you're going to use the dual-Apache proxy setup. - - In Debian, the package to install is apache2-mpm-prefork. Other - distributions may have others. It's important that it include - the internal Apache proxy server modules built for it. - -* Install, configure and start PostgreSQL - - See docs/INSTALL.postgres for details - -* Install the CPAN dependencies and optional programs - - See docs/INSTALL.dependencies for details, or you can let the - configuration step do it for you. - -* Configure, build and install Socialtext - - See "How to: Configure Socialtext" later in this document. - -* Upgrade your Socialtext 1.x database to 2.x, if appropriate. - - See UPGRADE if necessary. - -* Create your Socialtext users - - See "How to: Create your Socialtext users" later in this document - -* Start Socialtext - - See "How to: Start Socialtext" later in this document - -* Understand the support programs - - See "Support programs" later in this document - - -== How to: Configure Socialtext == - -Socialtext Open is a Perl web application that makes heavy use of mod_perl -and CPAN. Some 150+ CPAN modules are required, some of which don't have -prebuilt packages for your OS (or the prebuilt packages are too old). - -Installation starts with running a simple program, "configure": - - ./configure - -When you run it, you're presented with a list of settings that the files -are built with: - - $ ./configure - Configuration Settings: - BINDIR = /usr/local/bin - CACHEDIR = /var/cache/socialtext - CONFDIR = /etc/socialtext - etc... - -You can modify these settings by using either environment variables or command -line switches to configure. For example: - - $ ./configure --webroot=/var/www/myst - or - $ WEBROOT=/var/www/myst ./configure - -Use ./configure --help for help or ./configure --varlist for a list -of variables you can set. Please check the configuration variables -carefully. - -Sometimes configure can't determine your fully-qualified hostname. -If your server is called myserver, and you're in the domain -mydomain.com, your HOSTNAME may just be HOSTNAME=myserver, which -may not resolve correctly for others outside of mydomain.com. You'll -want to force the hostname to myserver.mydomain.com, like so: - - $ ./configure --hostname=myserver.mydomain.com - -Once the Makefile has been created, you can then build, test and -install. Run make to build the software: - - $ make - ... # much building - -Then you can optionally run make test to test the build. You'll -need to have a special testing database set up for the tests to -work with. See docs/INSTALL.postgres for details. - - $ make test - ... # much testing - -Finally, install Socialtext Open. - - $ sudo make install - ... # much installing - -You have now installed the software parts of Socialtext Open, -although it has not yet started at this point. - - -== How to: Create your Socialtext users == - -After you've installed Socialtext, you'll have to create at least -one user and one workspace. From the command line, as the Apache -user, you use the st-admin command-line tool. - -In these examples, we assume the environment variable APACHE_USER -has the name that Apache 1 will be running under, probably "www-data". -First, create a user for yourself: - - sudo -u $APACHE_USER \ - st-admin create-user \ - --email my...@ex... \ - --password secretpublic \ - --first-name Pete \ - --last-name Shelley - -Then add yourself to the help workspace as a workspace admin. The -"help" workspace is the only one that exists at first. - - sudo -u $APACHE_USER \ - st-admin add-workspace-admin \ - --email my...@ex... \ - --workspace help - -== How to: Start Socialtext == - -Now you are ready to start Socialtext. Make sure that you're not -running an instance of Apache already. If you are, your Socialtext -instance of Apache will quietly fail. - -Start the Socialtext Apache and the ceqlotron: - - $ sudo /etc/init.d/st-apache start - # Starts Apache 1.3 + mod_perl using the Socialtext configuration. - $ sudo /etc/init.d/ceqlotron start - # Starts the Change Queue daemon, which processes wiki events. - -At this point, you can point your browser to your domain: - - http://myserver.mydomain.com/ - -Log in with the user and password you set when you created your -Socialtext user. You'll have full administrative privileges, and -can create workspaces at will under the "Settings" menu. - -Most likely you will spend most of your time struggling to get Socialtext's -dependencies installed. The dependencies come in two flavours: CPAN -dependencies and external system dependencies, which are both described below. - - -=== Support programs === - -Socialtext Open includes some utility programs for administering -your Socialtext installation, users and workspaces, as well as the -ceqlotron. All Socialtext administration tools start with "st-", -and all ceqlotron-related tools start with "ceq-". - -All programs support the --help command. You can also say "man -programname" to get more information. - -* st-admin -- The CLI interface to user and administration tasks. -This is what you can use to create and delete users, workspaces, -categories and so on. - -* st-config -- Allows you to update configuration settings for -Socialtext without having to manually edit configuration files. - -* ceq-stat -- Gives the status of the ceqlotron's queue. - -* ceq-read -- Lists all the events in the ceqlotron's queue. - -* ceq-rm -- Removes events from the ceqlotron's queue - - -Also included with the Socialtext Open distribution is the dev-bin/ -directory, containing a number of utilities that we use at Socialtext, -but are not installed with "make install". You probably won't use -them during your day-to-day administration of your installation, -but we thought they might be of interest to open source developers. -Be careful here, as some utilities may be dangerous to your data, -or may even be out of date. They are meant only for developers, -and are not supported. - - -== Getting help == - -If you have problems installing Socialtext Open, please visit one -of these online resources. - -http://www.socialtext.net/stoss/ - The home wiki workspace for all open source related to Socialtext, - including the Socialtext Open product you've just downloaded. - -http://sourceforge.net/projects/socialtext - SourceForge is the host of the downloads, bug tracker and (soon) - source code repository for Socialtext Open. - -http://sourceforge.net/tracker/?group_id=170460 - The requests/bugs tracking system on SourceForge. - -If all else fails, or you have other questions about Socialtext Open, -you can also contact andy.lester [at] socialtext.com. - - -== Improvements and bug reports == - -We're always looking to improve documentation. If you've got -suggestions, problems, frustrations, please make a note of them at -https://www.socialtext.net/stoss/index.cgi?install_docs_improvements. - - -== Other INSTALL docs you may find useful - -This document is the main overview for installing Socialtext Open. -There is also an entire set of docs/INSTALL.* documents that may -also be helpful. - -* docs/GLOSSARY - - A glossary of terms in Socialtext Open - -* docs/INSTALL.apache-perl - - How to install Apache 1 + mod_perl - -* docs/INSTALL.apt-get - - Instructions for using the Socialtext apt repository - -* docs/INSTALL.ceqlotron - - How to install Socialtext's ceqlotron - -* docs/INSTALL.dependencies - - Installing Socialtext's dependencies - -* docs/INSTALL.dual-apache - - How to use a dual-Apache proxying setup - -* docs/INSTALL.email - - How to install email support for Socialtext Open - -* docs/INSTALL.fedora - - Fedora Core-specific notes for Socialtext Open - -* docs/INSTALL.freebsd - - FreeBSD-specific notes for Socialtext Open - -* docs/INSTALL.postgres - - How to install PostgreSQL for Socialtext - -* docs/INSTALL.st-dev - - How to set up a Socialtext development environment - -* docs/INSTALL.suse - - SUSE-specific notes for Socialtext Open - -* docs/INSTALL.troubleshooting - - Troubleshooting installation - -* docs/INSTALL.yum - - Installing dependencies with Yum - -# END OF DOCUMENT -# vi: set ts=8 sts=4 sw=4 expandtab -# -*- text -*- Deleted: trunk/LICENSE =================================================================== --- trunk/LICENSE 2007-02-07 20:46:30 UTC (rev 1006) +++ trunk/LICENSE 2007-02-07 20:53:25 UTC (rev 1007) @@ -1,521 +0,0 @@ -I. Socialtext Public License 1.0.0: - -1. Definitions. - -1.1. "Commercial Use" means distribution or otherwise making the -Covered Code available to a third party. - -1.2. ''Contributor'' means each entity that creates or contributes to -the creation of Modifications. - -1.3. ''Contributor Version'' means the combination of the Original -Code, prior Modifications used by a Contributor, and the -Modifications made by that particular Contributor. - -1.4. ''Covered Code'' means the Original Code or Modifications or -the combination of the Original Code and Modifications, in each -case including portions thereof. - -1.5. ''Electronic Distribution Mechanism'' means a mechanism -generally accepted in the software development community for the -electronic transfer of data. - -1.6. ''Executable'' means Covered Code in any form other than -Source Code. - -1.7. ''Initial Developer'' means the individual or entity identified as -the Initial Developer in the Source Code notice required by Exhibit -A. - -1.8. ''Larger Work'' means a work which combines Covered Code or -portions thereof with code not governed by the terms of this -License. - -1.9. ''License'' means this document. - -1.10. "Licensable" means having the right to grant, to the maximum -extent possible, whether at the time of the initial grant or -subsequently acquired, any and all of the rights conveyed herein. - -1.11. ''Modifications'' means any addition to or deletion from the -substance or structure of either the Original Code or any previous -Modifications. When Covered Code is released as a series of files, a -Modification is: - - (a) Any addition to or deletion from the contents of a file -containing Original Code or previous Modifications. - - - (b) Any new file that contains any part of the Original Code or -previous Modifications. - - -1.12. ''Original Code'' means Source Code of computer software -code which is described in the Source Code notice required by -Exhibit A as Original Code, and which, at the time of its release -under this License is not already Covered Code governed by this -License. - -1.13. "Patent Claims" means any patent claim(s), now owned or -hereafter acquired, including without limitation, method, process, -and apparatus claims, in any patent Licensable by grantor. - -1.14. ''Source Code'' means the preferred form of the Covered Code -for making modifications to it, including all modules it contains, -plus any associated interface definition files, scripts used to control -compilation and installation of an Executable, or source code -differential comparisons against either the Original Code or another -well known, available Covered Code of the Contributor's choice. The -Source Code can be in a compressed or archival form, provided the -appropriate decompression or de-archiving software is widely -available for no charge. - -1.15. "You'' (or "Your") means an individual or a legal entity -exercising rights under, and complying with all of the terms of, this -License or a future version of this License issued under Section 6.1. -For legal entities, "You'' includes any entity which controls, is -controlled by, or is under common control with You. For purposes -of this definition, "control'' means (a) the power, direct or indirect, -to cause the direction or management of such entity, whether by -contract or otherwise, or (b) ownership of more than fifty percent -(50%) of the outstanding shares or beneficial ownership of such -entity. - -2. Source Code License. - -2.1. The Initial Developer Grant. -The Initial Developer hereby grants You a world-wide, royalty-free, -non-exclusive license, subject to third party intellectual property -claims: - - (a) under intellectual property rights (other than patent or -trademark) Licensable by Initial Developer to use, reproduce, -modify, display, perform, sublicense and distribute the Original -Code (or portions thereof) with or without Modifications, and/or as -part of a Larger Work; and - - - (b) under Patents Claims infringed by the making, using or -selling of Original Code, to make, have made, use, practice, sell, -and offer for sale, and/or otherwise dispose of the Original Code (or -portions thereof). - - - (c) the licenses granted in this Section 2.1(a) and (b) are effective -on the date Initial Developer first distributes Original Code under -the terms of this License. - - - (d) Notwithstanding Section 2.1(b) above, no patent license is -granted: 1) for code that You delete from the Original Code; 2) -separate from the Original Code; or 3) for infringements caused by: -i) the modification of the Original Code or ii) the combination of the -Original Code with other software or devices. - - -2.2. Contributor Grant. -Subject to third party intellectual property claims, each Contributor -hereby grants You a world-wide, royalty-free, non-exclusive -license: - - (a) under intellectual property rights (other than patent or -trademark) Licensable by Contributor, to use, reproduce, modify, -display, perform, sublicense and distribute the Modifications -created by such Contributor (or portions thereof) either on an -unmodified basis, with other Modifications, as Covered Code -and/or as part of a Larger Work; and - - - (b) under Patent Claims infringed by the making, using, or selling -of Modifications made by that Contributor either alone and/or in -combination with its Contributor Version (or portions of such -combination), to make, use, sell, offer for sale, have made, and/or -otherwise dispose of: 1) Modifications made by that Contributor (or -portions thereof); and 2) the combination of Modifications made by -that Contributor with its Contributor Version (or portions of such -combination). - - - (c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective -on the date Contributor first makes Commercial Use of the Covered -Code. - - - (d) Notwithstanding Section 2.2(b) above, no patent license is -granted: 1) for any code that Contributor has deleted from the -Contributor Version; 2) separate from the Contributor Version; 3) -for infringements caused by: i) third party modifications of -Contributor Version or ii) the combination of Modifications made by -that Contributor with other software (except as part of the -Contributor Version) or other devices; or 4) under Patent Claims -infringed by Covered Code in the absence of Modifications made by -that Contributor. - - -3. Distribution Obligations. - -3.1. Application of License. -The Modifications which You create or to which You contribute are -governed by the terms of this License, including without limitation -Section 2.2. The Source Code version of Covered Code may be -distributed or provided over a network as a service to end users -(Otherwise Provided) whether hosted by You or a third party only -under the terms of this License or a future version of this License -released under Section 6.1, and You must include a copy of this -License with every copy of the Source Code You distribute or -Otherwise Provide. You may not offer or impose any terms on any -Source Code version that alters or restricts the applicable version of -this License or the recipients' rights hereunder. However, You may -include an additional document offering the additional rights -described in Section 3.5. - -3.2. Availability of Source Code. -Any Modification which You create or to which You contribute must -be made available in Source Code form: (i) to SocialText or -SocialText’s successor or assignee, including, without limitation, -the trustee of a trust to which SocialText assigns its rights in the -Covered Code; and (ii) under the terms of this License either on the -same media as an Executable version or via an accepted Electronic -Distribution Mechanism to anyone to whom you made an -Executable version available; and if made available via Electronic -Distribution Mechanism, must remain available for at least twelve -(12) months after the date it initially became available, or at least -six (6) months after a subsequent version of that particular -Modification has been made available to such recipients. You are -responsible for ensuring that the Source Code version remains -available even if the Electronic Distribution Mechanism is -maintained by a third party. - -3.3. Description of Modifications. -You must cause all Covered Code to which You contribute to -contain a file documenting the changes You made to create that -Covered Code and the date of any change. You must include a -prominent statement that the Modification is derived, directly or -indirectly, from Original Code provided by the Initial Developer and -including the name of the Initial Developer in (a) the Source Code, -and (b) in any notice in an Executable version or related -documentation in which You describe the origin or ownership of the -Covered Code. - -3.4. Intellectual Property Matters - - (a) Third Party Claims. If Contributor has knowledge that a -license under a third party's intellectual property rights is required -to exercise the rights granted by such Contributor under Sections -2.1 or 2.2, Contributor must include a text file with the Source Code -distribution titled "LEGAL'' which describes the claim and the party -making the claim in sufficient detail that a recipient will know whom -to contact. If Contributor obtains such knowledge after the -Modification is made available as described in Section 3.2, -Contributor shall promptly modify the LEGAL file in all copies -Contributor makes available thereafter and shall take other steps -(such as notifying appropriate mailing lists or newsgroups) -reasonably calculated to inform those who received the Covered -Code that new knowledge has been obtained. - - - (b) Contributor APIs. If Contributor's Modifications include an -application programming interface and Contributor has knowledge -of patent licenses which are reasonably necessary to implement that -API, Contributor must also include this information in the LEGAL -file. - - - (c) Representations. Contributor represents that, except as -disclosed pursuant to Section 3.4(a) above, Contributor believes -that Contributor's Modifications are Contributor's original -creation(s) and/or Contributor has sufficient rights to grant the -rights conveyed by this License - - -3.5. Required Notices. -You must duplicate the notice in Exhibit A in each file of the Source -Code. If it is not possible to put such notice in a particular Source -Code file due to its structure, then You must include such notice in -a location (such as a relevant directory) where a user would be likely -to look for such a notice. If You created one or more Modification(s) -You may add your name as a Contributor to the notice described in -Exhibit A. You must also duplicate this License in any -documentation for the Source Code where You describe recipients' -rights or ownership rights relating to Covered Code. You may -choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of -Covered Code. However, You may do so only on Your own behalf, -and not on behalf of the Initial Developer or any Contributor. You -must make it absolutely clear than any such warranty, support, -indemnity or liability obligation is offered by You alone, and You -hereby agree to indemnify the Initial Developer and every -Contributor for any liability incurred by the Initial Developer or such -Contributor as a result of warranty, support, indemnity or liability -terms You offer. - -3.6. Distribution of Executable Versions. -You may distribute or Otherwise Provide Covered Code in -Executable form only if the requirements of Section 3.1-3.5 have -been met for that Covered Code, and if You include a notice stating -that the Source Code version of the Covered Code is available under -the terms of this License, including a description of how and where -You have fulfilled the obligations of Section 3.2. The notice must be -conspicuously included in any notice in an Executable version, -related documentation or collateral in which You describe -recipients' rights relating to the Covered Code. You may distribute -or Otherwise Provide the Executable version of Covered Code or -ownership rights under a license of Your choice, which may contain -terms different from this License, provided that You are in -compliance with the terms of this License and that the license for -the Executable version does not attempt to limit or alter the -recipient's rights in the Source Code version from the rights set -forth in this License. If You distribute the Executable version under -a different license You must make it absolutely clear that any terms -which differ from this License are offered by You alone, not by the -Initial Developer or any Contributor. You hereby agree to indemnify -the Initial Developer and every Contributor for any liability incurred -by the Initial Developer or such Contributor as a result of any such -terms You offer. - -3.7. Larger Works. -You may create a Larger Work by combining Covered Code with -other code not governed by the terms of this License and distribute -the Larger Work as a single product. In such a case, You must make -sure the requirements of this License are fulfilled for the Covered -Code. - -3.8. Network Use. If the Covered Code as You received it is intended -to interact with users through a computer network and if, in the -version You received, such a user has the opportunity to request -transmission to that user (whether through an Electronic -Distribution Mechanism or otherwise) of the complete Source Code -of the Covered Code, You must not remove that facility from the -Contributor Version, and must offer an equivalent opportunity for -all users interacting with the Contributor Version through a -computer network to request immediate transmission by HTTP of -the complete Source Code of the Contributor Version. - -4. Inability to Comply Due to Statute or Regulation. -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Code due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description -must be included in the LEGAL file described in Section 3.4 and -must be included with all distributions of the Source Code. Except -to the extent prohibited by statute or regulation, such description -must be sufficiently detailed for a recipient of ordinary skill to be -able to understand it. - -5. Application of this License. -This License applies to code to which the Initial Developer has -attached the notice in Exhibit A and to related Covered Code. - -6. Versions of the License. -6.1. New Versions. -Socialtext Inc. (''Socialtext') may publish revised and/or new -versions of the License from time to time. Each version will be given -a distinguishing version number. - -6.2. Effect of New Versions. -Once Covered Code has been published under a particular version -of the License, You may always continue to use it under the terms -of that version. You may also choose to use such Covered Code -under the terms of any subsequent version of the License published -by Socialtext. No one other than Socialtext has the right to modify -the terms applicable to Covered Code created under this License. - -6.3. Derivative Works. -If You create or use a modified version of this License (which you -may only do in order to apply it to code which is not already -Covered Code governed by this License), You must (a) rename Your -license so that the phrases ''Socialtext'', ''SPL'' or any confusingly -similar phrase do not appear in your license (except to note that -your license differs from this License) and (b) otherwise make it -clear that Your version of the license contains terms which differ -from the Socialtext Public License. (Filling in the name of the Initial -Developer, Original Code or Contributor in the notice described in -Exhibit A shall not of themselves be deemed to be modifications of -this License.) - -7. DISCLAIMER OF WARRANTY. -COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' -BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR -IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT -THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR -A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS -WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY -RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER -CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, -REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY -CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY -COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS -DISCLAIMER. - -8. TERMINATION. -8.1. This License and the rights granted hereunder will terminate -automatically if You fail to comply with terms herein and fail to cure -such breach within 30 days of becoming aware of the breach. All -sublicenses to the Covered Code which are properly granted shall -survive any termination of this License. Provisions which, by their -nature, must remain in effect beyond the termination of this License -shall survive. - -8.2. If You initiate litigation by asserting a patent infringement -claim (excluding declaratory judgment actions) against Initial -Developer or a Contributor (the Initial Developer or Contributor -against whom You file such action is referred to as "Participant") -alleging that: - - (a) such Participant's Contributor Version directly or indirectly -infringes any patent, then any and all rights granted by such -Participant to You under Sections 2.1 and/or 2.2 of this License -shall, upon 60 days notice from Participant terminate prospectively, -unless if within 60 days after receipt of notice You either: (i) agree -in writing to pay Participant a mutually agreeable reasonable royalty -for Your past and future use of Modifications made by such -Participant, or (ii) withdraw Your litigation claim with respect to the -Contributor Version against such Participant. If within 60 days of -notice, a reasonable royalty and payment arrangement are not -mutually agreed upon in writing by the parties or the litigation -claim is not withdrawn, the rights granted by Participant to You -under Sections 2.1 and/or 2.2 automatically terminate at the -expiration of the 60 day notice period specified above. - - - (b) any software, hardware, or device, other than such -Participant's Contributor Version, directly or indirectly infringes any -patent, then any rights granted to You by such Participant under -Sections 2.1(b) and 2.2(b) are revoked effective as of the date You -first made, used, sold, distributed, or had made, Modifications -made by that Participant. - - -8.3. If You assert a patent infringement claim against Participant -alleging that such Participant's Contributor Version directly or -indirectly infringes any patent where such claim is resolved (such as -by license or settlement) prior to the initiation of patent -infringement litigation, then the reasonable value of the licenses -granted by such Participant under Sections 2.1 or 2.2 shall be taken -into account in determining the amount or value of any payment or -license. - -8.4. In the event of termination under Sections 8.1 or 8.2 above, all -end user license agreements (excluding distributors and resellers) -which have been validly granted by You or any distributor -hereunder prior to termination shall survive termination. - -9. LIMITATION OF LIABILITY. -UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, -WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR -OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER -CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY -SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR -ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, -DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER -FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL -DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN -INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS -LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR -DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S -NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH -LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION -OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO -THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -10. U.S. GOVERNMENT END USERS. -The Covered Code is a ''commercial item,'' as that term is defined in -48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer -software'' and ''commercial computer software documentation,'' as -such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent -with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through -227.7202-4 (June 1995), all U.S. Government End Users acquire -Covered Code with only those rights set forth herein. - -11. MISCELLANEOUS. -This License represents the complete agreement concerning subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. This License shall be governed by -California law provisions (except to the extent applicable law, if any, -provides otherwise), excluding its conflict-of-law provisions. With -respect to disputes in which at least one party is a citizen of, or an -entity chartered or registered to do business in the United States of -America, any litigation relating to this License shall be subject to -the jurisdiction of the Federal Courts of the Northern District of -California, with venue lying in San Mateo County, California, with -the losing party responsible for costs, including without limitation, -court costs and reasonable attorneys' fees and expenses. The -application of the United Nations Convention on Contracts for the -International Sale of Goods is expressly excluded. Any law or -regulation which provides that the language of a contract shall be -construed against the drafter shall not apply to this License. - -12. RESPONSIBILITY FOR CLAIMS. -As between Initial Developer and the Contributors, each party is -responsible for claims and damages arising, directly or indirectly, -out of its utilization of rights under this License and You agree to -work with Initial Developer and Contributors to distribute such -responsibility on an equitable basis. Nothing herein is intended or -shall be deemed to constitute any admission of liability - -13. MULTIPLE-LICENSED CODE. -Initial Developer may designate portions of the Covered Code as -Multiple-Licensed. Multiple-Licensed means that the Initial -Developer permits you to utilize portions of the Covered Code -under Your choice of the SPL or the alternative licenses, if any, -specified by the Initial Developer in the file described in Exhibit A. -II. Socialtext Public License 1.0.0 - Exhibit A - -The contents of this file are subject to the Socialtext Public License -Version 1.0.0 ("License"); You may not use this file except in -compliance with the License. You may obtain a copy of the License -at http://www.socialtext.net/stoss/ - -Software distributed under the License is distributed on an "AS IS" -basis, WITHOUT WARRANTY OF ANY KIND, either express or -implied. See the License for the specific language governing rights -and limitations under the License. - -The Original Code is: Socialtext Open Source Editions - -The Initial Developer of the Original Code is Socialtext, Inc. -Portions created by Socialtext are Copyright (C) 2002-2006 -Socialtext, Inc.; -All Rights Reserved. - -Contributor(s): ______________________________________. - -NOTE: The text of this Exhibit A may differ slightly from the text of -the notices in the Source Code files of the Original Code. You -should use the text of this Exhibit A rather than the text found in -the Original Code Source Code for Your Modifications. -III. Socialtext Public License 1.0.0 - Exhibit B - -Additional Terms applicable to the Socialtext Public License. - -1. Effect. -These additional terms described in this Socialtext Public License, -Additional Terms shall apply to the Covered Code under this -License. - -2. Socialtext and logo. -This License does not grant any rights to use the trademarks -"Socialtext" and the "Socialtext" logo and Dreamcatcher, even if -such marks are included in the Original Code or Modifications. - -However, in addition to the other notice obligations, all copies of -the Covered Code in Executable and Source Code form distributed -must, as a form of attribution of the original author, include on -each user interface screen (i) the "Powered by Socialtext Open -Source Edition" logo and (ii) the copyright notice in the same form -as the latest version of the Covered Code distributed by Socialtext, -Inc. at the time of distribution of such copy. In addition, the -"Powered by Socialtext" logo must be visible to all users and be -located at the very bottom center of each user interface screen. -Notwithstanding the above, the dimensions of the "Powered By -Socialtext" logo must be at least 100x25 pixels. When users click on -the "Powered by Socialtext Open Source Edition" logo it must direct -them back to http://www.socialtext.net/stoss. In addition, the -copyright notice must remain visible to all users at all times at the -bottom of the user interface screen. When users click on the -copyright notice, it must direct them back to -http://www.socialtext.net/stoss. Deleted: trunk/MANIFEST.SKIP =================================================================== --- trunk/MANIFEST.SKIP 2007-02-07 20:46:30 UTC (rev 1006) +++ trunk/MANIFEST.SKIP 2007-02-07 20:53:25 UTC (rev 1007) @@ -1,30 +0,0 @@ -\.tmp$ -~$ -\.swp$ -\.svn/ -build/tarballs/ -build/EnterpriseDeps\.yaml -build/tmp/ -appliance-bin/ -bench/ -t/tmp\.* -blib/ -^lib/Socialtext/WebApp/Control\.pm$ -^share/mason/nlw/control -^Makefile$ -^share/wsdl/nlw.wsdl$ -^lib/Socialtext/Build/ConfigureValues\.pm$ -^etc/init\.d/st-apache$ -^etc/init\.d/ceqlotron$ -houseabsolute -MANIFEST.+ -^share/template/new_form_page/*/ -Socialtext.*gz$ -^Socialtext-Open- -^pm_to_blib$ -t/live -\.log$ -\.rej$ -\.orig$ -^t/test-data/page-stats-log/ -^DIFF.SKIP Deleted: trunk/README =================================================================== --- trunk/README 2007-02-07 20:46:30 UTC (rev 1006) +++ trunk/README 2007-02-07 20:53:25 UTC (rev 1007) @@ -1,21 +0,0 @@ -Thanks for downloading Socialtext Open. - -Installation directions are in the INSTALL file. - -There are a number of online resources for Socialtext Open. - - -http://www.socialtext.net/stoss/ - The home wiki workspace for all open source related to Socialtext, - including the Socialtext Open product you've just downloaded. - -http://sourceforge.net/projects/socialtext - SourceForge is the host of the downloads, bug tracker and (soon) - source code repository for Socialtext Open. - -http://sourceforge.net/tracker/?group_id=170460 - The requests/bugs tracking system on SourceForge. - -If all else fails, or you have other questions about Socialtext Open, -you can also contact andy.lester [at] socialtext.com. - Deleted: trunk/SUPPORT =================================================================== --- trunk/SUPPORT 2007-02-07 20:46:30 UTC (rev 1006) +++ trunk/SUPPORT 2007-02-07 20:53:25 UTC (rev 1007) @@ -1,66 +0,0 @@ -Socialtext Open is available to users free of charge, and accordingly -comes with no specific promises of support. That being said, there are -a number of ways to get answers to questions about Socialtext. - -Creating a page on the Socialtext Open Source wiki is a great way to -make your problem or question known and invite discussion and help. The -discussion about the problem will become part of the body of the -workspace, the wiki way. - - https://www.socialtext.net/stoss - -The Socialtext Open mailing lists and Socialtext Open forums are another -place to send your questions or problems, whether with installation, -running Socialtext Open, or any other problem. The lists and forums are -read by many Socialtext Open users, as well as Socialtext employees. - - https://www.socialtext.net/stoss/index.cgi?socialtext_open_mailing_lists - https://www.socialtext.net/stoss/index.cgi?socialtext_open_forums - -Sometimes you'll find people in Socialtext Open IRC, and they can help -as well. - - https://www.socialtext.net/stoss/index.cgi?socialtext_open_irc - -Please remember that whatever avenue you choose, Socialtext employees -will be answering as best they can amid their other duties. If -you're interested in paid support from Socialtext, please call us at -1-877-GET-WIKI. - -== Asking questions - -When asking questions, you can help get better and faster answers by -giving information that's as complete as possible. Include as much -information about your situation as possible. For example, include: - - * Version of Socialtext Open you're using - * Distribution of Linux/UNIX you're running on - * What versions of Perl and Apache you're using - * Version of your MTA (Sendmail, Qmail, etc) if it's mail-related - * How you ran configure, and the output it generated - * Any changes made to your /etc/socialtext/socialtext.conf file - * Full text of errors received on screen - * Relevant entries from your Apache error.log file - -Then include narrative about the problem. Tell what you did and how you -got to where you are. Sample query - -Here's a posting that lays out plenty of information that helps the -reader understand the problem, and how you got there. - - Hi, I'm having trouble installing Socialtext O... [truncated message content] |
From: <pet...@us...> - 2007-02-07 20:46:51
|
Revision: 1006 http://svn.sourceforge.net/socialtext/?rev=1006&view=rev Author: petdance Date: 2007-02-07 12:46:30 -0800 (Wed, 07 Feb 2007) Log Message: ----------- We're no longer using the SourceForge repo. It's all our internal repo now. See https://www.socialtext.net/stoss/index.cgi?socialtext_open_source_code Added Paths: ----------- tags/moving-to-socialtext-repository/ Copied: tags/moving-to-socialtext-repository (from rev 1005, trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-02-01 16:50:37
|
Revision: 1005 http://svn.sourceforge.net/socialtext/?rev=1005&view=rev Author: petdance Date: 2007-02-01 08:50:12 -0800 (Thu, 01 Feb 2007) Log Message: ----------- Fixed all the connection->user to be ->user Modified Paths: -------------- branches/rug/lib/Socialtext/Apache/AuthenHandler.pm branches/rug/lib/Socialtext/Apache/User.pm branches/rug/lib/Socialtext/AuthzHandler.pm branches/rug/lib/Socialtext/Handler/REST.pm branches/rug/lib/Socialtext/Rug/MP1.pm branches/rug/lib/Socialtext/Rug/MP2.pm Modified: branches/rug/lib/Socialtext/Apache/AuthenHandler.pm =================================================================== --- branches/rug/lib/Socialtext/Apache/AuthenHandler.pm 2007-01-30 23:07:33 UTC (rev 1004) +++ branches/rug/lib/Socialtext/Apache/AuthenHandler.pm 2007-02-01 16:50:12 UTC (rev 1005) @@ -10,7 +10,7 @@ <Location /foo> PerlAddVar SocialtextAuthenActions check_basic PerlAddVar SocialtextAuthenActions http_401 - PerlAuthenHandler Socialtext::Apache::AuthenHandler- + PerlAuthenHandler Socialtext::Apache::AuthenHandler </Location> =head1 DESCRIPTION @@ -85,7 +85,7 @@ # not. sub _authenticate_with { my ( $r, $password ) = @_; - my $username = $r->connection->user; + my $username = $r->user; if ( $username eq '' ) { $r->log_reason( "$SERVICE - no username given", $r->uri ); @@ -122,12 +122,12 @@ =cut # Return 1 if able to authenticate via the cookie mechanism, 0 if not. Sets -# $r->connection->user to the username as a side effect. +# $r->user to the username as a side effect. sub check_cookie { my ($r) = @_; if ( my $user = Socialtext::Apache::User::current_user($r) ) { - $r->connection->user( $user->username ); + $r->user( $user->username ); return 1; } @@ -155,7 +155,7 @@ =head1 COPYRIGHT & LICENSE -Copyright 2006 Socialtext, Inc., all rights reserved. +Copyright 2006-2007 Socialtext, Inc., all rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Modified: branches/rug/lib/Socialtext/Apache/User.pm =================================================================== --- branches/rug/lib/Socialtext/Apache/User.pm 2007-01-30 23:07:33 UTC (rev 1004) +++ branches/rug/lib/Socialtext/Apache/User.pm 2007-02-01 16:50:12 UTC (rev 1005) @@ -46,7 +46,7 @@ return unless $name_or_id; - # XXX: user_id() can return things like $r->connection->user, which is + # XXX: user_id() can return things like $r->user, which is # not a valid id, so use username. This seems blech my $user; if ($name_or_id =~ /\D+/) { @@ -55,7 +55,7 @@ else { $user = Socialtext::User->new( user_id => $name_or_id ); } - $r->connection->user($user->username) unless $r->connection->user(); + $r->user( $user->username ) unless $r->user(); return $user; } @@ -65,15 +65,15 @@ my $always_check_apache = shift; if ( $ENV{SET_GENERIC_USER} ) { - $r->connection->user($ENV{SET_GENERIC_USER}); + $r->user( $ENV{SET_GENERIC_USER} ); return $ENV{SET_GENERIC_USER}; } # prefer user name set by basic auth or other mechanism (client # cert, for example) to cookie - return $r->connection->user + return $r->user if ($always_check_apache || Socialtext::AppConfig->check_apache_authen) - && $r->connection->user; + && $r->user; my %user_data = _get_cookie_value($r, COOKIE_NAME); Modified: branches/rug/lib/Socialtext/AuthzHandler.pm =================================================================== --- branches/rug/lib/Socialtext/AuthzHandler.pm 2007-01-30 23:07:33 UTC (rev 1004) +++ branches/rug/lib/Socialtext/AuthzHandler.pm 2007-02-01 16:50:12 UTC (rev 1005) @@ -18,17 +18,17 @@ sub handler ($$) { my $class = shift; - my $r = shift; + my $rug = shift; - my $requires = $r->requires; - my $user = $r->connection->user; - my $filename = $r->filename; + my $user = $rug->user; + my $filename = $rug->filename; st_log->debug( "checking authorization for $user : $filename" ); + my $requires = $rug->requires; return DECLINED unless $requires; - my $nlw = $class->get_cool_nlw($r); + my $nlw = $class->get_cool_nlw( $rug ); if( ! $nlw ) { st_log->error( "can't get nlw for $user - $filename" ); @@ -71,9 +71,9 @@ </body> </html> END - $r->custom_response( AUTH_REQUIRED, $explanation ); - $r->log_reason( "user $user: not authorized", $filename ); - $r->note_basic_auth_failure; + $rug->custom_response( AUTH_REQUIRED, $explanation ); + $rug->log_reason( "user $user: not authorized", $filename ); + $rug->note_basic_auth_failure; return AUTH_REQUIRED; } Modified: branches/rug/lib/Socialtext/Handler/REST.pm =================================================================== --- branches/rug/lib/Socialtext/Handler/REST.pm 2007-01-30 23:07:33 UTC (rev 1004) +++ branches/rug/lib/Socialtext/Handler/REST.pm 2007-02-01 16:50:12 UTC (rev 1005) @@ -182,8 +182,7 @@ sub _get_user { my $self = shift; - return Socialtext::User->new( - username => $self->request->connection->user ); + return Socialtext::User->new( username => $self->request->user ); } sub do_test { Modified: branches/rug/lib/Socialtext/Rug/MP1.pm =================================================================== --- branches/rug/lib/Socialtext/Rug/MP1.pm 2007-01-30 23:07:33 UTC (rev 1004) +++ branches/rug/lib/Socialtext/Rug/MP1.pm 2007-02-01 16:50:12 UTC (rev 1005) @@ -30,8 +30,6 @@ sub req { $_[0]->{_r} } -sub user { shift->req->connection()->user(@_) } - sub get_config { shift->req->dir_config->get(@_) } Modified: branches/rug/lib/Socialtext/Rug/MP2.pm =================================================================== --- branches/rug/lib/Socialtext/Rug/MP2.pm 2007-01-30 23:07:33 UTC (rev 1004) +++ branches/rug/lib/Socialtext/Rug/MP2.pm 2007-02-01 16:50:12 UTC (rev 1005) @@ -65,23 +65,28 @@ } sub err_header_out { - return shift->_recall( 'err_headers_out', @_ ); + my $self = shift; + return $self->_recall( 'err_headers_out', @_ ); } sub get_config { - return shift->dir_config->get( @_ ); + my $self = shift; + return $self->dir_config->get( @_ ); } sub header_in { - return shift->_recall( 'headers_in', @_ ); + my $self = shift; + return $self->_recall( 'headers_in', @_ ); } sub header_out { - return shift->_recall( 'headers_out', @_ ); + my $self = shift; + return $self->_recall( 'headers_out', @_ ); } sub log_error { - return shift->req->log_error( @_ ); + my $self = shift; + return $self->req->log_error( @_ ); } sub send_http_header { @@ -90,7 +95,8 @@ } sub user { - return shift->req->connection()->user( @_ ); + my $self = shift; + return $self->req->user( @_ ); } 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 23:07:41
|
Revision: 1004 http://svn.sourceforge.net/socialtext/?rev=1004&view=rev Author: petdance Date: 2007-01-30 15:07:33 -0800 (Tue, 30 Jan 2007) Log Message: ----------- Hoisted all the webapi lookups out of Socialtext::Rug into Socialtext::Build Modified Paths: -------------- branches/rug/etc/init.d/st-apache branches/rug/lib/Socialtext/Build.pm branches/rug/lib/Socialtext/Handler/Cleanup.pm branches/rug/lib/Socialtext/Rug/Constants.pm branches/rug/lib/Socialtext/Rug/Cookie.pm branches/rug/lib/Socialtext/Rug.pm Modified: branches/rug/etc/init.d/st-apache =================================================================== --- branches/rug/etc/init.d/st-apache 2007-01-30 22:36:19 UTC (rev 1003) +++ branches/rug/etc/init.d/st-apache 2007-01-30 23:07:33 UTC (rev 1004) @@ -15,8 +15,7 @@ ); # XXX Hoist into a module -my $webapi = get_build_setting( 'webapi' ); -my $short_name = $webapi eq 'mod_perl1' ? 'apache-perl' : 'apache2'; +my $short_name = Socialtext::Build::is_mod_perl1() ? 'apache-perl' : 'apache2'; Readonly my $PREFIX => get_build_setting( 'prefix' ); Readonly my $BINDIR => get_build_setting( 'bindir' ); Modified: branches/rug/lib/Socialtext/Build.pm =================================================================== --- branches/rug/lib/Socialtext/Build.pm 2007-01-30 22:36:19 UTC (rev 1003) +++ branches/rug/lib/Socialtext/Build.pm 2007-01-30 23:07:33 UTC (rev 1004) @@ -68,7 +68,25 @@ return ( scalar getpwnam( $user ), scalar getgrnam( $group ) ); } +=head2 webapi() +Returns the web API we're using, either mod_perl1 or mod_perl2. + +=head2 is_mod_perl1() + +Returns true if the user has configured mod_perl1. + +=head2 is_mod_perl2() + +Returns true if the user has configured mod_perl2. + +=cut + +sub webapi { return get_build_setting( 'webapi' ) } +sub is_mod_perl1 { return webapi() eq 'mod_perl1' } +sub is_mod_perl2 { return webapi() eq 'mod_perl2' } + + sub _load_defaults { my $defaults_pl = _defaults_pl(); if ($defaults_pl) { Modified: branches/rug/lib/Socialtext/Handler/Cleanup.pm =================================================================== --- branches/rug/lib/Socialtext/Handler/Cleanup.pm 2007-01-30 22:36:19 UTC (rev 1003) +++ branches/rug/lib/Socialtext/Handler/Cleanup.pm 2007-01-30 23:07:33 UTC (rev 1004) @@ -32,11 +32,9 @@ } # handler BEGIN { - my $webapi = get_build_setting( 'webapi' ); - # We want A::SL to be optional since it doesn't work on all # platforms, and isn't really criticial. - if ( $webapi eq 'mod_perl1' ) { + if ( Socialtext::Build::is_mod_perl1() ) { if ( eval { require Apache::SizeLimit; 1 } ) { # Why is this necessary? # @@ -74,7 +72,7 @@ die $@ unless $@ =~ m{\QCan't locate Apache/SizeLimit.pm}; } } # mod_perl1 - elsif ( $webapi eq 'mod_perl2' ) { + elsif ( Socialtext::Build::is_mod_perl2() ) { require Apache2::SizeLimit; $worker = sub { no warnings 'once'; @@ -86,7 +84,7 @@ } } # mod_perl2 else { - die qq{Unknown webapi "$webapi"}; + die 'Unknown web API'; } } # BEGIN Modified: branches/rug/lib/Socialtext/Rug/Constants.pm =================================================================== --- branches/rug/lib/Socialtext/Rug/Constants.pm 2007-01-30 22:36:19 UTC (rev 1003) +++ branches/rug/lib/Socialtext/Rug/Constants.pm 2007-01-30 23:07:33 UTC (rev 1004) @@ -10,21 +10,20 @@ use strict; use warnings; -use Socialtext::Rug; +use Socialtext::Build (); sub import { shift; - my $api = Socialtext::Rug->webapi; my $caller = (caller)[0]; - if ( $api eq 'mod_perl1' ) { + if ( Socialtext::Build::is_mod_perl1() ) { require Apache::Constants; eval "package $caller; use Apache::Constants qw( @_ )"; die $@ if $@; } - elsif ( $api eq 'mod_perl2' ) { + elsif ( Socialtext::Build::is_mod_perl2() ) { require Apache2::Const; my @imports = @_; @@ -36,7 +35,7 @@ die $@ if $@; } else { - die "Unknown API $api"; + die "Unknown API"; } } Modified: branches/rug/lib/Socialtext/Rug/Cookie.pm =================================================================== --- branches/rug/lib/Socialtext/Rug/Cookie.pm 2007-01-30 22:36:19 UTC (rev 1003) +++ branches/rug/lib/Socialtext/Rug/Cookie.pm 2007-01-30 23:07:33 UTC (rev 1004) @@ -18,17 +18,16 @@ our $CookieClass; BEGIN: { - my $api = Socialtext::Rug->webapi; - if ( $api eq 'mod_perl1' ) { + if ( Socialtext::Build::is_mod_perl1() ) { require Apache::Cookie; $CookieClass = 'Apache::Cookie'; } - elsif ( $api eq 'mod_perl2' ) { + elsif ( Socialtext::Build::is_mod_perl2() ) { require Apache2::Cookie; $CookieClass = 'Apache2::Cookie'; } else { - die "Unknown web API $api"; + die "Unknown web API"; } } @@ -51,7 +50,7 @@ sub fetch { shift; - if ( $api eq 'mod_perl1' ) { + if ( Socialtext::Build::is_mod_perl1() ) { shift; # Remove the unused $r passed in } Modified: branches/rug/lib/Socialtext/Rug.pm =================================================================== --- branches/rug/lib/Socialtext/Rug.pm 2007-01-30 22:36:19 UTC (rev 1003) +++ branches/rug/lib/Socialtext/Rug.pm 2007-01-30 23:07:33 UTC (rev 1004) @@ -13,21 +13,8 @@ use strict; use warnings; -use Socialtext::Build qw( get_build_setting ); use Socialtext::Validate qw( validate_pos APACHE_TYPE ); -=head1 FUNCTIONS - -=head2 webapi() - -Function that returns the API that we're using, either "mod_perl1" or "mod_perl2". - -=cut - -sub webapi { - return get_build_setting( 'webapi' ); -} - =head1 METHODS =head2 instance( [$r] ) @@ -54,10 +41,10 @@ sub _determine_subclass { my $class = shift; - if ( $class->webapi eq 'mod_perl1' ) { + if ( Socialtext::Build::is_mod_perl1() ) { return 'Socialtext::Rug::MP1'; } - elsif ( $class->webapi eq 'mod_perl2' ) { + elsif ( Socialtext::Build::is_mod_perl2() ) { return 'Socialtext::Rug::MP2'; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 22:36:49
|
Revision: 1003 http://svn.sourceforge.net/socialtext/?rev=1003&view=rev Author: petdance Date: 2007-01-30 14:36:19 -0800 (Tue, 30 Jan 2007) Log Message: ----------- Throw away $r under mod_perl1 for fetch() Modified Paths: -------------- branches/rug/lib/Socialtext/Rug/Cookie.pm Modified: branches/rug/lib/Socialtext/Rug/Cookie.pm =================================================================== --- branches/rug/lib/Socialtext/Rug/Cookie.pm 2007-01-30 22:32:07 UTC (rev 1002) +++ branches/rug/lib/Socialtext/Rug/Cookie.pm 2007-01-30 22:36:19 UTC (rev 1003) @@ -41,9 +41,20 @@ return $CookieClass->new( $req, @_ ); } +=head2 fetch($r, $cookie) + +We must have a request object passed in, although mod_perl1 doesn't +use it. If we're under mod_perl, we'll throw the $r away. + +=cut + sub fetch { shift; + if ( $api eq 'mod_perl1' ) { + shift; # Remove the unused $r passed in + } + return $CookieClass->fetch(@_); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 22:32:16
|
Revision: 1002 http://svn.sourceforge.net/socialtext/?rev=1002&view=rev Author: petdance Date: 2007-01-30 14:32:07 -0800 (Tue, 30 Jan 2007) Log Message: ----------- bake and fetch must have $r passed in Modified Paths: -------------- branches/rug/lib/Socialtext/Apache/User.pm Modified: branches/rug/lib/Socialtext/Apache/User.pm =================================================================== --- branches/rug/lib/Socialtext/Apache/User.pm 2007-01-30 22:23:00 UTC (rev 1001) +++ branches/rug/lib/Socialtext/Apache/User.pm 2007-01-30 22:32:07 UTC (rev 1002) @@ -75,7 +75,7 @@ if ($always_check_apache || Socialtext::AppConfig->check_apache_authen) && $r->connection->user; - my %user_data = _get_cookie_value(COOKIE_NAME); + my %user_data = _get_cookie_value($r, COOKIE_NAME); return unless keys %user_data; @@ -109,13 +109,14 @@ ( -domain => '.' . Socialtext::AppConfig->cookie_domain ) : () ), - )->bake; + )->bake($r); } sub _get_cookie_value { + my $r = shift; my $name = shift; - my $cookies = Socialtext::Rug::Cookie->fetch; + my $cookies = Socialtext::Rug::Cookie->fetch($r); return unless $cookies; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 22:23:10
|
Revision: 1001 http://svn.sourceforge.net/socialtext/?rev=1001&view=rev Author: petdance Date: 2007-01-30 14:23:00 -0800 (Tue, 30 Jan 2007) Log Message: ----------- Make sure we have a rug object for our cookie Modified Paths: -------------- branches/rug/lib/Socialtext/Rug/Cookie.pm Modified: branches/rug/lib/Socialtext/Rug/Cookie.pm =================================================================== --- branches/rug/lib/Socialtext/Rug/Cookie.pm 2007-01-30 22:03:49 UTC (rev 1000) +++ branches/rug/lib/Socialtext/Rug/Cookie.pm 2007-01-30 22:23:00 UTC (rev 1001) @@ -12,6 +12,8 @@ use strict; use warnings; +use Carp (); + use Socialtext::Rug; our $CookieClass; @@ -34,7 +36,9 @@ my $class = shift; my $rug = shift; - return $CookieClass->new( $rug->req, @_ ); + my $req = $rug->req or Carp::confess( 'Rug object has no request object' ); + + return $CookieClass->new( $req, @_ ); } sub fetch { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 22:03:50
|
Revision: 1000 http://svn.sourceforge.net/socialtext/?rev=1000&view=rev Author: petdance Date: 2007-01-30 14:03:49 -0800 (Tue, 30 Jan 2007) Log Message: ----------- Don't call content_type if there are no parms passed Modified Paths: -------------- branches/rug/lib/Socialtext/Rug/MP2.pm Modified: branches/rug/lib/Socialtext/Rug/MP2.pm =================================================================== --- branches/rug/lib/Socialtext/Rug/MP2.pm 2007-01-30 21:52:10 UTC (rev 999) +++ branches/rug/lib/Socialtext/Rug/MP2.pm 2007-01-30 22:03:49 UTC (rev 1000) @@ -85,7 +85,8 @@ } sub send_http_header { - return shift->req->content_type( @_ ); + my $self = shift; + $self->req->content_type( @_ ) if @_; } sub user { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 21:53:23
|
Revision: 999 http://svn.sourceforge.net/socialtext/?rev=999&view=rev Author: petdance Date: 2007-01-30 13:52:10 -0800 (Tue, 30 Jan 2007) Log Message: ----------- Bump up the mod_perl2 max size Modified Paths: -------------- branches/rug/build/templates/app/app.tt2 Modified: branches/rug/build/templates/app/app.tt2 =================================================================== --- branches/rug/build/templates/app/app.tt2 2007-01-30 21:17:20 UTC (rev 998) +++ branches/rug/build/templates/app/app.tt2 2007-01-30 21:52:10 UTC (rev 999) @@ -37,10 +37,10 @@ [% END %] [% IF config.apache_status %] - # Optionally load B::TerseSize for Apache::Status to use - <Perl> - eval { require B::TerseSize }; - </Perl> + PerlModule B::TerseSize + [% IF config.webapi == 'mod_perl2' %] + PerlModule Devel::Symdump + [% END %] # Status handlers <Location /status> SetHandler server-status @@ -227,8 +227,14 @@ # determine the shared memory size for your platform. # This sets the maximum amount of unshared memory the process can use. +[% IF config.webapi == 'mod_perl1' %] PerlSetVar st_max_unshared_size 200000 +[% END %] +[% IF config.webapi == 'mod_perl2' %] +PerlSetVar st_max_unshared_size 300000 +[% END %] + # This sets the minimum amount of shared memory the process must have. # PerlSetVar st_min_shared_size 70000 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 21:17:35
|
Revision: 998 http://svn.sourceforge.net/socialtext/?rev=998&view=rev Author: petdance Date: 2007-01-30 13:17:20 -0800 (Tue, 30 Jan 2007) Log Message: ----------- apache_object is now req Modified Paths: -------------- branches/rug/lib/Socialtext/Rug/Cookie.pm branches/rug/lib/Socialtext/WebApp.pm Modified: branches/rug/lib/Socialtext/Rug/Cookie.pm =================================================================== --- branches/rug/lib/Socialtext/Rug/Cookie.pm 2007-01-30 20:19:50 UTC (rev 997) +++ branches/rug/lib/Socialtext/Rug/Cookie.pm 2007-01-30 21:17:20 UTC (rev 998) @@ -34,7 +34,7 @@ my $class = shift; my $rug = shift; - return $CookieClass->new( $rug->apache_object(), @_ ); + return $CookieClass->new( $rug->req, @_ ); } sub fetch { Modified: branches/rug/lib/Socialtext/WebApp.pm =================================================================== --- branches/rug/lib/Socialtext/WebApp.pm 2007-01-30 20:19:50 UTC (rev 997) +++ branches/rug/lib/Socialtext/WebApp.pm 2007-01-30 21:17:20 UTC (rev 998) @@ -57,7 +57,7 @@ # MasonX::WebApp should be changed so that the apache_req param # can be an ST::Rug object. Right now it checks the class of the # parameter, but it should just check for the methods it needs. - my $self = $class->SUPER::new( apache_req => $rug->apache_object, @_ ); + my $self = $class->SUPER::new( apache_req => $rug->req, @_ ); return $self; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 20:19:52
|
Revision: 997 http://svn.sourceforge.net/socialtext/?rev=997&view=rev Author: petdance Date: 2007-01-30 12:19:50 -0800 (Tue, 30 Jan 2007) Log Message: ----------- Has to load APR::URI Modified Paths: -------------- branches/rug/lib/Socialtext/Rug/MP2.pm Modified: branches/rug/lib/Socialtext/Rug/MP2.pm =================================================================== --- branches/rug/lib/Socialtext/Rug/MP2.pm 2007-01-30 20:19:13 UTC (rev 996) +++ branches/rug/lib/Socialtext/Rug/MP2.pm 2007-01-30 20:19:50 UTC (rev 997) @@ -11,6 +11,7 @@ use mod_perl 2.0; use Apache2::URI (); +use APR::URI (); use Apache2::Request (); use Apache2::RequestUtil (); use ModPerl::Util (); @@ -35,8 +36,7 @@ =head2 $rug->req() -Returns the Apache::Request object for this Rug object. Should only be -use internally. +Returns the Apache::Request object for this Rug object. =cut This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 20:19:24
|
Revision: 996 http://svn.sourceforge.net/socialtext/?rev=996&view=rev Author: petdance Date: 2007-01-30 12:19:13 -0800 (Tue, 30 Jan 2007) Log Message: ----------- Added stop/start targets Modified Paths: -------------- branches/rug/build/Makefile.in Modified: branches/rug/build/Makefile.in =================================================================== --- branches/rug/build/Makefile.in 2007-01-30 19:29:00 UTC (rev 995) +++ branches/rug/build/Makefile.in 2007-01-30 20:19:13 UTC (rev 996) @@ -357,6 +357,12 @@ -profile build/perlcriticrc \ lib/ t/ bin/ +stop: + sudo /etc/init.d/st-apache stop + +start: + sudo /etc/init.d/st-apache start + # `make` assumes targets are files. .PHONY declares targets that are not. .PHONY: default \ dev \ @@ -402,6 +408,8 @@ realclean \ wipe \ uninstall \ + stop \ + start \ cpan \ check-deps \ check-dependencies \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 19:29:26
|
Revision: 995 http://svn.sourceforge.net/socialtext/?rev=995&view=rev Author: petdance Date: 2007-01-30 11:29:00 -0800 (Tue, 30 Jan 2007) Log Message: ----------- Load the subclass riht Modified Paths: -------------- branches/rug/lib/Socialtext/Rug.pm Modified: branches/rug/lib/Socialtext/Rug.pm =================================================================== --- branches/rug/lib/Socialtext/Rug.pm 2007-01-30 18:54:54 UTC (rev 994) +++ branches/rug/lib/Socialtext/Rug.pm 2007-01-30 19:29:00 UTC (rev 995) @@ -43,8 +43,10 @@ my $subclass = $class->_determine_subclass(); - require $subclass - unless $subclass->can('_new'); + if ( ! $subclass->can( '_new' ) ) { + eval "use $subclass"; + die $@ if $@; + } return $subclass->_new($r); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 18:55:29
|
Revision: 994 http://svn.sourceforge.net/socialtext/?rev=994&view=rev Author: petdance Date: 2007-01-30 10:54:54 -0800 (Tue, 30 Jan 2007) Log Message: ----------- webapi has to be passed thru to gen-config Modified Paths: -------------- branches/rug/dev-bin/gen-config branches/rug/lib/Test/Socialtext/Fixture.pm Modified: branches/rug/dev-bin/gen-config =================================================================== --- branches/rug/dev-bin/gen-config 2007-01-30 07:07:05 UTC (rev 993) +++ branches/rug/dev-bin/gen-config 2007-01-30 18:54:54 UTC (rev 994) @@ -57,6 +57,7 @@ 'apache2-moduledir' => 's', 'apache-perl-moduledir' => 's', 'dev' => 'i', + 'webapi' => 's', ); while ( my ($keyword,$type) = each %passthru ) { Modified: branches/rug/lib/Test/Socialtext/Fixture.pm =================================================================== --- branches/rug/lib/Test/Socialtext/Fixture.pm 2007-01-30 07:07:05 UTC (rev 993) +++ branches/rug/lib/Test/Socialtext/Fixture.pm 2007-01-30 18:54:54 UTC (rev 994) @@ -72,7 +72,7 @@ my $env = $self->env; - my @passthru_settings = qw( socialtext-open apache-proxy ); + my @passthru_settings = qw( socialtext-open apache-proxy webapi ); my @passthru_args = map { ("--$_" => get_build_setting($_)) } @passthru_settings; my @configure_settings = qw( support-address server-admin hostname url ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 07:07:08
|
Revision: 993 http://svn.sourceforge.net/socialtext/?rev=993&view=rev Author: petdance Date: 2007-01-29 23:07:05 -0800 (Mon, 29 Jan 2007) Log Message: ----------- Moved the WebHelpers subclass into WebHelpers.pm. They shoudl eventually become part of the rug Modified Paths: -------------- branches/rug/lib/Socialtext/Handler/WSDL.pm branches/rug/lib/Socialtext/WebHelpers.pm Removed Paths: ------------- branches/rug/lib/Socialtext/WebHelpers/ branches/rug/t/Socialtext/WebHelpers/ Modified: branches/rug/lib/Socialtext/Handler/WSDL.pm =================================================================== --- branches/rug/lib/Socialtext/Handler/WSDL.pm 2007-01-30 06:53:17 UTC (rev 992) +++ branches/rug/lib/Socialtext/Handler/WSDL.pm 2007-01-30 07:07:05 UTC (rev 993) @@ -7,7 +7,7 @@ use File::Spec::Functions qw(catfile); use Socialtext::AppConfig; use Socialtext::URI; -use Socialtext::WebHelpers::Rug (); +use Socialtext::WebHelpers (); sub handler ($$) { my ( $class, $r ) = @_; @@ -21,7 +21,7 @@ my $wsdl = eval { slurp($file) }; return NOT_FOUND unless defined $wsdl; - my $soap_server = Socialtext::WebHelpers::Rug->base_uri(); + my $soap_server = Socialtext::WebHelpers->base_uri(); $soap_server .= "/soap/$ver/"; $wsdl =~ s/\@SOAP_SERVER\@/$soap_server/g; @@ -34,7 +34,7 @@ =head1 NAME -Socialtext::Handler::WSDL - Generate WSDL files for SOAP. +Socialtext::Handler::WSDL -- Generate WSDL files for SOAP =head1 DESCRIPTION Modified: branches/rug/lib/Socialtext/WebHelpers.pm =================================================================== --- branches/rug/lib/Socialtext/WebHelpers.pm 2007-01-30 06:53:17 UTC (rev 992) +++ branches/rug/lib/Socialtext/WebHelpers.pm 2007-01-30 07:07:05 UTC (rev 993) @@ -6,19 +6,13 @@ use Socialtext::String; use URI::Escape (); +use Carp (); +use Socialtext::Rug (); + my $SupportClass; my %Roles; BEGIN { - $SupportClass = - ( ( $ENV{MOD_PERL} && eval { require Apache::Request } and not $@ ) - ? 'Socialtext::WebHelpers::Rug' - : 'Socialtext::WebHelpers::CGIpm' - ); - - eval "require $SupportClass"; - die $@ if $@; - %Roles = ( base => [ qw( uri_escape @@ -31,8 +25,6 @@ redirect print set_all - _get - _value ) ], cgi => [ qw( rug @@ -63,7 +55,7 @@ for my $meth ( @{ $Roles{$role} } ) { next if $exported{$meth}; - my $class = __PACKAGE__->can($meth) ? __PACKAGE__: $SupportClass; + my $class = __PACKAGE__->can($meth) ? __PACKAGE__ : die "I can't $meth"; { no strict 'refs'; *{"$caller\::$meth"} = \&{"$class\::$meth"}; @@ -99,5 +91,134 @@ } +sub rug { + my $self = shift; + + return $self->{rug} ||= Socialtext::Rug->instance; +} + +# Headers role +sub print { + my $self = shift; + my $content_type = $self->content_type; + + $content_type .= '; charset=' . $self->charset + if $content_type =~ /^text/; + $self->rug->content_type($content_type); + + for my $header ('Expires', 'Pragma', 'Cache-control', 'Last-modified') { + my $method = lc($header); + $method =~ tr/-/_/; + my $value = $self->$method; + $self->rug->header_out($header => $value) if defined $value; + } + $self->rug->send_http_header; +} + +sub redirect { + my $self = shift; + if (@_) { + $self->rug->header_out(Location => shift); + $self->rug->status(302); + } + return $self->rug->header_out('Location'); +} + +sub set_all { + my $self = shift; + my %h = @_; + + $self->rug->header_out($_ => $h{$_}) for keys %h; +} + +# CGI role +sub defined { + my $self = shift; + my $param = shift; + defined $self->rug->param($param); +} + +sub names { + my $self = shift; + $self->rug->param; +} + +sub full_uri { + my $self = shift; + my $uri = $self->_full_uri; + + $uri->query(undef); + + return $uri->unparse; +} + +sub base_uri { + my $self = shift; + my $uri = $self->_full_uri; + + $uri->query(undef); + $uri->path(undef); + + return $uri->unparse; +} + +sub full_uri_with_query { + my $self = shift; + return $self->_full_uri->unparse; +} + +sub _full_uri { + my $self = shift; + my $uri = $self->rug->parsed_uri; + + $uri->hostname($self->rug->hostname); + + my $xfh = $self->rug->header_in('X-Forwarded-Host'); + if ( $xfh && ($xfh =~ /:(\d+)$/) ) { + my $front_end_port = $1; + if ( $front_end_port + && ($front_end_port != 80) && ($front_end_port != 443) ) { + $uri->port($front_end_port); + } + } + $uri->scheme( $self->rug->get_config('NLWHTTPSRedirect') ? 'https' : 'http' ); + + return $uri; +} + +sub query_string { + my $self = shift; + $self->rug->args +} + +sub path_info { + my $self = shift; + $self->rug->path_info +} + +sub _get_cgi_param { + Carp::cluck( '_get_cgi_param called with undef as first param' ) + unless defined $_[1]; + my $self = shift; $self->rug->param(shift) } + +sub _get_upload { + my $self = shift; + my $name = shift; + + my @handles = $self->rug->upload($name) or return; + my @uploads = (); + foreach my $handle (@handles) { + push @uploads, + { + handle => $handle->fh, + filename => $handle->filename, + %{$handle->info}, + }; + } + + return @uploads if wantarray; + return $uploads[0]; +} + 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 06:53:20
|
Revision: 992 http://svn.sourceforge.net/socialtext/?rev=992&view=rev Author: petdance Date: 2007-01-29 22:53:17 -0800 (Mon, 29 Jan 2007) Log Message: ----------- Nobody uses the CGIpm webhelpers Removed Paths: ------------- branches/rug/lib/Socialtext/WebHelpers/CGIpm.pm branches/rug/t/Socialtext/WebHelpers/CGIpm.t Deleted: branches/rug/lib/Socialtext/WebHelpers/CGIpm.pm =================================================================== --- branches/rug/lib/Socialtext/WebHelpers/CGIpm.pm 2007-01-30 06:47:36 UTC (rev 991) +++ branches/rug/lib/Socialtext/WebHelpers/CGIpm.pm 2007-01-30 06:53:17 UTC (rev 992) @@ -1,96 +0,0 @@ -# @COPYRIGHT@ -package Socialtext::WebHelpers::CGIpm; -use strict; -use warnings; - -use Class::Field qw(field); - -use CGI; -use CGI::Util; -use Socialtext::String; - -# Headers role -field redirect => ''; - -sub print { - my $self = shift; - my $headers = $self->_get; - $self->utf8_encode($headers); - print $headers; -} - -sub _get { - my $self = shift; - $self->redirect - ? CGI::redirect($self->redirect) - : CGI::header($self->_value); -} - -# Inherited from Socialtext - not yet used outside of NLW code or tested -sub set_all { - my $self = shift; - my %h = @_; - - for my $k (keys %h) { - $self->{extra}{$k} = $h{$k}; - } -} - -sub _value { - my $self = shift; - ( - -charset => $self->charset, - -type => $self->content_type, - -expires => $self->expires, - -pragma => $self->pragma, - -cache_control => $self->cache_control, - -last_modified => $self->last_modified, - %{$self->{extra} || {}}, - ); -} - -# CGI role -sub defined { - my $self = shift; - my $param = shift; - defined CGI::param($param) or defined CGI::url_param($param); -} - -sub names { - my $self = shift; - my %h = CGI::Vars(); - return keys %h; -} - -sub full_uri { - my $self = shift; CGI::url(-full => 1) } - -sub full_uri_with_query { - my $self = shift; CGI::url(-full => 1, -query => 1) } - -sub query_string { - my $self = shift; CGI::query_string() } - -sub path_info { - my $self = shift; CGI::path_info() } - -sub _get_cgi_param { - my $self = shift; - my $field = shift; - - return - defined CGI::param($field) - ? CGI::param($field) - : CGI::url_param($field); -} - -sub _get_upload { - my $self = shift; - - my $handle = CGI::upload($_[0]) - or return; - {handle => $handle, filename => $handle, %{CGI::uploadInfo($handle) || {}}}; -} - -1; - Deleted: branches/rug/t/Socialtext/WebHelpers/CGIpm.t =================================================================== --- branches/rug/t/Socialtext/WebHelpers/CGIpm.t 2007-01-30 06:47:36 UTC (rev 991) +++ branches/rug/t/Socialtext/WebHelpers/CGIpm.t 2007-01-30 06:53:17 UTC (rev 992) @@ -1,11 +0,0 @@ -#!perl -Tw -# @COPYRIGHT@ - -use strict; -use warnings; - -use Test::More tests => 1; - -BEGIN { - use_ok( 'Socialtext::WebHelpers::CGIpm' ); -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 06:47:37
|
Revision: 991 http://svn.sourceforge.net/socialtext/?rev=991&view=rev Author: petdance Date: 2007-01-29 22:47:36 -0800 (Mon, 29 Jan 2007) Log Message: ----------- Added description of no_cache Modified Paths: -------------- branches/rug/lib/Socialtext/MasonHandler.pm branches/rug/lib/Socialtext/Rug.pm Modified: branches/rug/lib/Socialtext/MasonHandler.pm =================================================================== --- branches/rug/lib/Socialtext/MasonHandler.pm 2007-01-30 06:47:05 UTC (rev 990) +++ branches/rug/lib/Socialtext/MasonHandler.pm 2007-01-30 06:47:36 UTC (rev 991) @@ -6,7 +6,7 @@ use Socialtext::Rug::Constants qw( OK REDIRECT SERVER_ERROR ); use Socialtext::AppConfig; -use Socialtext::Rug; +use Socialtext::Rug (); use Socialtext::WebApp; use Socialtext::FillInFormBridge; Modified: branches/rug/lib/Socialtext/Rug.pm =================================================================== --- branches/rug/lib/Socialtext/Rug.pm 2007-01-30 06:47:05 UTC (rev 990) +++ branches/rug/lib/Socialtext/Rug.pm 2007-01-30 06:47:36 UTC (rev 991) @@ -188,6 +188,13 @@ Passing an argument will set the method, mainly used for internal redirects. +=head2 $rug->no_cache( $boolean ) + +This is a flag that indicates that the data being returned is volatile +and the client should be told not to cache it. C<< $rug->no_cache(1) >> +adds the headers "Pragma: no-cache" and "Cache-control: no-cache" to +the reponse, therefore it must be called before C<< $r->send_http_header >>. + =head2 $rug->note_basic_auth_failure() Prior to requiring Basic authentication from the client, this method This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 06:47:10
|
Revision: 990 http://svn.sourceforge.net/socialtext/?rev=990&view=rev Author: petdance Date: 2007-01-29 22:47:05 -0800 (Mon, 29 Jan 2007) Log Message: ----------- Class this is testing no longer exists Removed Paths: ------------- branches/rug/t/Socialtext/WebHelpers/Apache.t Deleted: branches/rug/t/Socialtext/WebHelpers/Apache.t =================================================================== --- branches/rug/t/Socialtext/WebHelpers/Apache.t 2007-01-30 06:37:38 UTC (rev 989) +++ branches/rug/t/Socialtext/WebHelpers/Apache.t 2007-01-30 06:47:05 UTC (rev 990) @@ -1,11 +0,0 @@ -#!perl -Tw -# @COPYRIGHT@ - -use strict; -use warnings; - -use Test::More tests => 1; - -BEGIN { - use_ok( 'Socialtext::WebHelpers::Apache' ); -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 06:37:41
|
Revision: 989 http://svn.sourceforge.net/socialtext/?rev=989&view=rev Author: petdance Date: 2007-01-29 22:37:38 -0800 (Mon, 29 Jan 2007) Log Message: ----------- Use the new Socialtext::WebHelpers::Rug Modified Paths: -------------- branches/rug/lib/Socialtext/Handler/WSDL.pm Modified: branches/rug/lib/Socialtext/Handler/WSDL.pm =================================================================== --- branches/rug/lib/Socialtext/Handler/WSDL.pm 2007-01-30 05:36:35 UTC (rev 988) +++ branches/rug/lib/Socialtext/Handler/WSDL.pm 2007-01-30 06:37:38 UTC (rev 989) @@ -7,6 +7,7 @@ use File::Spec::Functions qw(catfile); use Socialtext::AppConfig; use Socialtext::URI; +use Socialtext::WebHelpers::Rug (); sub handler ($$) { my ( $class, $r ) = @_; @@ -20,7 +21,7 @@ my $wsdl = eval { slurp($file) }; return NOT_FOUND unless defined $wsdl; - my $soap_server = Socialtext::WebHelpers::Apache->base_uri(); + my $soap_server = Socialtext::WebHelpers::Rug->base_uri(); $soap_server .= "/soap/$ver/"; $wsdl =~ s/\@SOAP_SERVER\@/$soap_server/g; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 05:36:37
|
Revision: 988 http://svn.sourceforge.net/socialtext/?rev=988&view=rev Author: petdance Date: 2007-01-29 21:36:35 -0800 (Mon, 29 Jan 2007) Log Message: ----------- Get the magic settings from Socialtext::Build Modified Paths: -------------- branches/rug/etc/init.d/st-apache Modified: branches/rug/etc/init.d/st-apache =================================================================== --- branches/rug/etc/init.d/st-apache 2007-01-30 02:47:59 UTC (rev 987) +++ branches/rug/etc/init.d/st-apache 2007-01-30 05:36:35 UTC (rev 988) @@ -18,12 +18,17 @@ my $webapi = get_build_setting( 'webapi' ); my $short_name = $webapi eq 'mod_perl1' ? 'apache-perl' : 'apache2'; +Readonly my $PREFIX => get_build_setting( 'prefix' ); +Readonly my $BINDIR => get_build_setting( 'bindir' ); +Readonly my $HTTPD => get_build_setting( 'httpd' ); +Readonly my $HTTPD_CONFDIR => get_build_setting( 'httpd_confdir' ); +Readonly my $HTTPD_PIDDIR => get_build_setting( 'httpd_piddir' ); +Readonly my $PERL => get_build_setting( 'perl' ); + Readonly my $NAME => 'st-apache'; -Readonly my $CONF => '@PREFIX@@HTTPD_CONFDIR@/st-httpd.conf'; -Readonly my $DAEMON => '@HTTPD@'; -Readonly my @COMMAND => ($DAEMON, '-f', $CONF); -Readonly my $PIDFILE => "@PREFIX@@HTTPD_PIDDIR@/$short_name.pid"; -Readonly my $PERL => '@PERL@'; +Readonly my $CONF => "$PREFIX$HTTPD_CONFDIR/st-httpd.conf"; +Readonly my @COMMAND => ($HTTPD, '-f', $CONF); +Readonly my $PIDFILE => "$PREFIX$HTTPD_PIDDIR/st-$short_name.pid"; Readonly my $USER => 'root'; $ENV{LANG} = 'C'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 02:48:01
|
Revision: 987 http://svn.sourceforge.net/socialtext/?rev=987&view=rev Author: petdance Date: 2007-01-29 18:47:59 -0800 (Mon, 29 Jan 2007) Log Message: ----------- now uses Socialtext::Build for its build settings Modified Paths: -------------- branches/rug/etc/init.d/ceqlotron Modified: branches/rug/etc/init.d/ceqlotron =================================================================== --- branches/rug/etc/init.d/ceqlotron 2007-01-30 02:39:12 UTC (rev 986) +++ branches/rug/etc/init.d/ceqlotron 2007-01-30 02:47:59 UTC (rev 987) @@ -1,8 +1,8 @@ #!/usr/bin/perl # @COPYRIGHT@ -# -# ceqlotron Start/stop Socialtext ceqlotron daemon. +# /etc/init.d/ceqlotron Start/stop Socialtext ceqlotron daemon. + use warnings; use strict; @@ -12,14 +12,20 @@ fork_and_exec_daemon_as_user system_or_die try_kill timeout_waitpid succeed fail restart assert_absolute_paths ); +use Socialtext::Build qw( get_build_setting ); -Readonly my $NAME => 'ceqlotron'; -Readonly my $CEQLOTRON => '@PREFIX@@BINDIR@/ceqlotron'; -Readonly my $PIDFILE => '@PREFIX@@PIDDIR@/ceqlotron.pid'; -Readonly my $LOGFILE => '@PREFIX@@CEQLOTRON_LOGFILE@'; -Readonly my $USER => '@ST_USER@'; -Readonly my @CEQ_START => ( $CEQLOTRON, "--output=$LOGFILE" ); +Readonly my $PREFIX => get_build_setting( 'prefix' ); +Readonly my $BINDIR => get_build_setting( 'bindir' ); +Readonly my $PIDDIR => get_build_setting( 'piddir' ); +Readonly my $USER => get_build_setting( 'st-user' ); +Readonly my $CEQLOTRON_LOGFILE => get_build_setting( 'ceqlotron-logfile' ); +Readonly my $NAME => 'ceqlotron'; +Readonly my $CEQLOTRON => "$PREFIX$BINDIR/ceqlotron"; +Readonly my $PIDFILE => "$PREFIX$PIDDIR/ceqlotron.pid"; +Readonly my $LOGFILE => "$PREFIX$CEQLOTRON_LOGFILE"; +Readonly my @CEQ_START => ( $CEQLOTRON, "--output=$LOGFILE" ); + assert_absolute_paths( 'ceqltron' => $CEQLOTRON, 'PID file' => $PIDFILE, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 02:39:14
|
Revision: 986 http://svn.sourceforge.net/socialtext/?rev=986&view=rev Author: petdance Date: 2007-01-29 18:39:12 -0800 (Mon, 29 Jan 2007) Log Message: ----------- No need to generate the etc/init.d scripts from .in any more Added Paths: ----------- branches/rug/etc/init.d/ceqlotron branches/rug/etc/init.d/st-apache Removed Paths: ------------- branches/rug/etc/init.d/ceqlotron.in branches/rug/etc/init.d/st-apache.in Copied: branches/rug/etc/init.d/ceqlotron (from rev 971, branches/rug/etc/init.d/ceqlotron.in) =================================================================== --- branches/rug/etc/init.d/ceqlotron (rev 0) +++ branches/rug/etc/init.d/ceqlotron 2007-01-30 02:39:12 UTC (rev 986) @@ -0,0 +1,60 @@ +#!/usr/bin/perl +# @COPYRIGHT@ +# +# ceqlotron Start/stop Socialtext ceqlotron daemon. + +use warnings; +use strict; + +use Carp 'croak'; +use Readonly; +use Socialtext::InitFunctions qw( + fork_and_exec_daemon_as_user system_or_die try_kill timeout_waitpid + succeed fail restart assert_absolute_paths +); + +Readonly my $NAME => 'ceqlotron'; +Readonly my $CEQLOTRON => '@PREFIX@@BINDIR@/ceqlotron'; +Readonly my $PIDFILE => '@PREFIX@@PIDDIR@/ceqlotron.pid'; +Readonly my $LOGFILE => '@PREFIX@@CEQLOTRON_LOGFILE@'; +Readonly my $USER => '@ST_USER@'; +Readonly my @CEQ_START => ( $CEQLOTRON, "--output=$LOGFILE" ); + +assert_absolute_paths( + 'ceqltron' => $CEQLOTRON, + 'PID file' => $PIDFILE, + 'path file' => $LOGFILE, +); + +my ( $uid, $gid ) = ( getpwnam $USER )[ 2, 3 ] or die "getwpnam $USER: $!"; + +$| = 1; + +my $operation = shift || ''; +if ( $operation eq 'start' ) { + print "Starting $NAME... "; + system_or_die( 'touch', $LOGFILE ); + chown $uid, $gid, $LOGFILE or die "chown $uid $gid $LOGFILE: $!\n"; + + if ((my $code = fork_and_exec_daemon_as_user( $USER, @CEQ_START )) == 0) { + succeed 'done.'; + } else { + fail "nonzero exit: $code."; + } +} +elsif ( $operation eq 'stop' ) { + print "Stopping $NAME... "; + fail "$PIDFILE does not exist." unless -f $PIDFILE; + chomp( my $pid = `cat $PIDFILE` ); + try_kill( 'TERM', $pid ) or fail 'already stopped.'; + while ( !timeout_waitpid( $pid, 60 ) ) { + try_kill( 'INT', $pid ) or succeed 'done.'; + } + succeed 'done.'; +} +elsif ( $operation eq 'restart' ) { + restart(); +} +else { + fail "Usage: $0 {start|stop|restart}"; +} Deleted: branches/rug/etc/init.d/ceqlotron.in =================================================================== --- branches/rug/etc/init.d/ceqlotron.in 2007-01-30 02:36:07 UTC (rev 985) +++ branches/rug/etc/init.d/ceqlotron.in 2007-01-30 02:39:12 UTC (rev 986) @@ -1,60 +0,0 @@ -#!/usr/bin/perl -# @COPYRIGHT@ -# -# ceqlotron Start/stop Socialtext ceqlotron daemon. - -use warnings; -use strict; - -use Carp 'croak'; -use Readonly; -use Socialtext::InitFunctions qw( - fork_and_exec_daemon_as_user system_or_die try_kill timeout_waitpid - succeed fail restart assert_absolute_paths -); - -Readonly my $NAME => 'ceqlotron'; -Readonly my $CEQLOTRON => '@PREFIX@@BINDIR@/ceqlotron'; -Readonly my $PIDFILE => '@PREFIX@@PIDDIR@/ceqlotron.pid'; -Readonly my $LOGFILE => '@PREFIX@@CEQLOTRON_LOGFILE@'; -Readonly my $USER => '@ST_USER@'; -Readonly my @CEQ_START => ( $CEQLOTRON, "--output=$LOGFILE" ); - -assert_absolute_paths( - 'ceqltron' => $CEQLOTRON, - 'PID file' => $PIDFILE, - 'path file' => $LOGFILE, -); - -my ( $uid, $gid ) = ( getpwnam $USER )[ 2, 3 ] or die "getwpnam $USER: $!"; - -$| = 1; - -my $operation = shift || ''; -if ( $operation eq 'start' ) { - print "Starting $NAME... "; - system_or_die( 'touch', $LOGFILE ); - chown $uid, $gid, $LOGFILE or die "chown $uid $gid $LOGFILE: $!\n"; - - if ((my $code = fork_and_exec_daemon_as_user( $USER, @CEQ_START )) == 0) { - succeed 'done.'; - } else { - fail "nonzero exit: $code."; - } -} -elsif ( $operation eq 'stop' ) { - print "Stopping $NAME... "; - fail "$PIDFILE does not exist." unless -f $PIDFILE; - chomp( my $pid = `cat $PIDFILE` ); - try_kill( 'TERM', $pid ) or fail 'already stopped.'; - while ( !timeout_waitpid( $pid, 60 ) ) { - try_kill( 'INT', $pid ) or succeed 'done.'; - } - succeed 'done.'; -} -elsif ( $operation eq 'restart' ) { - restart(); -} -else { - fail "Usage: $0 {start|stop|restart}"; -} Copied: branches/rug/etc/init.d/st-apache (from rev 985, branches/rug/etc/init.d/st-apache.in) =================================================================== --- branches/rug/etc/init.d/st-apache (rev 0) +++ branches/rug/etc/init.d/st-apache 2007-01-30 02:39:12 UTC (rev 986) @@ -0,0 +1,70 @@ +#!/usr/bin/perl +# @COPYRIGHT@ +# +# st-apache Start the Apache HTTP server with Socialtext configuration. + +use warnings; +use strict; + +use Carp 'croak'; +use Readonly; +use Socialtext::Build qw( get_build_setting ); +use Socialtext::InitFunctions qw( + fork_and_exec_daemon_as_user system_or_die try_kill timeout_waitpid + succeed fail restart +); + +# XXX Hoist into a module +my $webapi = get_build_setting( 'webapi' ); +my $short_name = $webapi eq 'mod_perl1' ? 'apache-perl' : 'apache2'; + +Readonly my $NAME => 'st-apache'; +Readonly my $CONF => '@PREFIX@@HTTPD_CONFDIR@/st-httpd.conf'; +Readonly my $DAEMON => '@HTTPD@'; +Readonly my @COMMAND => ($DAEMON, '-f', $CONF); +Readonly my $PIDFILE => "@PREFIX@@HTTPD_PIDDIR@/$short_name.pid"; +Readonly my $PERL => '@PERL@'; +Readonly my $USER => 'root'; + +$ENV{LANG} = 'C'; +$ENV{PATH} = '/sbin:/bin:/usr/bin:/usr/local/bin'; + +my $operation = shift || ''; +if ($operation eq 'start') { + print "Starting $NAME web server... "; + if ((my $code = fork_and_exec_daemon_as_user( $USER, @COMMAND )) == 0) { + succeed 'done.'; + } + else { + fail "nonzero exit: $code."; + } +} +elsif ($operation eq 'stop') { + print "Stopping $NAME web server... "; + my $pid = get_pid(); + try_kill( 15, $pid ) or fail 'already stopped.'; + if (timeout_waitpid($pid, 300)) { + succeed 'done.'; + } + else { + fail 'timed out waiting for exit.'; + } +} +elsif ($operation eq 'restart') { + restart(); +} +elsif ($operation =~ /^(?:force-)?reload$/) { + print "Signalling $NAME to reload..."; + my $pid = get_pid(); + try_kill("USR1", $pid) or fail 'no running process.'; + succeed 'done.'; +} +else { + fail "Usage: $0 {start|stop|restart}"; +} + +sub get_pid { + fail "$PIDFILE does not exist." unless -f $PIDFILE; + chomp( my $pid = `cat $PIDFILE` ); + return $pid; +} Deleted: branches/rug/etc/init.d/st-apache.in =================================================================== --- branches/rug/etc/init.d/st-apache.in 2007-01-30 02:36:07 UTC (rev 985) +++ branches/rug/etc/init.d/st-apache.in 2007-01-30 02:39:12 UTC (rev 986) @@ -1,70 +0,0 @@ -#!/usr/bin/perl -# @COPYRIGHT@ -# -# st-apache Start the Apache HTTP server with Socialtext configuration. - -use warnings; -use strict; - -use Carp 'croak'; -use Readonly; -use Socialtext::Build qw( get_build_setting ); -use Socialtext::InitFunctions qw( - fork_and_exec_daemon_as_user system_or_die try_kill timeout_waitpid - succeed fail restart -); - -# XXX Hoist into a module -my $webapi = get_build_setting( 'webapi' ); -my $short_name = $webapi eq 'mod_perl1' ? 'apache-perl' : 'apache2'; - -Readonly my $NAME => 'st-apache'; -Readonly my $CONF => '@PREFIX@@HTTPD_CONFDIR@/st-httpd.conf'; -Readonly my $DAEMON => '@HTTPD@'; -Readonly my @COMMAND => ($DAEMON, '-f', $CONF); -Readonly my $PIDFILE => "@PREFIX@@HTTPD_PIDDIR@/$short_name.pid"; -Readonly my $PERL => '@PERL@'; -Readonly my $USER => 'root'; - -$ENV{LANG} = 'C'; -$ENV{PATH} = '/sbin:/bin:/usr/bin:/usr/local/bin'; - -my $operation = shift || ''; -if ($operation eq 'start') { - print "Starting $NAME web server... "; - if ((my $code = fork_and_exec_daemon_as_user( $USER, @COMMAND )) == 0) { - succeed 'done.'; - } - else { - fail "nonzero exit: $code."; - } -} -elsif ($operation eq 'stop') { - print "Stopping $NAME web server... "; - my $pid = get_pid(); - try_kill( 15, $pid ) or fail 'already stopped.'; - if (timeout_waitpid($pid, 300)) { - succeed 'done.'; - } - else { - fail 'timed out waiting for exit.'; - } -} -elsif ($operation eq 'restart') { - restart(); -} -elsif ($operation =~ /^(?:force-)?reload$/) { - print "Signalling $NAME to reload..."; - my $pid = get_pid(); - try_kill("USR1", $pid) or fail 'no running process.'; - succeed 'done.'; -} -else { - fail "Usage: $0 {start|stop|restart}"; -} - -sub get_pid { - fail "$PIDFILE does not exist." unless -f $PIDFILE; - chomp( my $pid = `cat $PIDFILE` ); - return $pid; -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 02:36:10
|
Revision: 985 http://svn.sourceforge.net/socialtext/?rev=985&view=rev Author: petdance Date: 2007-01-29 18:36:07 -0800 (Mon, 29 Jan 2007) Log Message: ----------- fixing up short names Modified Paths: -------------- branches/rug/dev-bin/gen-config branches/rug/etc/init.d/st-apache.in Modified: branches/rug/dev-bin/gen-config =================================================================== --- branches/rug/dev-bin/gen-config 2007-01-30 01:58:30 UTC (rev 984) +++ branches/rug/dev-bin/gen-config 2007-01-30 02:36:07 UTC (rev 985) @@ -454,8 +454,12 @@ my $confd = "$dirs{apache_app_etc}/conf.d"; my %config = standard_params( \%dirs ); + + # XXX Hoist into a module my $webapi = get_build_setting( 'webapi' ); + my $short_name = $webapi eq 'mod_perl1' ? 'apache-perl' : 'apache2'; + %config = ( %config, base_dir => $dirs{apache_app_root}, @@ -471,7 +475,7 @@ apache_proxy_etc_dir => $dirs{apache_app_etc}, use_ssl => _use_ssl($config{nlw_server_hostname}), ), - module_dir => get_build_setting( $webapi eq 'mod_perl1' ? 'apache-perl-moduledir' : 'apache2-moduledir' ), + module_dir => get_build_setting( "$short_name-moduledir" ), nlw_config_file => File::Spec->catfile( $dirs{socialtext_etc}, 'socialtext.conf' ), log_prefix => 'nlw', servers => { @@ -484,7 +488,7 @@ 'apache-proxy' => $opts{'apache-proxy'}, single => $single, nlw_server_aliases => [], - apache_short_name => 'apache-perl', + apache_short_name => $short_name, use_canonical_name => 'On', ); $config{backend_port} = $single ? $config{apache_proxy_port} : $config{apache_app_port}; Modified: branches/rug/etc/init.d/st-apache.in =================================================================== --- branches/rug/etc/init.d/st-apache.in 2007-01-30 01:58:30 UTC (rev 984) +++ branches/rug/etc/init.d/st-apache.in 2007-01-30 02:36:07 UTC (rev 985) @@ -8,16 +8,21 @@ use Carp 'croak'; use Readonly; +use Socialtext::Build qw( get_build_setting ); use Socialtext::InitFunctions qw( fork_and_exec_daemon_as_user system_or_die try_kill timeout_waitpid succeed fail restart ); +# XXX Hoist into a module +my $webapi = get_build_setting( 'webapi' ); +my $short_name = $webapi eq 'mod_perl1' ? 'apache-perl' : 'apache2'; + Readonly my $NAME => 'st-apache'; Readonly my $CONF => '@PREFIX@@HTTPD_CONFDIR@/st-httpd.conf'; Readonly my $DAEMON => '@HTTPD@'; Readonly my @COMMAND => ($DAEMON, '-f', $CONF); -Readonly my $PIDFILE => '@PREFIX@@HTTPD_PIDDIR@/st-apache.pid'; +Readonly my $PIDFILE => "@PREFIX@@HTTPD_PIDDIR@/$short_name.pid"; Readonly my $PERL => '@PERL@'; Readonly my $USER => 'root'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-01-30 01:58:32
|
Revision: 984 http://svn.sourceforge.net/socialtext/?rev=984&view=rev Author: petdance Date: 2007-01-29 17:58:30 -0800 (Mon, 29 Jan 2007) Log Message: ----------- added headers_in, headers_out and err_headers_out Modified Paths: -------------- branches/rug/lib/Socialtext/Rug/MP2.pm Modified: branches/rug/lib/Socialtext/Rug/MP2.pm =================================================================== --- branches/rug/lib/Socialtext/Rug/MP2.pm 2007-01-29 23:17:36 UTC (rev 983) +++ branches/rug/lib/Socialtext/Rug/MP2.pm 2007-01-30 01:58:30 UTC (rev 984) @@ -53,23 +53,43 @@ return ModPerl::Util::current_callback(); } +sub _recall { + my $self = shift; + my $method = shift; + + return $self->$method unless @_; + + while ( my ($key,$val) = splice( @_, 0, 2 ) ) { + $self->$method->add( $key => $val ); + } +} + +sub err_header_out { + return shift->_recall( 'err_headers_out', @_ ); +} + sub get_config { - shift->dir_config->get( @_ ); + return shift->dir_config->get( @_ ); } +sub header_in { + return shift->_recall( 'headers_in', @_ ); +} + +sub header_out { + return shift->_recall( 'headers_out', @_ ); +} + sub log_error { - shift->req->log_error( @_ ); + return shift->req->log_error( @_ ); } sub send_http_header { - shift->req->content_type( @_ ); + return shift->req->content_type( @_ ); } sub user { - shift->req->connection()->user( @_ ); + return shift->req->connection()->user( @_ ); } - 1; - -__END__ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |