First release of /delta version

author: Giulio Cesare Solaroli <giulio.cesare@clipperz.com> 2013-08-30 15:56:53 (UTC)
committer: Giulio Cesare Solaroli <giulio.cesare@clipperz.com> 2013-08-30 21:23:42 (UTC)
commit: 20bea94ab6b91c85b171dcf86baba0a64169d508 (patch) (unidiff)
tree: 6e38e91498dcdb861620eba1e237d1026fe79cc5 /scripts
parent: bde3c7b98523112ade9c5bbf7390c4ecb494cd2e (diff)
download: clipperz-20bea94ab6b91c85b171dcf86baba0a64169d508.zip
clipperz-20bea94ab6b91c85b171dcf86baba0a64169d508.tar.gz
clipperz-20bea94ab6b91c85b171dcf86baba0a64169d508.tar.bz2
8 files changed, 60 insertions, 64 deletions
diff --git a/scripts/builder/backendBuilder.py b/scripts/builder/backendBuilder.py
index b4ee990..ad6595c 100755
--- a/scripts/builder/backendBuilder.py
+++ b/scripts/builder/backendBuilder.py
@@ -70,5 +70,8 @@ class BackendBuilder(object):
-        def configureIndexContent (self, indexContent, requestPathPrefix = ".."):
+        #def configureIndexContent (self, indexContent, requestPathPrefix = ".."):
+        def configureIndexContent (self, indexContent):
                result = indexContent
-                result = result.replace( '@request.path@',    requestPathPrefix + '/' + self.settings['request.path']    )
+        #       result = result.replace( '@request.path@',    requestPathPrefix + '/' + self.settings['request.path']    )
+                result = result.replace( '@request.path@',    self.settings['request.path']    )
+                result = result.replace( '@dump.path@',       self.settings['dump.path']       )
                result = result.replace( '@should.pay.toll@', self.settings['should.pay.toll'] )
diff --git a/scripts/builder/backends/phpBuilder.py b/scripts/builder/backends/phpBuilder.py
index c928aa0..c928aa0 100755..100644
--- a/scripts/builder/backends/phpBuilder.py
+++ b/scripts/builder/backends/phpBuilder.py
diff --git a/scripts/builder/frontendBuilder.py b/scripts/builder/frontendBuilder.py
index e52c31e..b72179f 100644
--- a/scripts/builder/frontendBuilder.py
+++ b/scripts/builder/frontendBuilder.py
@@ -37,2 +37,4 @@ class FrontendBuilder(object):
+        def projectResourceTypes (self):
+                raise NotImplementedError()
@@ -95,5 +97,7 @@ class FrontendBuilder(object):
        def copyResourcesToFolder (self, targetFolder):
-                self.copyResources(self.projectDir, targetFolder, 'css')
+        #       self.copyResources(self.projectDir, targetFolder, 'css')
-                self.copyResources(self.projectDir, targetFolder, 'js')
+        #       self.copyResources(self.projectDir, targetFolder, 'js')
-                self.copyResources(self.projectDir, targetFolder, 'images')
+        #       self.copyResources(self.projectDir, targetFolder, 'images')
+                for resoureceType in self.projectResourceTypes():
+                        self.copyResources(self.projectDir, targetFolder, resoureceType)
                self.copyStaticResources(targetFolder)
@@ -245,51 +249,4 @@ class FrontendBuilder(object):
                result = 'javascript:' + result
-        #       replacers = [
-        #                       ('aForm',                       '_1' ),
-        #                       ('inputFields',                 '_2' ),
-        #                       ('passwordFieldsFound','_3' ),
-        #                       ('aDocument',           '_6' ),
-        #                       ('aLevel',                      '_7' ),
-        #               #       ('result',                      '_8' ),
-        #                       ('documentForms',       '_9' ),
-        #                       ('iFrames',                     '_c' ),
-        #                       ('anInputElement',      '_d' ),
-        #                       ('options',                     '_f' ),
-        #                       ('option',                      '_12'),
-        #                       ('aLoginForm',          '_13'),
-        #               #       ('action',                      '_17'),
-        #                       ('radioValues',                 '_18'),
-        #                       ('radioValueName',      '_19'),
-        #                       ('inputElement',        '_1a'),
-        #                       ('elementValues',       '_1b'),
-        #                       ('radioValue',          '_1c'),
-        #                       ('values',                      '_1d'),
-        #                       ('objtype',                     '_21'),
-        #                       ('useKey',                      '_27'),
-        #                       ('bookmarkletDiv',      '_28'),
-        #                       ('someParameters',      '_29'),
-        #                       ('anException',                 '_2a'),
-        #                       ('newDiv',                      '_2b'),
-        #                       ('base_url',            '_2c'),
-        #                       ('help_url',            '_2d'),
-        #                       ('logo_image_url',      '_2e'),
-        #               ('background_image_url','_2f'),
-        #                       ('close_image_url',     '_30'),
-        #               #('bookmarklet_textarea','_31'),
-        #                       ('innerHTML',           '_32'),
-        #       ]
-        #       for replacer in replacers:
-        #               result = re.sub('([^\.])' + replacer[0], '\\1' + replacer[1], result)
-        #       replacers = [
-        #                       ('headNode',            '_1' ),
-        #                       ('clipperzScriptNode','_2' ),
-        #       ]
-        #       for replacer in replacers:
-        #               result = re.sub('([^\.])' + replacer[0], '\\1' + replacer[1], result)
-        #       result = re.sub(';', ';\n', result)
                
                return result
