Cleanup sample and test HTML pages. Remove crlf, fix links to the Javascript scripts, and remove unused CSS stylesheets.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1343140 13f79535-47bb-0310-9956-ffa450edef68
author: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> 2012-05-28 04:39:44 +0000
committer: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> 2012-05-28 04:39:44 +0000
commit: 7519724a171bb85246bb86bce453cbdd408691d9 (patch)
tree: 3fd959c40a09fc496bf1f84d9fd25eaf9741fd5e /sca-cpp/trunk/modules
parent: 4a28afdf7a6b193942f180862d443a7d818c5789 (diff)
9 files changed, 83 insertions, 578 deletions
diff --git a/sca-cpp/trunk/modules/http/htdocs/login/index.html b/sca-cpp/trunk/modules/http/htdocs/login/index.html
index 5c5286f7c4..3936730553 100644
--- a/sca-cpp/trunk/modules/http/htdocs/login/index.html
+++ b/sca-cpp/trunk/modules/http/htdocs/login/index.html
@@ -23,7 +23,7 @@
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
 <link rel="stylesheet" type="text/css" href="/ui.css"/>
-<script type="text/javascript" src="/util.js"></script>
+<script type="text/javascript" src="/all.js"></script>
 <title>Sign in</title>
 </head>
 <body>
diff --git a/sca-cpp/trunk/modules/http/htdocs/logout/index.html b/sca-cpp/trunk/modules/http/htdocs/logout/index.html
index 795f8f32a2..66f2893a1f 100644
--- a/sca-cpp/trunk/modules/http/htdocs/logout/index.html
+++ b/sca-cpp/trunk/modules/http/htdocs/logout/index.html
@@ -24,7 +24,7 @@
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
 <link rel="stylesheet" type="text/css" href="/ui.css"/>
-<script type="text/javascript" src="/util.js"></script>
+<script type="text/javascript" src="/all.js"></script>
 <title>Sign out</title>
 </head>
 <h1>Sign out</h1>
diff --git a/sca-cpp/trunk/modules/js/Makefile.am b/sca-cpp/trunk/modules/js/Makefile.am
index 833a764230..03cf04685f 100644
--- a/sca-cpp/trunk/modules/js/Makefile.am
+++ b/sca-cpp/trunk/modules/js/Makefile.am
@@ -30,6 +30,7 @@ htdocs/ui-min.css: htdocs/ui.css
 
 CLEANFILES = htdocs/all.js htdocs/all-min.js htdocs/ui-min.css
 
