First release of /delta version

8 files changed, 58 insertions, 62 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
@@ -65,15 +65,18 @@ class BackendBuilder(object):
 	def writeToFolder (self, folder, filename, content):
 		file = open(os.path.join(folder, filename), 'w')
 		file.write(content.encode('utf-8'))
 		file.close()
 		
 
-	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'] )
 
 		return result
 	
 
 	def formatMAC (self, value):
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
@@ -32,12 +32,14 @@ class FrontendBuilder(object):
 
 	#---------------------------------------------------------------------------
 
 	def name (self):
 		raise NotImplementedError()
 
+	def projectResourceTypes (self):
+		raise NotImplementedError()
 
 	def copyStaticResources (self, targetFolder):
 		raise NotImplementedError()
 
 	#---------------------------------------------------------------------------
 
@@ -90,15 +92,17 @@ class FrontendBuilder(object):
 #			except:
 #				pass
 
 		
 
 	def copyResourcesToFolder (self, targetFolder):
-		self.copyResources(self.projectDir, targetFolder, 'css')
-		self.copyResources(self.projectDir, targetFolder, 'js')
-		self.copyResources(self.projectDir, targetFolder, 'images')
+#		self.copyResources(self.projectDir, targetFolder, 'css')
+#		self.copyResources(self.projectDir, targetFolder, 'js')
+#		self.copyResources(self.projectDir, targetFolder, 'images')
+		for resoureceType in self.projectResourceTypes():
+			self.copyResources(self.projectDir, targetFolder, resoureceType)
 		self.copyStaticResources(targetFolder)
 	
 
 	def loadFilesContent (self, basePath, files):
 		result = ""
 		
@@ -241,62 +245,15 @@ class FrontendBuilder(object):
 		result = re.sub('\"',		'%22',			result)
 		result = re.sub('\'',		'%22',			result)
 		result = re.sub('\\\\',		'%5c',			result)
 		result = result.strip()
 		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
 		
 	
-
 	def bookmarklet (self):
 		cacheKey = 'bookmarklet'
 		if not self.processedFiles.has_key(cacheKey):
 			result = 'bookmarklet="' + self.packBookmarklet(self.loadFilesContent('js', ['Bookmarklet.js']), "regular") + '";bookmarklet_ie="' + self.packBookmarklet(self.loadFilesContent('js', ['Bookmarklet_IE.js']), "IE") + '";'
 			self.processedFiles[cacheKey] = result
 		else:
@@ -385,23 +342,27 @@ class FrontendBuilder(object):
 					)
 			jsLoadMode = 'EMBEDDED'
 
 		elif assemblyMode == 'DEBUG':
 			copyright = self.assembleCopyrightHeader()
 			css	=	self.cssTagsForFiles('./css', self.filterFiles(self.settings['css']))
-			js	=	self.scriptTagForContent(self.bookmarklet()) + \
+			js	=	self.scriptTagForContent(
+						self.bookmarklet()) + \
 				 	'\n' + \
-					self.scriptTagsForFiles('./js', self.filterFiles(self.settings['js']))
+						self.scriptTagsForFiles('./js', self.filterFiles(self.settings['js'])
+					)
 			jsLoadMode = 'LINKED'
 
 		elif assemblyMode == 'DEVELOPMENT':
 			copyright = ""
 			css	=	self.cssTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'css')), self.filterFiles(self.settings['css']))
-			js	=	self.scriptTagForContent(self.bookmarklet()) + \
+			js	=	self.scriptTagForContent(
+						self.bookmarklet()) + \
 				 	'\n' + \
-					self.scriptTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'js')), self.filterFiles(self.settings['js']))
+						self.scriptTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'js')), self.filterFiles(self.settings['js'])
+					)
 			jsLoadMode = 'LINKED'
 			versionType = 'development'
 
 		else:
 			raise NotImplementedError()
 
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
@@ -3,12 +3,15 @@ import shutil
 
 class BetaBuilder(FrontendBuilder):
 
 	def name(self):
 		return "/beta builder"
 