-                
        
@@ -390,5 +347,7 @@ class FrontendBuilder(object):
                                css     =self.cssTagsForFiles('./css', self.filterFiles(self.settings['css']))
-                                js      =self.scriptTagForContent(self.bookmarklet()) + \
+                                js      =self.scriptTagForContent(
-                                         '\n' + \
+                                                self.bookmarklet()) + \
-                                        self.scriptTagsForFiles('./js', self.filterFiles(self.settings['js']))
+                                                '\n' + \
+                                                self.scriptTagsForFiles('./js', self.filterFiles(self.settings['js'])
+                                        )
                        jsLoadMode = 'LINKED'
@@ -398,5 +357,7 @@ class FrontendBuilder(object):
                                css     =self.cssTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'css')), self.filterFiles(self.settings['css']))
-                                js      =self.scriptTagForContent(self.bookmarklet()) + \
+                                js      =self.scriptTagForContent(
-                                         '\n' + \
+                                                self.bookmarklet()) + \
-                                        self.scriptTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'js')), self.filterFiles(self.settings['js']))
+                                                 '\n' + \
+                                                self.scriptTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'js')), self.filterFiles(self.settings['js'])
+                                        )
                        jsLoadMode = 'LINKED'
diff --git a/scripts/builder/frontends/betaBuilder.py b/scripts/builder/frontends/betaBuilder.py
index c5a3e76..9b32404 100644
--- a/scripts/builder/frontends/betaBuilder.py
+++ b/scripts/builder/frontends/betaBuilder.py
@@ -8,2 +8,5 @@ class BetaBuilder(FrontendBuilder):
+        def projectResourceTypes (self):
+                return ['js', 'css', 'images']
        def copyStaticResources (self, targetFolder):
diff --git a/scripts/builder/frontends/deltaBuilder.py b/scripts/builder/frontends/deltaBuilder.py
new file mode 100644
index 0000000..a341a83
--- a/dev/null
+++ b/scripts/builder/frontends/deltaBuilder.py
@@ -0,0 +1,16 @@
+from frontendBuilder import FrontendBuilder
+import shutil
+class DeltaBuilder(FrontendBuilder):
+        def name(self):
+                return "/delta builder"
+        def projectResourceTypes (self):
+                return ['js', 'css']
+        def copyStaticResources (self, targetFolder):
+                pass
+        def bookmarklet (self):
+                return ""
+\ No newline at end of file
diff --git a/scripts/builder/frontends/gammaBuilder.py b/scripts/builder/frontends/gammaBuilder.py
index a6ecb7b..c56fb1b 100644
--- a/scripts/builder/frontends/gammaBuilder.py
+++ b/scripts/builder/frontends/gammaBuilder.py
@@ -8,2 +8,5 @@ class GammaBuilder(FrontendBuilder):
+        def projectResourceTypes (self):
+                return ['js', 'css', 'images']
        def copyStaticResources (self, targetFolder):
diff --git a/scripts/builder/frontends/gamma_mobileBuilder.py b/scripts/builder/frontends/gamma_mobileBuilder.py
index f2e80c9..677a2b0 100644
--- a/scripts/builder/frontends/gamma_mobileBuilder.py
+++ b/scripts/builder/frontends/gamma_mobileBuilder.py
@@ -7,2 +7,5 @@ class Gamma_MobileBuilder(FrontendBuilder):
+        def projectResourceTypes (self):
+                return ['js', 'css', 'images']
        def copyStaticResources (self, targetFolder):
diff --git a/scripts/proxy/main.py b/scripts/proxy/main.py
index 107ba16..8ce4989 100755
--- a/scripts/proxy/main.py
+++ b/scripts/proxy/main.py
@@ -29,3 +29,6 @@ class ClipperzTestSite(server.Site):
        def getResourceFor(self, request):
