[Checkins] SVN: bluebream/trunk/ Include the sample application in the `bluebream_simple` template
Baiju M
baiju.m.mail at gmail.com
Sat Mar 27 12:26:22 EDT 2010
Log message for revision 110236:
Include the sample application in the `bluebream_simple` template
Changed:
U bluebream/trunk/CHANGES.txt
D bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/tests/ftests.txt
A bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/app.py
U bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/configure.zcml_tmpl
A bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/ftests.txt_tmpl
U bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/index.pt
A bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/interfaces.py
A bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/views.py
U bluebream/trunk/src/bluebream/bluebream_simple/tests/bluebream.txt
-=-
Modified: bluebream/trunk/CHANGES.txt
===================================================================
--- bluebream/trunk/CHANGES.txt 2010-03-27 16:06:42 UTC (rev 110235)
+++ bluebream/trunk/CHANGES.txt 2010-03-27 16:26:21 UTC (rev 110236)
@@ -4,6 +4,8 @@
1.0a5 (unreleased)
------------------
+- Include the sample application in the `bluebream_simple` template
+
- Move the sample application provided by `bluebream` template
to a sub-package named `welcome` similar to `bluebream_simple`
The sample application can be easily removed.
Deleted: bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/tests/ftests.txt
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/tests/ftests.txt 2010-03-27 16:06:42 UTC (rev 110235)
+++ bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/tests/ftests.txt 2010-03-27 16:26:21 UTC (rev 110236)
@@ -1,12 +0,0 @@
-${project}
-
-:doctest:
-:functional-zcml-layer: ftesting.zcml
-
-Open browser and test::
-
- >>> from zope.testbrowser.testing import Browser
- >>> browser = Browser()
- >>> browser.open('http://localhost/@@index')
- >>> 'Welcome to BlueBream' in browser.contents
- True
Copied: bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/app.py (from rev 110235, bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+namespace_package+/+main_package+/welcome/app.py)
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/app.py (rev 0)
+++ bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/app.py 2010-03-27 16:26:21 UTC (rev 110236)
@@ -0,0 +1,11 @@
+from zope.interface import implements
+from zope.site.folder import Folder
+
+from interfaces import ISampleApplication
+
+
+class SampleApplication(Folder):
+
+ implements(ISampleApplication)
+ name = u""
+ description = u""
Modified: bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/configure.zcml_tmpl
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/configure.zcml_tmpl 2010-03-27 16:06:42 UTC (rev 110235)
+++ bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/configure.zcml_tmpl 2010-03-27 16:26:21 UTC (rev 110236)
@@ -1,17 +1,51 @@
<configure
- xmlns="http://namespaces.zope.org/browser"
- i18n_domain="${project}">
-
- <page
+ i18n_domain="${project}"
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:browser="http://namespaces.zope.org/browser">
+
+ <browser:resourceDirectory
+ name="static"
+ directory="static"
+ />
+
+ <!-- The following registration (page) is _not_ required for
+ functioning your application. This registration is given to
+ provide a default page when you access root folder from web
+ like: http://localhost:8080/ -->
+
+ <browser:page
for="zope.site.interfaces.IRootFolder"
name="index"
permission="zope.Public"
- template="index.pt"
+ class=".views.RootDefaultView"
/>
-
- <resourceDirectory
- name="static"
- directory="static"
+
+ <class class=".app.SampleApplication">
+ <implements
+ interface="zope.annotation.interfaces.IAttributeAnnotatable"
+ />
+ <implements
+ interface="zope.container.interfaces.IContentContainer"
+ />
+ <require
+ permission="zope.ManageContent"
+ interface=".interfaces.ISampleApplication"
+ set_schema=".interfaces.ISampleApplication"
+ />
+ </class>
+
+ <browser:page
+ for="zope.site.interfaces.IRootFolder"
+ name="add_sample_app"
+ permission="zope.ManageContent"
+ class=".views.AddSampleApplication"
/>
+ <browser:page
+ for=".interfaces.ISampleApplication"
+ name="index"
+ permission="zope.Public"
+ class=".views.SampleApplicationDefaultView"
+ />
+
</configure>
Copied: bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/ftests.txt_tmpl (from rev 110235, bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+namespace_package+/+main_package+/welcome/ftests.txt_tmpl)
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/ftests.txt_tmpl (rev 0)
+++ bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/ftests.txt_tmpl 2010-03-27 16:26:21 UTC (rev 110236)
@@ -0,0 +1,12 @@
+${project}
+
+:doctest:
+:functional-zcml-layer: ../tests/ftesting.zcml
+
+Open browser and test::
+
+ >>> from zope.testbrowser.testing import Browser
+ >>> browser = Browser()
+ >>> browser.open('http://localhost/@@index')
+ >>> 'Welcome to BlueBream' in browser.contents
+ True
Modified: bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/index.pt
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/index.pt 2010-03-27 16:06:42 UTC (rev 110235)
+++ bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/index.pt 2010-03-27 16:26:21 UTC (rev 110236)
@@ -14,5 +14,9 @@
<li><a href="https://mail.zope.org/mailman/listinfo/bluebream" target="_blank" title="BlueBream Mailing List">Mailing list</a></li>
<li><a href="http://webchat.freenode.net/?randomnick=1&channels=bluebream" target="_blank" title="IRC Channel on Freenode.net">IRC Channel: #bluebream at irc.freenode.net</a></li>
</ul>
+ <ul>
+ <li><a href="@@login.html" title="Login page">Login</a></li>
+ <li><a href="@@add_sample_app">Add Sample application</a></li>
+ </ul>
</body>
</html>
Copied: bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/interfaces.py (from rev 110235, bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+namespace_package+/+main_package+/welcome/interfaces.py)
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/interfaces.py (rev 0)
+++ bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/interfaces.py 2010-03-27 16:26:21 UTC (rev 110236)
@@ -0,0 +1,18 @@
+from zope.site.interfaces import IFolder
+from zope.schema import TextLine
+from zope.schema import Text
+
+class ISampleApplication(IFolder):
+ """The main application container."""
+
+ name = TextLine(
+ title=u"Name",
+ description=u"Name of application.",
+ default=u"",
+ required=True)
+
+ description = Text(
+ title=u"Description",
+ description=u"The name of application container.",
+ default=u"",
+ required=False)
Copied: bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/views.py (from rev 110235, bluebream/trunk/src/bluebream/bluebream_base/project_template/src/+namespace_package+/+main_package+/welcome/views.py)
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/views.py (rev 0)
+++ bluebream/trunk/src/bluebream/bluebream_simple/project_template/src/+project+/welcome/views.py 2010-03-27 16:26:21 UTC (rev 110236)
@@ -0,0 +1,32 @@
+from zope.browserpage import ViewPageTemplateFile
+from zope.container.interfaces import INameChooser
+from zope.formlib import form
+
+from interfaces import ISampleApplication
+from app import SampleApplication
+
+
+class RootDefaultView(form.DisplayForm):
+
+ __call__ = ViewPageTemplateFile('index.pt')
+
+
+class AddSampleApplication(form.AddForm):
+
+ form_fields = form.Fields(ISampleApplication)
+
+ def createAndAdd(self, data):
+ name = data['name']
+ description = data.get('description')
+ namechooser = INameChooser(self.context)
+ app = SampleApplication()
+ name = namechooser.chooseName(name, app)
+ self.context[name] = app
+ self.request.response.redirect(name)
+
+
+class SampleApplicationDefaultView(form.DisplayForm):
+
+ def __call__(self):
+ return """Welcome to the Sample application"""
+
Modified: bluebream/trunk/src/bluebream/bluebream_simple/tests/bluebream.txt
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_simple/tests/bluebream.txt 2010-03-27 16:06:42 UTC (rev 110235)
+++ bluebream/trunk/src/bluebream/bluebream_simple/tests/bluebream.txt 2010-03-27 16:26:21 UTC (rev 110236)
@@ -43,17 +43,20 @@
Creating ./sample/src/sample/tests/
Copying __init__.py to ./sample/src/sample/tests/__init__.py
Copying ftesting.zcml_tmpl to ./sample/src/sample/tests/ftesting.zcml
- Copying ftests.txt to ./sample/src/sample/tests/ftests.txt
Copying tests.py_tmpl to ./sample/src/sample/tests/tests.py
Recursing into welcome
Creating ./sample/src/sample/welcome/
Copying __init__.py to ./sample/src/sample/welcome/__init__.py
+ Copying app.py to ./sample/src/sample/welcome/app.py
Copying configure.zcml_tmpl to ./sample/src/sample/welcome/configure.zcml
+ Copying ftests.txt_tmpl to ./sample/src/sample/welcome/ftests.txt
Copying index.pt to ./sample/src/sample/welcome/index.pt
+ Copying interfaces.py to ./sample/src/sample/welcome/interfaces.py
Recursing into static
Creating ./sample/src/sample/welcome/static/
Copying logo.png to ./sample/src/sample/welcome/static/logo.png
Copying style.css to ./sample/src/sample/welcome/static/style.css
+ Copying views.py to ./sample/src/sample/welcome/views.py
Recursing into +project+.egg-info
Creating ./sample/src/sample.egg-info/
Copying PKG-INFO to ./sample/src/sample.egg-info/PKG-INFO
@@ -71,7 +74,6 @@
Copying versions.cfg to ./sample/versions.cfg
Running python setup.py egg_info
-
Project name: uppercase
-----------------------
@@ -106,17 +108,20 @@
Creating ./Sample/src/Sample/tests/
Copying __init__.py to ./Sample/src/Sample/tests/__init__.py
Copying ftesting.zcml_tmpl to ./Sample/src/Sample/tests/ftesting.zcml
- Copying ftests.txt to ./Sample/src/Sample/tests/ftests.txt
Copying tests.py_tmpl to ./Sample/src/Sample/tests/tests.py
Recursing into welcome
Creating ./Sample/src/Sample/welcome/
Copying __init__.py to ./Sample/src/Sample/welcome/__init__.py
+ Copying app.py to ./Sample/src/Sample/welcome/app.py
Copying configure.zcml_tmpl to ./Sample/src/Sample/welcome/configure.zcml
+ Copying ftests.txt_tmpl to ./Sample/src/Sample/welcome/ftests.txt
Copying index.pt to ./Sample/src/Sample/welcome/index.pt
+ Copying interfaces.py to ./Sample/src/Sample/welcome/interfaces.py
Recursing into static
Creating ./Sample/src/Sample/welcome/static/
Copying logo.png to ./Sample/src/Sample/welcome/static/logo.png
Copying style.css to ./Sample/src/Sample/welcome/static/style.css
+ Copying views.py to ./Sample/src/Sample/welcome/views.py
Recursing into +project+.egg-info
Creating ./Sample/src/Sample.egg-info/
Copying PKG-INFO to ./Sample/src/Sample.egg-info/PKG-INFO
@@ -132,4 +137,4 @@
Creating ./Sample/var/log/
Copying README.txt to ./Sample/var/log/README.txt
Copying versions.cfg to ./Sample/versions.cfg
-Running /usr/bin/python setup.py egg_info
+Running python setup.py egg_info
More information about the checkins
mailing list