+dist_mod_SCRIPTS = js-conf
 moddir = $(prefix)/modules/js
 nobase_dist_mod_DATA = htdocs/*.js htdocs/*.css
 EXTRA_DIST = htdocs/*.js htdocs/*.css htdocs/all.js
diff --git a/sca-cpp/trunk/modules/js/htdocs/uiblue.css b/sca-cpp/trunk/modules/js/htdocs/uiblue.css
deleted file mode 100644
index 4efde86a9a..0000000000
--- a/sca-cpp/trunk/modules/js/htdocs/uiblue.css
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- *   
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-body {
-white-space: margin: 0px;
-font-family: arial,sans-serif; font-style: normal; font-variant: normal; font-size: 13px;
-}
-
-table {
-border: 0px; border-collapse: collapse; border-color: #000000; border-style: solid;
-font-family: arial,sans-serif; font-style: normal; font-variant: normal; font-size: 13px;
-}
-
-th {
-font-weight: bold; background-color: #3b5998; color: #ffffff;
-text-align: left; padding-left: 2px; padding-right: 8px; padding-top: 2px; padding-bottom: 4px; vertical-align: text-top;
-border-top: 1px; border-bottom: 1px; border-left: 0px; border-right: 0px;
-border-style: solid; border-top-color: #000000; border-bottom-color: #000000;
-}
-
-.thl {
-border-left: 0px;
-}
-
-.thr {
-border-right: 0px;
-}
-
-.ths {
-padding: 0px;
-}
-
-td {
-padding-left: 2px; padding-top: 2px; padding-right: 8px; white-space: nowrap; vertical-align: text-top;
-}
-
-.tdl {
-border-right: 1px;
-}
-
-.tdr {
-border-left: 1px;
-}
-
-.tdw {
-padding-left: 2px; padding-top: 2px; padding-right: 8px; white-space: normal; vertical-align: text-top;
-}
-
-.widgetframe {
-visibility: hidden; width: 0px; height: 0px; border: 0px;
-}
-
-.loadedframe {
-width: 100%; height: 100%; border: 0px;
-margin: 0px; padding: 0px;
-}
-
-input {
-vertical-align: middle;
--webkit-text-size-adjust: 140%;
-}
-
-textarea {
-font-family: arial,sans-serif; font-style: normal; font-variant: normal; font-size: 13px;
-}
-
-a:link {
-color: #3b5998;
-}
-
-a:visited {
-color: #3b5998;
-}
-
-.amenu {
-font-weight: bold;
-color: #ffffff;
-}
-
-.smenu {
-font-weight: bold;
-color: #ffffff;
-}
-
-h1 {
-font-size: 200%; font-weight: bold;
-vertical-align: middle;
-margin: 0px;
-}
-
-h2 {
-font-size: 150%; font-weight: bold;
-vertical-align: middle;
-margin: 0px;
-}
-
-.hd1 {
-font-size: 200%; font-weight: bold;
-}
-
-.hd2 {
-font-size: 150%; font-weight: bold;
-}
-
-.imgbutton {
-width: 142px; height: 64px; margin-left: 20px; margin-right: 20px; padding: 0px; border: 1px;
-cursor: pointer; cursor: hand;
-}
-
-.tbar {
-font-weight: bold; background-color: #3b5998; color: #ffffff;
-margin: 0px;
-padding-top: 4px; padding-left: 2px; padding-right: 8px; padding-bottom: 8px; vertical-align: text-top;
-border-bottom: 1px solid #000000; border-collapse: separate;
-}
-
-.ltbar {
-padding-left: 0px; padding-top: 0px; padding-right: 16px; white-space: nowrap; vertical-align: top;
-}
-
-.rtbar {
-padding-left: 8px; padding-right: 0px; padding-top: 0px; white-space: nowrap; vertical-align: top;
-text-align: right;
-}
-
-.suggest {
-background-color: #e5ecf9; color: #598edd;
-border-top: 1px; border-bottom: 1px; border-left: 1px; border-right: 1px;
-border-style: solid; border-top-color: #a2bae7; border-bottom-color: #d1d3d4;
-border-left-color: #d1d3d4; border-right-color: #d1d3d4;
-position: absolute;
-overflow: auto; overflow-x: hidden;
-cursor: default;
-padding: 0px; margin: 0px;
-}
-
-.suggestTable {
-border: 0px; border-collapse: separate;
-padding-left: 5px; padding-right: 5px; padding-top: 2px; padding-bottom: 2px; 
-margin: 0px;
-}
-
-.suggestItem {
-padding-left: 2px; padding-top: 0px; padding-bottom: 0px; padding-right: 2px; vertical-align: text-top;
-background-color: #e5ecf9; color: #598edd;
-}
-
-.suggestHilighted {
-padding-left: 2px; padding-top: 0px; padding-bottom: 0px; padding-right: 2px; vertical-align: text-top;
-background-color: #598edd; color: #e5ecf9;
-}
-
-v\: * {
-behavior:url(#default#VML);
-display:inline-block; 
-}
-
diff --git a/sca-cpp/trunk/modules/js/htdocs/uicyan.css b/sca-cpp/trunk/modules/js/htdocs/uicyan.css
deleted file mode 100644
index aa03b7570a..0000000000
--- a/sca-cpp/trunk/modules/js/htdocs/uicyan.css
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- *   
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-body {
-margin: 2px; font-family: "Helvetica Neue", Helvetica; font-style: normal; font-variant: normal; font-size: 13px;
--webkit-text-size-adjust: none;
--webkit-touch-callout: none;
--webkit-tap-highlight-color: rgba(0,0,0,0);
--webkit-user-select: none;
-}
-
-.delayed {
-visibility: hidden;
-}
-
-.devicewidth {
-position: absolute; top: 0px; left: 0px; right: 0px; height: 5000px; overflow: hidden;
-}
-
-table {
-border: 0px; border-collapse: collapse; border-color: #a2bae7; border-style: solid;
-font-family: "Helvetica Neue", Helvetica; font-style: normal; font-variant: normal; font-size: 13px;
-overflow: visible;
-}
-
-.trb {
-border-bottom: 1px; border-bottom-style: solid; border-color: #dcdcdc;
-}
-
-th {
-font-weight: bold; background-color: #e5ecf9; color: #000000; height: 18px;
-text-align: left; padding-left: 2px; padding-right: 8px; padding-top: 0px; padding-bottom: 0px; vertical-align: middle; white-space: nowrap;
-border-top: 1px; border-bottom: 1px; border-left: 1px; border-right: 1px; border-style: solid; border-top-color: #a2bae7; border-bottom-color: #d1d3d4; border-left-color: #a2bae7; border-right-color: #a2bae7;
-overflow: hidden;
-}
-
-.section {
-font-weight: bold; background-color: #e5ecf9; color: #000000; height: 24px; padding-top: 1px; padding-bottom: 0px; padding-left: 2px; padding-right: 2px;
-border-top: 1px; border-bottom: 1px; border-left: 0px; border-right: 0px; border-style: solid; border-top-color: #a2bae7; border-bottom-color: #d1d3d4; border-left-color: #a2bae7; border-right-color: #a2bae7;
-overflow: hidden;
-}
-
-.text {
-padding-top: 3px; padding-bottom: 4px; vertical-align: middle;
-}
-
-.thl {
-border-left: 0px;
-}
-
-.thr {
-border-right: 0px;
-}
-
-.ths {
-padding: 0px;
-}
-
-td {
-padding-left: 2px; padding-top: 2px; padding-right: 8px; white-space: nowrap; vertical-align: middle; border: 0px;
-}
-
-.tdl {
-border-right: 1px; border-style: solid; border-color: #a2bae7; width: 10px;
-}
-
-.tdr {
-border-left: 1px; border-style: solid; border-color: #a2bae7;
-}
-
-.tdw {
-padding-left: 2px; padding-top: 2px; padding-right: 8px; white-space: normal; vertical-align: middle;
-}
-
-.datatd {
-border-top: 1px; border-bottom: 1px; border-style: solid; border-color: #dcdcdc; width: 10px; vertical-align: middle;
-}
-
-.datatdl {
-border-right: 1px; border-top: 1px; border-bottom: 1px; border-style: solid; border-color: #dcdcdc; width: 10px; vertical-align: middle;
-}
-
-.datatdr {
-border-left: 1px; border-top: 1px; border-bottom: 1px; border-style: solid; border-color: #dcdcdc; vertical-align: middle;
-}
-
-.datatable {
-border-top: 1px; border-bottom: 1px; border-style: solid; border-color: #dcdcdc;
-overflow: visible;
-}
-
-.databg {
-opacity: .6;  
--ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
-filter: alpha(opacity=60);
-}
-
-.guide {
-border: 1px; border-style: solid; border-color: #c0c0c0;
-}
-
-iframe {
-border: 0px; margin: 0px; padding: 0px;
-}
-
-.widgetframe {
-visibility: hidden; width: 0px; height: 0px; border: 0px;
-}
-
-.loadedframe {
-width: 100%; height: 100%;
-}
-
-.fakeframe {
-padding: 3px; background-color: #dcdcdc; color: #000000;
-}
-
-input {
-vertical-align: middle;
-font-family: "Helvetica Neue", Helvetica; font-style: normal; font-variant: normal; font-size: 13px;
--webkit-text-size-adjust: 100%;
-}
-
-textarea {
-font-family: "Helvetica Neue", Helvetica; font-style: normal; font-variant: normal; font-size: 13px;
-overflow: auto; resize: none;
-}
-
-.editable {
-background-color: transparent;
-font-family: inherit; font-style: inherit; font-variant: inherit; font-size: inherit; font-weight: inherit;
-padding: 0px; margin: 0px;
-overflow: auto; resize: none;
-outline: none; -webkit-appearance: none; -moz-outline-style: none;
--webkit-text-size-adjust: 100%;
-border: 0px;
-}
-
-a:link {
-color: #598edd; text-decoration: none;
-}
-
-a:visited {
-color: #598edd; text-decoration: none;
-}
-
-.amenu {
-color: #598edd; text-decoration: none;
-}
-
-.smenu {
-font-weight: bold; color: #000000; text-decoration: none;
-}
-
-h1 {
-font-size: 150%; font-weight: bold; vertical-align: middle; margin-top: 5px; margin-bottom: 5px; margin-left: 2px; margin-right: 2px;
-}
-
-h2 {
-font-size: 120%; font-weight: bold; vertical-align: middle; margin-top: 5px; margin-bottom: 5px; margin-left: 2px; margin-right: 2px;
-}
-
-.hd1 {
-font-size: 150%; font-weight: bold;
-}
-
-.hd2 {
-font-size: 120%; font-weight: bold;
-}
-
-img {
-border: 0px;
-}
-
-.imgbutton {
-width: 142px; height: 64px; margin-left: 20px; margin-right: 20px; padding: 0px; border: 1px; cursor: pointer;
-}
-
-.toolbutton {
-font-weight: bold; font-size: 16px;
-display: inline-block; width: 24px; height: 20px; padding: 0px;
-vertical-align: middle; text-align: center; margin-left: 0px; margin-right: 0px;
-padding-left: 0px; padding-right: 0px; padding-top: 0px; padding-bottom: 0px;
-}
-
-.greenbutton {
--webkit-border-radius: 4px;
-border-radius: 4px;
-background: #96d333;
-background: -moz-linear-gradient(top, #f8f8f8 0%, #96d333 100%);
-background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(100%,#96d333));
-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f8f8f8', endColorstr='#96d333',GradientType=0 );
-background: -o-linear-gradient(top, #f8f8f8 0%,#96d333 100%);
-border: 1px outset #dcdcdc;
-padding-left: 4px; padding-right: 4px; padding-top: 2px; padding-bottom: 2px; margin: 2px;
-cursor: pointer;
-}
-
-.tgreenbutton {
--webkit-border-radius: 4px;
-border-radius: 4px;
-background: #96d333;
-background: -moz-linear-gradient(top, #f8f8f8 0%, #96d333 100%);
-background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(100%,#96d333));
-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f8f8f8', endColorstr='#96d333',GradientType=0 );
-background: -o-linear-gradient(top, #f8f8f8 0%,#96d333 100%);
-border: 1px outset #dcdcdc;
-padding-left: 4px; padding-right: 4px; padding-top: 2px; padding-bottom: 2px; margin: 2px;
-cursor: pointer;
-}
-
-.bluebutton {
--webkit-border-radius: 4px;
-border-radius: 4px;
-background: #598edd;
-background: -moz-linear-gradient(top, #f8f8f8 0%, #598edd 100%);
-background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(100%,#598edd));
-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f8f8f8', endColorstr='#598edd',GradientType=0 );
-background: -o-linear-gradient(top, #f8f8f8 0%,#598edd 100%);
-border: 1px outset #dcdcdc;
-padding-left: 4px; padding-right: 4px; padding-top: 2px; padding-bottom: 2px; margin: 2px;
-cursor: pointer;
-}
-
-.redbutton {
--webkit-border-radius: 4px;
-border-radius: 4px;
-background: #d03f41;
-background: -moz-linear-gradient(top, #f8f8f8 0%, #d03f41 100%);
-background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(100%,#d03f41));
-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f8f8f8', endColorstr='#d03f41',GradientType=0 );
-background: -o-linear-gradient(top, #f8f8f8 0%,#d03f41 100%);
-border: 1px outset #dcdcdc;
-padding-left: 4px; padding-right: 4px; padding-top: 2px; padding-bottom: 2px; margin: 2px;
-cursor: pointer;
-}
-
-.orangebutton {
--webkit-border-radius: 4px;
-border-radius: 4px;
-background: #ffbb00;
-background: -moz-linear-gradient(top, #f8f8f8 0%, #ffbb00 100%);
-background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(100%,#ffbb00));
-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f8f8f8', endColorstr='#ffbb00',GradientType=0 );
-background: -o-linear-gradient(top, #f8f8f8 0%,#ffbb00 100%);
-border: 1px outset #dcdcdc;
-padding-left: 4px; padding-right: 4px; padding-top: 2px; padding-bottom: 2px; margin: 2px;
-cursor: pointer;
-}
-
-.graybutton {
--webkit-border-radius: 4px;
-border-radius: 4px;
-background: #dcdcdc;
-background: -moz-linear-gradient(top, #f8f8f8 0%, #dcdcdc 100%);
-background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(100%,#dcdcdc));
-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f8f8f8', endColorstr='#dcdcdc',GradientType=0 );
-background: -o-linear-gradient(top, #f8f8f8 0%,#dcdcdc 100%);
-border: 1px outset #dcdcdc;
-padding-left: 4px; padding-right: 4px; padding-top: 2px; padding-bottom: 2px; margin: 2px;
-margin: 2px;
-cursor: pointer;
-}
-
-.tbar {
-margin: 0px; width: 100%; padding-top: 0px; padding-left: 0px; padding-right: 0px; padding-bottom: 3px; border-bottom: 1px solid #a2bae7; border-collapse: separate;
-}
-
-.ltbar {
-padding-left: 2px; padding-top: 2px; padding-right: 6px; white-space: nowrap; vertical-align: middle;
-}
-
-.dtbar {
-padding-left: 0px; padding-right: 0px; padding-top: 2px; white-space: nowrap; vertical-align: middle; text-align: right;
-}
-
-.rtbar {
-padding-left: 6px; padding-right: 2px; padding-top: 2px; white-space: nowrap; vertical-align: middle; text-align: right;
-}
-
-.suggest {
-background-color: #e5ecf9; color: #598edd;
-border-top: 1px; border-bottom: 1px; border-left: 1px; border-right: 1px; border-style: solid; border-top-color: #a2bae7; border-bottom-color: #d1d3d4; border-left-color: #d1d3d4; border-right-color: #d1d3d4;
-position: absolute; overflow: auto; overflow-x: hidden; padding: 0px; margin: 0px;
-cursor: default;
-}
-
-.suggestTable {
-border: 0px; border-collapse: separate; padding-left: 5px; padding-right: 5px; padding-top: 2px; padding-bottom: 2px; margin: 0px;
-}
-
-.suggestItem {
-padding-left: 2px; padding-top: 0px; padding-bottom: 0px; padding-right: 2px; vertical-align: middle; background-color: #e5ecf9; color: #598edd;
-}
-
-.suggestHilighted {
-padding-left: 2px; padding-top: 0px; padding-bottom: 0px; padding-right: 2px; vertical-align: middle; background-color: #598edd; color: #e5ecf9;
-}
-
-/*
-v\: * {
-behavior:url(#default#VML);
-display:inline-block; 
-}
-*/
-
diff --git a/sca-cpp/trunk/modules/js/js-conf b/sca-cpp/trunk/modules/js/js-conf
new file mode 100755
index 0000000000..09289a1899
--- /dev/null
+++ b/sca-cpp/trunk/modules/js/js-conf
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+# Add Javascript scripts and CSS to a server conf
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
+mkdir -p $1
+root=`echo "import os; print os.path.realpath('$1')" | python`
+
+cat >>$root/conf/httpd.conf <<EOF
+# Generated by: js-conf $*
+# Serve JavaScript scripts and CSS
+Alias /ui.css $here/htdocs/ui.css
+Alias /ui-min.css $here/htdocs/ui-min.css
+Alias /all.js $here/htdocs/all.js
+Alias /all-min.js $here/htdocs/all-min.js
+Alias /proxy/ui.css $here/htdocs/ui.css
+Alias /proxy/ui-min.css $here/htdocs/ui-min.css
+Alias /proxy/all.js $here/htdocs/all.js
+Alias /proxy/all-min.js $here/htdocs/all-min.js
+
+EOF
+
+cat >>$root/conf/pubauth.conf <<EOF
+# Generated by: js-conf $*
+<Location /ui.css>
+AuthType None
+Require all granted
+</Location>
+<Location /ui-min.css>
+AuthType None
+Require all granted
+</Location>
+<Location /all.js>
+AuthType None
+Require all granted
+</Location>
+<Location /all-min.js>
+AuthType None
+Require all granted
+</Location>
+<Location /proxy/ui.css>
+AuthType None
+Require all granted
+</Location>
+<Location /proxy/ui-min.css>
+AuthType None
+Require all granted
+</Location>
+<Location /proxy/all.js>
+AuthType None
+Require all granted
+</Location>
+<Location /proxy/all-min.js>
+AuthType None
+Require all granted
+</Location>
+
+EOF
+
diff --git a/sca-cpp/trunk/modules/oauth/htdocs/index.html b/sca-cpp/trunk/modules/oauth/htdocs/index.html
index 2ce1ce2b09..8fe4935a4e 100644
--- a/sca-cpp/trunk/modules/oauth/htdocs/index.html
+++ b/sca-cpp/trunk/modules/oauth/htdocs/index.html
@@ -24,7 +24,7 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
 <link rel="stylesheet" type="text/css" href="/ui.css"/>
 