-                if request.uri.startswith('/json') or request.uri.startswith('/dump'):
+                uri = request.uri
+                uri = uri.split("?", 1)[0]
+                uri = uri.split("#", 1)[0]
+                if uri.startswith('/json') or uri.startswith('/dump'):
                        request.site = self
@@ -35,3 +38,3 @@ class ClipperzTestSite(server.Site):
                else:
-                        pathParts = request.uri.split('/')
+                        pathParts = uri.split('/')
                        version = pathParts[1]
@@ -42,3 +45,7 @@ class ClipperzTestSite(server.Site):
                                result = static.File(absoluteFilePath, contentType)
+                        elif pathParts[2].endswith('.webapp'):
+                                contentType = 'application/x-web-app-manifest+json'
+        #                       absoluteFilePath = os.path.join(projectTargetDir(), 'dev', version, pathParts[2])
+                                absoluteFilePath = os.path.join(projectBaseDir(), 'frontend', version, 'properties', pathParts[2])
+                                result = static.File(absoluteFilePath, contentType)
                        else: 
@@ -56,3 +63,3 @@ class ClipperzTestSite(server.Site):
                                if resourceType == 'images':
-                                        fileExtension = os.path.splitext(request.uri)[1]
+                                        fileExtension = os.path.splitext(uri)[1]
                                        if fileExtension == '.png':
@@ -77,3 +84,3 @@ class ClipperzTestSite(server.Site):
                                        
-                                        absoluteFilePath = basePath + request.uri
+                                        absoluteFilePath = basePath + uri
@@ -87,3 +94,3 @@ class ClipperzTestSite(server.Site):
 def main ():
-        site = ClipperzTestSite(proxy.ReverseProxyResource('localhost', 8084, '/java-backend'))
+        site = ClipperzTestSite(proxy.ReverseProxyResource('localhost', 8080, '/java-backend'))
        reactor.listenTCP(8888, site)
author	Giulio Cesare Solaroli <giulio.cesare@clipperz.com>	2013-08-30 15:56:53 (UTC)
committer	Giulio Cesare Solaroli <giulio.cesare@clipperz.com>	2013-08-30 21:23:42 (UTC)
commit	20bea94ab6b91c85b171dcf86baba0a64169d508 (patch) (unidiff)
tree	6e38e91498dcdb861620eba1e237d1026fe79cc5 /scripts
parent	bde3c7b98523112ade9c5bbf7390c4ecb494cd2e (diff)
download	clipperz-20bea94ab6b91c85b171dcf86baba0a64169d508.zip clipperz-20bea94ab6b91c85b171dcf86baba0a64169d508.tar.gz clipperz-20bea94ab6b91c85b171dcf86baba0a64169d508.tar.bz2

diff --git a/scripts/builder/backendBuilder.py b/scripts/builder/backendBuilder.py index b4ee990..ad6595c 100755 --- a/scripts/builder/backendBuilder.py +++ b/scripts/builder/backendBuilder.py
@@ -70,5 +70,8 @@ class BackendBuilder(object):
70		70
71	def configureIndexContent (self, indexContent, requestPathPrefix = ".."):	71	#def configureIndexContent (self, indexContent, requestPathPrefix = ".."):
		72	def configureIndexContent (self, indexContent):
72	result = indexContent	73	result = indexContent
73	result = result.replace( '@request.path@', requestPathPrefix + '/' + self.settings['request.path'] )	74	# result = result.replace( '@request.path@', requestPathPrefix + '/' + self.settings['request.path'] )
		75	result = result.replace( '@request.path@', self.settings['request.path'] )
		76	result = result.replace( '@dump.path@', self.settings['dump.path'] )
74	result = result.replace( '@should.pay.toll@', self.settings['should.pay.toll'] )	77	result = result.replace( '@should.pay.toll@', self.settings['should.pay.toll'] )


diff --git a/scripts/builder/backends/phpBuilder.py b/scripts/builder/backends/phpBuilder.py index c928aa0..c928aa0 100755..100644 --- a/scripts/builder/backends/phpBuilder.py +++ b/scripts/builder/backends/phpBuilder.py


diff --git a/scripts/builder/frontendBuilder.py b/scripts/builder/frontendBuilder.py index e52c31e..b72179f 100644 --- a/scripts/builder/frontendBuilder.py +++ b/scripts/builder/frontendBuilder.py
@@ -37,2 +37,4 @@ class FrontendBuilder(object):
37		37
		38	def projectResourceTypes (self):
		39	raise NotImplementedError()
