Browse Source

cleaned up plaintext and json and removed some of the log messages

Keith Newman 10 years ago
parent
commit
4d0715b2a3

+ 2 - 0
frameworks/Python/historical/install.sh

@@ -14,3 +14,5 @@ rm Webware-1.1.1.tar.gz
 wget downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz
 wget downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz
 tar -xf Webware-1.1.1.tar.gz
 tar -xf Webware-1.1.1.tar.gz
 cp -r app/ Webware-1.1.1/
 cp -r app/ Webware-1.1.1/
+#rm -fr Webware-1.1.1/WebKit/Configs
+#cp -r app/Configs/ Webware-1.1.1/WebKit/Configs/

+ 1 - 0
frameworks/Python/historical/webware/.gitignore

@@ -0,0 +1 @@
+Webware*

+ 2 - 2
frameworks/Python/historical/webware/app/Configs/AppServer.config

@@ -1,7 +1,7 @@
 # AppServer.config file for Webware for Python
 # AppServer.config file for Webware for Python
 
 
-PrintConfigAtStartUp = True
-Verbose = True # verbose output
+PrintConfigAtStartUp = False
+Verbose = False # verbose output
 
 
 PlugInDirs = [WebwarePath] # load all Webware plug-ins
 PlugInDirs = [WebwarePath] # load all Webware plug-ins
 PlugIns = [] # use this if you want to load specific plug-ins only
 PlugIns = [] # use this if you want to load specific plug-ins only

+ 4 - 0
frameworks/Python/historical/webware/app/Configs/Application.config

@@ -1,2 +1,6 @@
 Contexts = {}
 Contexts = {}
 Contexts['default'] = 'Context'
 Contexts['default'] = 'Context'
+
+PrintConfigAtStartUp = False
+LogActivity = False
+Verbose = False

+ 1 - 1
frameworks/Python/historical/webware/app/Context/json2.py

@@ -5,5 +5,5 @@ import json
 class json2(HTTPContent):
 class json2(HTTPContent):
     def defaultAction(self):
     def defaultAction(self):
         self.response().clearHeaders()
         self.response().clearHeaders()
-        self.response()._headers["Content-Type"] = "application/json; charset=UTF-8"		
+        self.response()._headers["Content-Type"] = "application/json"		
         self.write(json.dumps({"message": "Hello, World!"}))
         self.write(json.dumps({"message": "Hello, World!"}))

+ 1 - 1
frameworks/Python/historical/webware/app/Context/plaintext.py

@@ -4,5 +4,5 @@ from WebKit.HTTPContent import HTTPContent
 class plaintext(HTTPContent):
 class plaintext(HTTPContent):
     def defaultAction(self):
     def defaultAction(self):
     	self.response().clearHeaders()
     	self.response().clearHeaders()
-        self.response()._headers["Content-Type"] = "text/plain; charset=UTF-8"
+        self.response()._headers["Content-Type"] = "text/plain"
         self.write("Hello, World!")
         self.write("Hello, World!")

+ 0 - 14
frameworks/Python/historical/webware/install.sh

@@ -1,14 +0,0 @@
-
-export PY2_ROOT=$IROOT/py2
-export PY2=$PY2_ROOT/bin/python
-export PY2_PIP=$PY2_ROOT/bin/pip
-
-mkdir -p $IROOT/.pip_cache
-export PIP_DOWNLOAD_CACHE=$IROOT/.pip_cache
-
-fw_depends python2 apache
-
-cd $TROOT/webware rm -fr Webware
-wget downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz -O Webware.tar.gz
-tar -xf Webware.tar.gz
-cp -r app/ Webware/

+ 2 - 2
frameworks/Python/historical/webware/setup.sh

@@ -4,6 +4,6 @@ export PY2_ROOT=$IROOT/py2
 export PY2=$PY2_ROOT/bin/python
 export PY2=$PY2_ROOT/bin/python
 
 
 cd $TROOT/webware/Webware-1.1.1
 cd $TROOT/webware/Webware-1.1.1
-sudo $PY2 install.py --no-password-prompt
+$PY2 install.py --no-password-prompt 
 cd $TROOT/webware/Webware-1.1.1/app
 cd $TROOT/webware/Webware-1.1.1/app
-sudo $PY2 Launch.py &
+$PY2 Launch.py &