-<script type="text/javascript" src="/component.js"></script>
+<script type="text/javascript" src="/all.js"></script>
 <script type="text/javascript">
 var protected = sca.component("Protected");
 var userInfo = sca.defun(sca.reference(protected, "userInfo"), "getuser", "getemail", "getnickname", "getfullname", "getfirstname", "getlastname", "getrealm");
diff --git a/sca-cpp/trunk/modules/openid/htdocs/index.html b/sca-cpp/trunk/modules/openid/htdocs/index.html
index a6656484a5..760320feb1 100644
--- a/sca-cpp/trunk/modules/openid/htdocs/index.html
+++ b/sca-cpp/trunk/modules/openid/htdocs/index.html
@@ -23,7 +23,7 @@
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
 <link rel="stylesheet" type="text/css" href="/ui.css"/>
-<script type="text/javascript" src="/component.js"></script>
+<script type="text/javascript" src="/all.js"></script>
 
 <script type="text/javascript">
 var protected = sca.component("Protected");
diff --git a/sca-cpp/trunk/modules/server/server-conf b/sca-cpp/trunk/modules/server/server-conf
index 83eea0cc6c..bfa5ac8473 100755
--- a/sca-cpp/trunk/modules/server/server-conf
+++ b/sca-cpp/trunk/modules/server/server-conf
@@ -22,86 +22,10 @@ here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $h
 mkdir -p $1
 root=`echo "import os; print os.path.realpath('$1')" | python`
 