38		40
@@ -95,5 +97,7 @@ class FrontendBuilder(object):
95	def copyResourcesToFolder (self, targetFolder):	97	def copyResourcesToFolder (self, targetFolder):
96	self.copyResources(self.projectDir, targetFolder, 'css')	98	# self.copyResources(self.projectDir, targetFolder, 'css')
97	self.copyResources(self.projectDir, targetFolder, 'js')	99	# self.copyResources(self.projectDir, targetFolder, 'js')
98	self.copyResources(self.projectDir, targetFolder, 'images')	100	# self.copyResources(self.projectDir, targetFolder, 'images')
		101	for resoureceType in self.projectResourceTypes():
		102	self.copyResources(self.projectDir, targetFolder, resoureceType)
99	self.copyStaticResources(targetFolder)	103	self.copyStaticResources(targetFolder)
@@ -245,51 +249,4 @@ class FrontendBuilder(object):
245	result = 'javascript:' + result	249	result = 'javascript:' + result
246
247	# replacers = [
248	# ('aForm', '_1' ),
249	# ('inputFields', '_2' ),
250	# ('passwordFieldsFound','_3' ),
251	# ('aDocument', '_6' ),
252	# ('aLevel', '_7' ),
253	# # ('result', '_8' ),
254	# ('documentForms', '_9' ),
255	# ('iFrames', '_c' ),
256	# ('anInputElement', '_d' ),
257	# ('options', '_f' ),
258	# ('option', '_12'),
259	# ('aLoginForm', '_13'),
260	# # ('action', '_17'),
261	# ('radioValues', '_18'),
262	# ('radioValueName', '_19'),
263	# ('inputElement', '_1a'),
264	# ('elementValues', '_1b'),
265	# ('radioValue', '_1c'),
266	# ('values', '_1d'),
267	# ('objtype', '_21'),
268	# ('useKey', '_27'),
269	# ('bookmarkletDiv', '_28'),
270	# ('someParameters', '_29'),
271	# ('anException', '_2a'),
272	# ('newDiv', '_2b'),
273	# ('base_url', '_2c'),
274	# ('help_url', '_2d'),
275	# ('logo_image_url', '_2e'),
276	# ('background_image_url','_2f'),
277	# ('close_image_url', '_30'),
278	# #('bookmarklet_textarea','_31'),
279	# ('innerHTML', '_32'),
280	# ]
281	# for replacer in replacers:
282	# result = re.sub('([^\.])' + replacer[0], '\\1' + replacer[1], result)
283
284	# replacers = [
285	# ('headNode', '_1' ),
286	# ('clipperzScriptNode','_2' ),
287	# ]
288	# for replacer in replacers:
289	# result = re.sub('([^\.])' + replacer[0], '\\1' + replacer[1], result)
290
291	# result = re.sub(';', ';\n', result)
292		250
293	return result	251	return result
294
295		252
@@ -390,5 +347,7 @@ class FrontendBuilder(object):
390	css =self.cssTagsForFiles('./css', self.filterFiles(self.settings['css']))	347	css =self.cssTagsForFiles('./css', self.filterFiles(self.settings['css']))
391	js =self.scriptTagForContent(self.bookmarklet()) + \	348	js =self.scriptTagForContent(
392	'\n' + \	349	self.bookmarklet()) + \
393	self.scriptTagsForFiles('./js', self.filterFiles(self.settings['js']))	350	'\n' + \
		351	self.scriptTagsForFiles('./js', self.filterFiles(self.settings['js'])
		352	)
394	jsLoadMode = 'LINKED'	353	jsLoadMode = 'LINKED'
@@ -398,5 +357,7 @@ class FrontendBuilder(object):
398	css =self.cssTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'css')), self.filterFiles(self.settings['css']))	357	css =self.cssTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'css')), self.filterFiles(self.settings['css']))
399	js =self.scriptTagForContent(self.bookmarklet()) + \	358	js =self.scriptTagForContent(
400	'\n' + \	359	self.bookmarklet()) + \
401	self.scriptTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'js')), self.filterFiles(self.settings['js']))	360	'\n' + \
		361	self.scriptTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'js')), self.filterFiles(self.settings['js'])
		362	)
402	jsLoadMode = 'LINKED'	363	jsLoadMode = 'LINKED'


diff --git a/scripts/builder/frontends/betaBuilder.py b/scripts/builder/frontends/betaBuilder.py index c5a3e76..9b32404 100644 --- a/scripts/builder/frontends/betaBuilder.py +++ b/scripts/builder/frontends/betaBuilder.py
@@ -8,2 +8,5 @@ class BetaBuilder(FrontendBuilder):
8		8
		9	def projectResourceTypes (self):
		10	return ['js', 'css', 'images']
		11
