Author: jsdelfino
Date: Sat Oct 29 17:47:09 2011
New Revision: 1194947
URL: http://svn.apache.org/viewvc?rev=1194947&view=rev
Log:
Minor improvements to Page Speed build integration and documentation.
Modified:
tuscany/sca-cpp/trunk/INSTALL
tuscany/sca-cpp/trunk/README
tuscany/sca-cpp/trunk/macos/macos-install
tuscany/sca-cpp/trunk/modules/edit/Makefile.am
tuscany/sca-cpp/trunk/modules/http/minify-css
tuscany/sca-cpp/trunk/modules/http/minify-html
tuscany/sca-cpp/trunk/modules/http/minify-js
tuscany/sca-cpp/trunk/modules/js/Makefile.am
Modified: tuscany/sca-cpp/trunk/INSTALL
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/INSTALL?rev=1194947&r1=1194946&r2=1194947&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/INSTALL (original)
+++ tuscany/sca-cpp/trunk/INSTALL Sat Oct 29 17:47:09 2011
@@ -97,7 +97,7 @@ Mozilla SpiderMonkey libmozjs 1.8.5 and
(https://developer.mozilla.org/en/SpiderMonkey)
built with Mozilla nspr-4.8.8
-Key/value store:
+Key/value persistent store:
tinycdb-0.77 (http://www.corpit.ru/mjt/tinycdb.html)
Optional dependencies:
@@ -106,6 +106,9 @@ Web application firewall:
Mod-security 2.6.0 (http://www.modsecurity.org/)
with the Mod-security core rule set 2.2.0
+Web page optimizations:
+Page Speed SDK 1.9 (http://code.google.com/p/page-speed/)
+
Web Services:
Apache Axis2/C 1.6.0 (http://ws.apache.org/axis2/c/)
@@ -141,8 +144,11 @@ Apache Vysper 0.5 (http://mina.apache.or
Libstrophe (http://code.stanziq.com/strophe/)
build it from source at git://github.com/jsdelfino/libstrophe.git
-SQL Database:
-postgresql-9.0.3 (http://www.postgresql.org/)
+Key/value persistent store:
+Google LevelDB 1.2 (http://code.google.com/p/leveldb/)
+
+SQL database:
+PostgreSQL 9.0.3 (http://www.postgresql.org/)
Logging:
Facebook Scribe 2.2 (http://github.com/facebook/scribe/downloads)
@@ -200,6 +206,9 @@ To build the support for OpenID authenti
To build the support for Mod-security:
--enable-mod-security
+To enable Page Speed Web page optimizations:
+--enable-pagespeed
+
To generate doxygen documentation, add:
--enable-doxygen
@@ -237,6 +246,7 @@ dependencies installed under $build:
--enable-openid --with-mod-auth-openid=$build/mod-auth-openid-bin \
--enable-oauth --with-liboauth=$build/liboauth-0.9.1-bin \
--enable-mod-security --with-mod-security=$build/modsecurity-apache-2.6.0-bin \
+--enable-pagespeed --with-pagespeed=$build/page-speed-1.9-bin \
--enable-maintainer-mode
Modified: tuscany/sca-cpp/trunk/README
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/README?rev=1194947&r1=1194946&r2=1194947&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/README (original)
+++ tuscany/sca-cpp/trunk/README Sat Oct 29 17:47:09 2011
@@ -14,10 +14,11 @@ can be used to help assemble distributed
Cache: key/value memory cache, using Memcached;
Chat: XMPP chat, using Apache Vysper and Libstrophe;
+Constdb: fast persistent store for mostly constant data, using TinyCDB;
Filedb: key/value 'NoSQL' persistent store, using plain files;
Http: HTTP client, using Libcurl;
+Kvdb: fast key/value 'NoSQL' persistent store, using LevelDB;
Log: distributed logger, using Facebook Scribe;
-Nosqldb: key/value 'NoSQL' persistent store, using TinyCDB;
Queue: AMQP queuing, using Apache Qpid/C;
Sqldb: SQL database, using PostgreSQL;
Webservice: Web service gateway, using Apache Axis2/C.
@@ -75,10 +76,11 @@ Here's a rough guide to the Tuscany SCA
| |-- components Useful SCA components
| | |-- cache Memcached key/value cache
| | |-- chat XMPP chat
- | | |-- filedb Plain file NoSQL database
+ | | |-- constdb TinyCDB constant persistent store
+ | | |-- filedb Plain file NoSQL persistent store
| | |-- http HTTP client
+ | | |-- kvdb LevelDB NoSQL persistent store
| | |-- log Scribe logger
- | | |-- nosqldb TinyCDB NoSQL database
| | |-- queue AMQP message queue
| | |-- sqldb PostgreSQL database
| | |-- webservice Axis2 Web service gateway
Modified: tuscany/sca-cpp/trunk/macos/macos-install
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/macos/macos-install?rev=1194947&r1=1194946&r2=1194947&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/macos/macos-install (original)
+++ tuscany/sca-cpp/trunk/macos/macos-install Sat Oct 29 17:47:09 2011
@@ -285,16 +285,6 @@ if [ "$?" != "0" ]; then
fi
cd $build
-# Build Google Page Speed
-curl -OL https://dl-ssl.google.com/page-speed/sdk/current/page-speed-sdk.zip
-unzip page-speed-sdk.zip
-cd page-speed-1.9
-make builddir=$build/page-speed-1.9-bin
-if [ "$?" != "0" ]; then
- exit $?
-fi
-cd $build
-
# Build Apache Nuvem
git clone git://git.apache.org/nuvem.git
if [ "$?" != "0" ]; then
@@ -306,7 +296,7 @@ cd $build
git clone git://git.apache.org/tuscany-sca-cpp.git
cd tuscany-sca-cpp
./bootstrap
-./configure --prefix=$build/tuscany-sca-cpp-bin --with-curl=$build/curl-7.19.5-bin --with-apr=$build/apr-1.4.x-bin --with-httpd=$build/httpd-2.3.10-bin --with-memcached=$build/memcached-1.4.7-bin --with-tinycdb=$build/tinycdb-bin --with-leveldb=$build/leveldb --with-js-include=$build/js-1.8.5-bin/include/js --with-js-lib=$build/js-1.8.5-bin/lib --enable-pagespeed --with-pagespeed=$build/page-speed-1.9-bin --with-libcloud=$build/libcloud-0.4.2-bin --enable-threads --enable-python --enable-opencl --with-libxml2=$build/libxml2-2.7.7-bin --enable-chat --with-libstrophe=$build/libstrophe-bin --enable-openid --with-mod-auth-openid=$build/mod-auth-openid-bin --enable-oauth --with-liboauth=$build/liboauth-0.9.1-bin --enable-mod-security --with-mod-security=$build/modsecurity-apache-2.6.1-bin
+./configure --prefix=$build/tuscany-sca-cpp-bin --with-curl=$build/curl-7.19.5-bin --with-apr=$build/apr-1.4.x-bin --with-httpd=$build/httpd-2.3.10-bin --with-memcached=$build/memcached-1.4.7-bin --with-tinycdb=$build/tinycdb-bin --with-leveldb=$build/leveldb --with-js-include=$build/js-1.8.5-bin/include/js --with-js-lib=$build/js-1.8.5-bin/lib --with-libcloud=$build/libcloud-0.4.2-bin --enable-threads --enable-python --enable-opencl --with-libxml2=$build/libxml2-2.7.7-bin --enable-chat --with-libstrophe=$build/libstrophe-bin --enable-openid --with-mod-auth-openid=$build/mod-auth-openid-bin --enable-oauth --with-liboauth=$build/liboauth-0.9.1-bin --enable-mod-security --with-mod-security=$build/modsecurity-apache-2.6.1-bin
make
make install
if [ "$?" != "0" ]; then
@@ -315,8 +305,8 @@ fi
cd $build
# Create src archive
-tar czf tuscany-sca-cpp-1.0-src.tar.gz apache-libcloud-incubating-0.4.2 apache-libcloud-incubating-0.4.2.tar.bz2 apr-1.4.x apr-1.4.x-bin autoconf-2.13 autoconf-2.13-bin autoconf-2.13.tar.gz curl-7.19.5 curl-7.19.5-bin curl-7.19.5.tar.gz expat-2.0.1 expat-2.0.1-bin expat-2.0.1.tar.gz htmltidy-bin httpd-2.3.10 httpd-2.3.10-alpha.tar.gz httpd-2.3.10-bin js-1.8.5-bin js-1.8.5 js185-1.0.0.tar.gz libcloud-0.4.2-bin libevent-2.0.13-stable libevent-2.0.13-stable-bin libevent-2.0.13-stable.tar.gz liboauth-0.9.1 liboauth-0.9.1-bin liboauth-0.9.1.tar.gz libopkele libopkele-bin libstrophe libstrophe-bin libxml2-2.7.7 libxml2-2.7.7-bin libxml2-sources-2.7.7.tar.gz memcached-1.4.7 memcached-1.4.7-bin memcached-1.4.7.tar.gz mod_auth_openid mod-auth-openid-bin modsecurity-apache_2.6.1 modsecurity-apache-2.6.0-bin modsecurity-apache_2.6.0.tar.gz modsecurity-crs_2.2.1 modsecurity-crs_2.2.1.tar.gz nspr-4.8.8-bin nspr-4.8.8 nspr-4.8.8.tar.gz nuvem page-speed-1.9 page-speed-1.9-bin page-speed-sd
k.zip pcre-8.12 pcre-8.12-bin pcre-8.12.zip pkg-config-0.25 pkg-config-0.25-bin pkg-config-0.25.tar.gz tidy tinycdb tinycdb-bin leveldb tuscany-sca-cpp tuscany-sca-cpp-bin
+tar czf tuscany-sca-cpp-1.0-src.tar.gz apache-libcloud-incubating-0.4.2 apache-libcloud-incubating-0.4.2.tar.bz2 apr-1.4.x apr-1.4.x-bin autoconf-2.13 autoconf-2.13-bin autoconf-2.13.tar.gz curl-7.19.5 curl-7.19.5-bin curl-7.19.5.tar.gz expat-2.0.1 expat-2.0.1-bin expat-2.0.1.tar.gz htmltidy-bin httpd-2.3.10 httpd-2.3.10-alpha.tar.gz httpd-2.3.10-bin js-1.8.5-bin js-1.8.5 js185-1.0.0.tar.gz libcloud-0.4.2-bin libevent-2.0.13-stable libevent-2.0.13-stable-bin libevent-2.0.13-stable.tar.gz liboauth-0.9.1 liboauth-0.9.1-bin liboauth-0.9.1.tar.gz libopkele libopkele-bin libstrophe libstrophe-bin libxml2-2.7.7 libxml2-2.7.7-bin libxml2-sources-2.7.7.tar.gz memcached-1.4.7 memcached-1.4.7-bin memcached-1.4.7.tar.gz mod_auth_openid mod-auth-openid-bin modsecurity-apache_2.6.1 modsecurity-apache-2.6.0-bin modsecurity-apache_2.6.0.tar.gz modsecurity-crs_2.2.1 modsecurity-crs_2.2.1.tar.gz nspr-4.8.8-bin nspr-4.8.8 nspr-4.8.8.tar.gz nuvem pcre-8.12 pcre-8.12-bin pcre-8.12.zip pkg-confi
g-0.25 pkg-config-0.25-bin pkg-config-0.25.tar.gz tidy tinycdb tinycdb-bin leveldb tuscany-sca-cpp tuscany-sca-cpp-bin
# Create bin archive
-tar czf tuscany-sca-cpp-1.0.tar.gz apr-1.4.x-bin curl-7.19.5-bin expat-2.0.1-bin htmltidy-bin httpd-2.3.10-bin js-1.8.5-bin libcloud-0.4.2-bin libevent-2.0.13-stable-bin liboauth-0.9.1-bin libopkele-bin libstrophe-bin libxml2-2.7.7-bin memcached-1.4.7-bin mod-auth-openid-bin modsecurity-apache-2.6.1-bin nspr-4.8.8-bin nuvem/nuvem-parallel page-speed-1.9-bin pcre-8.12-bin tinycdb-bin leveldb tuscany-sca-cpp tuscany-sca-cpp-bin
+tar czf tuscany-sca-cpp-1.0.tar.gz apr-1.4.x-bin curl-7.19.5-bin expat-2.0.1-bin htmltidy-bin httpd-2.3.10-bin js-1.8.5-bin libcloud-0.4.2-bin libevent-2.0.13-stable-bin liboauth-0.9.1-bin libopkele-bin libstrophe-bin libxml2-2.7.7-bin memcached-1.4.7-bin mod-auth-openid-bin modsecurity-apache-2.6.1-bin nspr-4.8.8-bin nuvem/nuvem-parallel pcre-8.12-bin tinycdb-bin leveldb tuscany-sca-cpp tuscany-sca-cpp-bin
Modified: tuscany/sca-cpp/trunk/modules/edit/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/edit/Makefile.am?rev=1194947&r1=1194946&r2=1194947&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/edit/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/edit/Makefile.am Sat Oct 29 17:47:09 2011
@@ -20,21 +20,20 @@ if WANT_PYTHON
moddir = $(prefix)/modules/edit
dist_mod_SCRIPTS = start stop ssl-start mkapplinks
-nobase_dist_mod_DATA = edit.composite *.py htdocs/*.html htdocs/*.js htdocs/*.cmf htdocs/*.ico htdocs/home/*.png htdocs/home/*.b64 htdocs/*.txt htdocs/account/*.html htdocs/create/*.html htdocs/clone/*.html htdocs/app/*.html htdocs/store/*.html htdocs/stats/*.html htdocs/graph/*.html htdocs/home/*.html htdocs/page/*.html htdocs/login/*.html htdocs/logout/*.html htdocs/notauth/*.html htdocs/notfound/*.html htdocs/oops/*.html htdocs/public/*.html htdocs/public/*.png htdocs/public/*.b64 palettes/*/palette.composite apps/*/app.composite apps/*/app.stats apps/*/htdocs/app.html dashboards/*/user.apps store/*/store.apps
+minified = htdocs/public/iframe-min.html htdocs/create/index-min.html htdocs/page/index-min.html htdocs/login/index-min.html htdocs/notfound/index-min.html htdocs/oops/index-min.html htdocs/graph/index-min.html htdocs/notauth/index-min.html htdocs/account/index-min.html htdocs/home/index-min.html htdocs/index-min.html htdocs/notyet/index-min.html htdocs/clone/index-min.html htdocs/stats/index-min.html htdocs/app/index-min.html htdocs/logout/index-min.html htdocs/store/index-min.html htdocs/headconfig-min.js htdocs/footconfig-min.js
-EXTRA_DIST = edit.composite *.py htdocs/*.html htdocs/*.js htdocs/*.cmf htdocs/*.ico htdocs/home/*.png htdocs/home/*.b64 htdocs/*.txt htdocs/account/*.html htdocs/create/*.html htdocs/clone/*.html htdocs/app/*.html htdocs/store/*.html htdocs/stats/*.html htdocs/graph/*.html htdocs/home/*.html htdocs/page/*.html htdocs/login/*.html htdocs/logout/*.html htdocs/notauth/*.html htdocs/notfound/*.html htdocs/oops/*.html htdocs/public/*.html htdocs/public/*.png htdocs/public/*.b64 palettes/*/palette.composite apps/*/app.composite apps/*/app.stats apps/*/htdocs/app.html dashboards/*/user.apps store/*/store.apps
+resources = edit.composite *.py htdocs/*.html htdocs/*.js htdocs/*.cmf htdocs/*.ico htdocs/home/*.png htdocs/home/*.b64 htdocs/*.txt htdocs/account/*.html htdocs/create/*.html htdocs/clone/*.html htdocs/app/*.html htdocs/store/*.html htdocs/stats/*.html htdocs/graph/*.html htdocs/home/*.html htdocs/page/*.html htdocs/login/*.html htdocs/logout/*.html htdocs/notauth/*.html htdocs/notfound/*.html htdocs/oops/*.html htdocs/public/*.html htdocs/public/*.png htdocs/public/*.b64 palettes/*/palette.composite apps/*/app.composite apps/*/app.stats apps/*/htdocs/app.html dashboards/*/user.apps store/*/store.apps ${minified}
-BUILT_SOURCES = minify_html.stamp minify_js.stamp
-minify_html.stamp: htdocs/*.html htdocs/*/*.html
- find htdocs -name "*-min.html" -exec rm {} \;
- find htdocs -name "*.html" -exec ../http/minify-html {} \;
- touch minify_html.stamp
-
-minify_js.stamp: htdocs/*.js
- find htdocs -name "*-min.js" -exec rm {} \;
- find htdocs -name "*.js" -exec ../http/minify-js {} \;
- touch minify_js.stamp
+nobase_dist_mod_DATA = ${resources}
+EXTRA_DIST = ${resources}
-CLEANFILES = *.stamp
+SUFFIXES = -min.html -min.js
+.html-min.html:
+ ../http/minify-html $< $@
+
+.js-min.js:
+ ../http/minify-js $< $@
+
+CLEANFILES = ${minified}
endif
Modified: tuscany/sca-cpp/trunk/modules/http/minify-css
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/minify-css?rev=1194947&r1=1194946&r2=1194947&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/minify-css (original)
+++ tuscany/sca-cpp/trunk/modules/http/minify-css Sat Oct 29 17:47:09 2011
@@ -28,7 +28,7 @@ else
fi
css="$1"
-mincss="${css%.*}-min.css"
+mincss="$2"
${minify_css} <${css} >${mincss}
Modified: tuscany/sca-cpp/trunk/modules/http/minify-html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/minify-html?rev=1194947&r1=1194946&r2=1194947&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/minify-html (original)
+++ tuscany/sca-cpp/trunk/modules/http/minify-html Sat Oct 29 17:47:09 2011
@@ -28,7 +28,7 @@ else
fi
html="$1"
-minhtml="${html%.*}-min.html"
+minhtml="$2"
${minify_html} ${html} ${minhtml}
Modified: tuscany/sca-cpp/trunk/modules/http/minify-js
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/minify-js?rev=1194947&r1=1194946&r2=1194947&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/minify-js (original)
+++ tuscany/sca-cpp/trunk/modules/http/minify-js Sat Oct 29 17:47:09 2011
@@ -28,7 +28,7 @@ else
fi
js="$1"
-minjs="${js%.*}-min.js"
+minjs="$2"
${minify_js} <${js} >${minjs}
Modified: tuscany/sca-cpp/trunk/modules/js/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/js/Makefile.am?rev=1194947&r1=1194946&r2=1194947&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/js/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/js/Makefile.am Sat Oct 29 17:47:09 2011
@@ -23,12 +23,12 @@ htdocs/all.js: htdocs/util.js htdocs/ele
cat htdocs/util.js htdocs/elemutil.js htdocs/xmlutil.js htdocs/atomutil.js htdocs/jsonutil.js htdocs/scdl.js htdocs/ui.js htdocs/component.js >htdocs/all.js
htdocs/all-min.js: htdocs/all.js
- ../http/minify-js htdocs/all.js
+ ../http/minify-js htdocs/all.js htdocs/all-min.js
htdocs/ui-min.css: htdocs/ui.css
- ../http/minify-css htdocs/ui.css
+ ../http/minify-css htdocs/ui.css htdocs/ui-min.css
-CLEANFILES = htdocs/all.js htdocs/all-min.js
+CLEANFILES = htdocs/all.js htdocs/all-min.js htdocs/ui-min.css
moddir = $(prefix)/modules/js
nobase_dist_mod_DATA = htdocs/*.js htdocs/*.css