[Checkins] SVN: bluebream/trunk/ Fix. Main package name is hard-coded as 'main'
Baiju M
baiju.m.mail at gmail.com
Sat Jan 9 22:01:16 EST 2010
Log message for revision 107970:
Fix. Main package name is hard-coded as 'main'
Changed:
U bluebream/trunk/CHANGES.txt
U bluebream/trunk/src/bluebream/project_template/etc/site.zcml_tmpl
U bluebream/trunk/src/bluebream/project_template/setup.py_tmpl
A bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/+main_package+/
U bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/+main_package+/application.zcml_tmpl
U bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/+main_package+/configure.zcml_tmpl
U bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/+main_package+/ftesting.zcml_tmpl
U bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/+main_package+/tests.py_tmpl
D bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/main/
U bluebream/trunk/src/bluebream/template.py
U bluebream/trunk/src/bluebream/tests/bluebream.txt
-=-
Modified: bluebream/trunk/CHANGES.txt
===================================================================
--- bluebream/trunk/CHANGES.txt 2010-01-10 02:42:24 UTC (rev 107969)
+++ bluebream/trunk/CHANGES.txt 2010-01-10 03:01:16 UTC (rev 107970)
@@ -5,6 +5,7 @@
------------------
- Update version: zope.tales = 3.5.0
+- LP #505362: Fix. Main package name is hard-coded as 'main'
0.1.6 (2010-01-07)
------------------
Modified: bluebream/trunk/src/bluebream/project_template/etc/site.zcml_tmpl
===================================================================
--- bluebream/trunk/src/bluebream/project_template/etc/site.zcml_tmpl 2010-01-10 02:42:24 UTC (rev 107969)
+++ bluebream/trunk/src/bluebream/project_template/etc/site.zcml_tmpl 2010-01-10 03:01:16 UTC (rev 107970)
@@ -22,7 +22,7 @@
<include package="zope.app.publication" />
<include package="zope.principalregistry" />
- <include package="${namespace_package}.main" file="securitypolicy.zcml" />
- <include package="${namespace_package}.main" file="application.zcml" />
+ <include package="${namespace_package}.${main_package}" file="securitypolicy.zcml" />
+ <include package="${namespace_package}.${main_package}" file="application.zcml" />
</configure>
Modified: bluebream/trunk/src/bluebream/project_template/setup.py_tmpl
===================================================================
--- bluebream/trunk/src/bluebream/project_template/setup.py_tmpl 2010-01-10 02:42:24 UTC (rev 107969)
+++ bluebream/trunk/src/bluebream/project_template/setup.py_tmpl 2010-01-10 03:01:16 UTC (rev 107970)
@@ -55,6 +55,6 @@
],
entry_points = """
[paste.app_factory]
- main = ${namespace_package}.main.startup:application_factory
+ main = ${namespace_package}.${main_package}.startup:application_factory
""",
)
Modified: bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/+main_package+/application.zcml_tmpl
===================================================================
--- bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/main/application.zcml_tmpl 2010-01-10 02:15:34 UTC (rev 107968)
+++ bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/+main_package+/application.zcml_tmpl 2010-01-10 03:01:16 UTC (rev 107970)
@@ -1,7 +1,7 @@
<configure
- i18n_domain="${namespace_package}.main"
+ i18n_domain="${namespace_package}.${main_package}"
xmlns="http://namespaces.zope.org/zope">
- <include package="${namespace_package}.main" />
+ <include package="${namespace_package}.${main_package}" />
</configure>
Modified: bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/+main_package+/configure.zcml_tmpl
===================================================================
--- bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/main/configure.zcml_tmpl 2010-01-10 02:15:34 UTC (rev 107968)
+++ bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/+main_package+/configure.zcml_tmpl 2010-01-10 03:01:16 UTC (rev 107970)
@@ -1,5 +1,5 @@
<configure
- i18n_domain="testp.main"
+ i18n_domain="${namespace_package}.${main_package}"
xmlns="http://namespaces.zope.org/browser">
<!-- The following two registrations (defaultView & page) are _not_
Modified: bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/+main_package+/ftesting.zcml_tmpl
===================================================================
--- bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/main/ftesting.zcml_tmpl 2010-01-10 02:15:34 UTC (rev 107968)
+++ bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/+main_package+/ftesting.zcml_tmpl 2010-01-10 03:01:16 UTC (rev 107970)
@@ -23,8 +23,8 @@
<include package="zope.app.publication" />
<include package="zope.principalregistry" />
- <include package="${namespace_package}.main" file="securitypolicy.zcml" />
- <include package="${namespace_package}.main" file="application.zcml" />
+ <include package="${namespace_package}.${main_package}" file="securitypolicy.zcml" />
+ <include package="${namespace_package}.${main_package}" file="application.zcml" />
<!-- Typical functional testing security setup -->
<securityPolicy
Modified: bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/+main_package+/tests.py_tmpl
===================================================================
--- bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/main/tests.py_tmpl 2010-01-10 02:15:34 UTC (rev 107968)
+++ bluebream/trunk/src/bluebream/project_template/src/+namespace_package+/+main_package+/tests.py_tmpl 2010-01-10 03:01:16 UTC (rev 107970)
@@ -1,3 +1,3 @@
import z3c.testsetup
-test_suite = z3c.testsetup.register_all_tests('${namespace_package}.main')
+test_suite = z3c.testsetup.register_all_tests('${namespace_package}.${main_package}')
Modified: bluebream/trunk/src/bluebream/template.py
===================================================================
--- bluebream/trunk/src/bluebream/template.py 2010-01-10 02:42:24 UTC (rev 107969)
+++ bluebream/trunk/src/bluebream/template.py 2010-01-10 03:01:16 UTC (rev 107970)
@@ -23,6 +23,9 @@
vars = [
var('namespace_package', 'Namespace package name'),
+ var('main_package',
+ 'Main package name (under the namespace)',
+ default='main'),
var('version', 'Version (like 0.1)', default='0.1'),
var('description', 'One-line description of the package'),
var('long_description', 'Multi-line description (in reST)'),
Modified: bluebream/trunk/src/bluebream/tests/bluebream.txt
===================================================================
--- bluebream/trunk/src/bluebream/tests/bluebream.txt 2010-01-10 02:42:24 UTC (rev 107969)
+++ bluebream/trunk/src/bluebream/tests/bluebream.txt 2010-01-10 03:01:16 UTC (rev 107970)
@@ -9,6 +9,7 @@
>>> option_args = []
>>> extra_args = [
... "namespace_package=test_name",
+... "main_package=test_main",
... "version=0.1",
... "description=test_description",
... "long_description=test_long_description",
@@ -31,6 +32,7 @@
keywords: test_keyword
license_name: Test Public License
long_description: test_long_description
+ main_package: test_main
namespace_package: test_name
package: sample
project: sample
@@ -51,18 +53,20 @@
Creating ./sample/src/
Recursing into +namespace_package+
Creating ./sample/src/test_name/
+ Recursing into +main_package+
+ Creating ./sample/src/test_name/test_main/
+ Copying README.txt_tmpl to ./sample/src/test_name/test_main/README.txt
+ Copying __init__.py to ./sample/src/test_name/test_main/__init__.py
+ Copying application.zcml_tmpl to ./sample/src/test_name/test_main/application.zcml
+ Copying configure.zcml_tmpl to ./sample/src/test_name/test_main/configure.zcml
+ Copying ftesting.zcml_tmpl to ./sample/src/test_name/test_main/ftesting.zcml
+ Copying securitypolicy.zcml_tmpl to ./sample/src/test_name/test_main/securitypolicy.zcml
+ Copying startup.py to ./sample/src/test_name/test_main/startup.py
+ Copying tests.py_tmpl to ./sample/src/test_name/test_main/tests.py
+ Copying views.py to ./sample/src/test_name/test_main/views.py
Copying __init__.py to ./sample/src/test_name/__init__.py
Recursing into main
Creating ./sample/src/test_name/main/
- Copying README.txt_tmpl to ./sample/src/test_name/main/README.txt
- Copying __init__.py to ./sample/src/test_name/main/__init__.py
- Copying application.zcml_tmpl to ./sample/src/test_name/main/application.zcml
- Copying configure.zcml_tmpl to ./sample/src/test_name/main/configure.zcml
- Copying ftesting.zcml_tmpl to ./sample/src/test_name/main/ftesting.zcml
- Copying securitypolicy.zcml_tmpl to ./sample/src/test_name/main/securitypolicy.zcml
- Copying startup.py to ./sample/src/test_name/main/startup.py
- Copying tests.py_tmpl to ./sample/src/test_name/main/tests.py
- Copying views.py to ./sample/src/test_name/main/views.py
Recursing into +package+.egg-info
Creating ./sample/src/sample.egg-info/
Copying PKG-INFO to ./sample/src/sample.egg-info/PKG-INFO
More information about the checkins
mailing list