-jsprefix=`echo "import os; print os.path.realpath('$here/../js')" | python`
-
-uname=`uname -s`
-if [ $uname = "Darwin" ]; then
-    libsuffix=".dylib"
-else
-    libsuffix=".so"
-fi
-
-cat >>$root/conf/httpd.conf <<EOF
-# Generated by: server-conf $*
-# Serve JavaScript client scripts
-Alias /component.js $jsprefix/htdocs/component.js
-Alias /util.js $jsprefix/htdocs/util.js
-Alias /elemutil.js $jsprefix/htdocs/elemutil.js
-Alias /xmlutil.js $jsprefix/htdocs/xmlutil.js
-Alias /atomutil.js $jsprefix/htdocs/atomutil.js
-Alias /jsonutil.js $jsprefix/htdocs/jsonutil.js
-Alias /ui.js $jsprefix/htdocs/ui.js
-Alias /ui.css $jsprefix/htdocs/ui.css
-Alias /ui-min.css $jsprefix/htdocs/ui-min.css
-Alias /scdl.js $jsprefix/htdocs/scdl.js
-Alias /all.js $jsprefix/htdocs/all.js
-Alias /all-min.js $jsprefix/htdocs/all-min.js
-
-EOF
-
-cat >>$root/conf/pubauth.conf <<EOF
-# Generated by: server-conf $*
-<Location /component.js>
-AuthType None
-Require all granted
-</Location>
-<Location /util.js>
-AuthType None
-Require all granted
-</Location>
-<Location /elemutil.js>
-AuthType None
-Require all granted
-</Location>
-<Location /xmlutil.js>
-AuthType None
-Require all granted
-</Location>
-<Location /atomutil.js>
-AuthType None
-Require all granted
-</Location>
-<Location /jsonutil.js>
-AuthType None
-Require all granted
-</Location>
-<Location /ui.js>
-AuthType None
-Require all granted
-</Location>
-<Location /ui.css>
-AuthType None
-Require all granted
-</Location>
-<Location /ui-min.css>
-AuthType None
-Require all granted
-</Location>
-<Location /scdl.js>
-AuthType None
-Require all granted
-</Location>
-<Location /all.js>
-AuthType None
-Require all granted
-</Location>
-<Location /all-min.js>
-AuthType None
-Require all granted
-</Location>
-
-EOF
+# Serve Javascript scripts and CSS
+$here/../js/js-conf $1
 
+# Configure SSL cert used for wiring
 ssl=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-ssl-conf"`
 if [ "$ssl" != "" ]; then
     cat >>$root/conf/httpd.conf <<EOF
author	jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>	2012-05-28 04:39:44 +0000
committer	jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>	2012-05-28 04:39:44 +0000
commit	7519724a171bb85246bb86bce453cbdd408691d9 (patch)
tree	3fd959c40a09fc496bf1f84d9fd25eaf9741fd5e /sca-cpp/trunk/modules
parent	4a28afdf7a6b193942f180862d443a7d818c5789 (diff)