+	def projectResourceTypes (self):
+		return ['js', 'css', 'images']
+
 	def copyStaticResources (self, targetFolder):
 		for file in self.filterFiles(self.settings['staticResources']):
 			src = self.absolutePathForSourceFile('staticResources', file)
 			dst = self.absolutePathForTargetFile(targetFolder, '', file)
 			shutil.copy2(src, dst)
 
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
@@ -3,12 +3,15 @@ import shutil
 
 class GammaBuilder(FrontendBuilder):
 
 	def name(self):
 		return "/gamma builder"
 
+	def projectResourceTypes (self):
+		return ['js', 'css', 'images']
+
 	def copyStaticResources (self, targetFolder):
 		resourcesToCopy = [
 #			{'folder': 'html',	'source': 'exit_template.html',	'target': 'exit.html'},
 			{'folder': 'html',	'source': 'exit_template.html',	'target': 'logout.html'},
 			{'folder': 'css',	'source': 'static.css',			'target': 'static.css'}
 		]
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
@@ -2,8 +2,11 @@ from frontendBuilder import FrontendBuilder
 
 class Gamma_MobileBuilder(FrontendBuilder):
 
 	def name(self):
 		return "/gamma.mobile builder"
 
+	def projectResourceTypes (self):
+		return ['js', 'css', 'images']
+
 	def copyStaticResources (self, targetFolder):
 		pass
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
@@ -24,26 +24,33 @@ class ClipperzTestSite(server.Site):
 
 	def __init__(self, resource, logPath=None, timeout=60 * 60 * 12):
 		server.Site.__init__(self, resource, logPath, timeout)
 
 
 	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
 			request.sitepath = copy.copy(request.prepath)
 			result = resource.getChildForRequest(self.resource, request)
 
 		else:
-			pathParts = request.uri.split('/')
+			pathParts = uri.split('/')
 			version = pathParts[1]
 
 			if pathParts[2].startswith('index.'):
 				contentType = 'text/html'
 				absoluteFilePath = os.path.join(projectTargetDir(), 'dev', version, pathParts[2])
 				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: 
 #	http://homer.local:8888/beta/css/clipperz/images/loginInfoBackground.png
 #	pathParts: ['', 'beta', 'css', 'clipperz', 'images', 'loginInfoBackground.png']
 				try:
 					imagePathIndex = pathParts.index('images')
 					resourceType = 'images'
@@ -51,13 +58,13 @@ class ClipperzTestSite(server.Site):
 						del pathParts[2]
 				except:
 					resourceType = pathParts[2]
 
 				basePath = projectBaseDir() + '/frontend'
 				if resourceType == 'images':
-					fileExtension = os.path.splitext(request.uri)[1]
+					fileExtension = os.path.splitext(uri)[1]
 					if fileExtension == '.png':
 						contentType = 'image/png'
 					elif fileExtension == '.jpg':
 						contentType = 'image/jpeg'
 					elif fileExtension == '.gif':
 						contentType = 'image/gif'
@@ -72,23 +79,23 @@ class ClipperzTestSite(server.Site):
 						contentType = 'text/css'
 					elif resourceType == 'js':
 						contentType = 'text/javascript'
 					else:
 						contentType = 'text/html'
 					
-					absoluteFilePath = basePath + request.uri
+					absoluteFilePath = basePath + uri
 
 				result = static.File(absoluteFilePath, contentType)
 
 
 		return result
 
 
 
 def main ():
-	site = ClipperzTestSite(proxy.ReverseProxyResource('localhost', 8084, '/java-backend'))
+	site = ClipperzTestSite(proxy.ReverseProxyResource('localhost', 8080, '/java-backend'))
 	reactor.listenTCP(8888, site)
 	reactor.run()
 
 
 if __name__ == "__main__":
 	main()