9	def copyStaticResources (self, targetFolder):	12	def copyStaticResources (self, targetFolder):


diff --git a/scripts/builder/frontends/deltaBuilder.py b/scripts/builder/frontends/deltaBuilder.py new file mode 100644 index 0000000..a341a83 --- a/dev/null +++ b/scripts/builder/frontends/deltaBuilder.py
@@ -0,0 +1,16 @@
		1	from frontendBuilder import FrontendBuilder
		2	import shutil
		3
		4	class DeltaBuilder(FrontendBuilder):
		5
		6	def name(self):
		7	return "/delta builder"
		8
		9	def projectResourceTypes (self):
		10	return ['js', 'css']
		11
		12	def copyStaticResources (self, targetFolder):
		13	pass
		14
		15	def bookmarklet (self):
		16	return "" \ No newline at end of file


diff --git a/scripts/builder/frontends/gammaBuilder.py b/scripts/builder/frontends/gammaBuilder.py index a6ecb7b..c56fb1b 100644 --- a/scripts/builder/frontends/gammaBuilder.py +++ b/scripts/builder/frontends/gammaBuilder.py
@@ -8,2 +8,5 @@ class GammaBuilder(FrontendBuilder):
8		8
		9	def projectResourceTypes (self):
		10	return ['js', 'css', 'images']
		11
9	def copyStaticResources (self, targetFolder):	12	def copyStaticResources (self, targetFolder):


diff --git a/scripts/builder/frontends/gamma_mobileBuilder.py b/scripts/builder/frontends/gamma_mobileBuilder.py index f2e80c9..677a2b0 100644 --- a/scripts/builder/frontends/gamma_mobileBuilder.py +++ b/scripts/builder/frontends/gamma_mobileBuilder.py
@@ -7,2 +7,5 @@ class Gamma_MobileBuilder(FrontendBuilder):
7		7
		8	def projectResourceTypes (self):
		9	return ['js', 'css', 'images']
		10
8	def copyStaticResources (self, targetFolder):	11	def copyStaticResources (self, targetFolder):


diff --git a/scripts/proxy/main.py b/scripts/proxy/main.py index 107ba16..8ce4989 100755 --- a/scripts/proxy/main.py +++ b/scripts/proxy/main.py
@@ -29,3 +29,6 @@ class ClipperzTestSite(server.Site):
29	def getResourceFor(self, request):	29	def getResourceFor(self, request):
30	if request.uri.startswith('/json') or request.uri.startswith('/dump'):	30	uri = request.uri
		31	uri = uri.split("?", 1)[0]
		32	uri = uri.split("#", 1)[0]
		33	if uri.startswith('/json') or uri.startswith('/dump'):
31	request.site = self	34	request.site = self
@@ -35,3 +38,3 @@ class ClipperzTestSite(server.Site):
35	else:	38	else:
36	pathParts = request.uri.split('/')	39	pathParts = uri.split('/')
37	version = pathParts[1]	40	version = pathParts[1]
@@ -42,3 +45,7 @@ class ClipperzTestSite(server.Site):
42	result = static.File(absoluteFilePath, contentType)	45	result = static.File(absoluteFilePath, contentType)
43		46	elif pathParts[2].endswith('.webapp'):
		47	contentType = 'application/x-web-app-manifest+json'
		48	# absoluteFilePath = os.path.join(projectTargetDir(), 'dev', version, pathParts[2])
		49	absoluteFilePath = os.path.join(projectBaseDir(), 'frontend', version, 'properties', pathParts[2])
		50	result = static.File(absoluteFilePath, contentType)
44	else:	51	else:
@@ -56,3 +63,3 @@ class ClipperzTestSite(server.Site):
56	if resourceType == 'images':	63	if resourceType == 'images':
57	fileExtension = os.path.splitext(request.uri)[1]	64	fileExtension = os.path.splitext(uri)[1]
58	if fileExtension == '.png':	65	if fileExtension == '.png':
@@ -77,3 +84,3 @@ class ClipperzTestSite(server.Site):
77		84
78	absoluteFilePath = basePath + request.uri	85	absoluteFilePath = basePath + uri
79		86
@@ -87,3 +94,3 @@ class ClipperzTestSite(server.Site):
87	def main ():	94	def main ():
88	site = ClipperzTestSite(proxy.ReverseProxyResource('localhost', 8084, '/java-backend'))	95	site = ClipperzTestSite(proxy.ReverseProxyResource('localhost', 8080, '/java-backend'))
89	reactor.listenTCP(8888, site)	96	reactor.listenTCP(8888, site)