Author: jmorliaguet
Date: Mon Apr 3 21:26:36 2006
New Revision: 2771
Added:
cpsskins/branches/jmo-perspectives/ui/standard/negotiation/
- copied from r2767,
cpsskins/branches/jmo-perspectives/browser/negotiation/plugins/
Removed:
cpsskins/branches/jmo-perspectives/browser/negotiation/plugins/
Modified:
cpsskins/branches/jmo-perspectives/browser/negotiation/configure.zcml
cpsskins/branches/jmo-perspectives/ui/standard/configure.zcml
cpsskins/branches/jmo-perspectives/ui/standard/negotiation/engine.py
cpsskins/branches/jmo-perspectives/ui/standard/negotiation/page.py
cpsskins/branches/jmo-perspectives/ui/standard/negotiation/perspective.py
cpsskins/branches/jmo-perspectives/ui/standard/negotiation/theme.py
Log:
- moved browser.negotiation.plugins to ui.standard.negotiation
Modified: cpsskins/branches/jmo-perspectives/browser/negotiation/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/negotiation/configure.zcml
(original)
+++ cpsskins/branches/jmo-perspectives/browser/negotiation/configure.zcml
Mon Apr 3 21:26:36 2006
@@ -26,6 +26,4 @@
</pages>
- <include package=".plugins" />
-
</configure>
Modified: cpsskins/branches/jmo-perspectives/ui/standard/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/configure.zcml
(original)
+++ cpsskins/branches/jmo-perspectives/ui/standard/configure.zcml Mon Apr
3 21:26:36 2006
@@ -1,23 +1,28 @@
<configure
xmlns="http://namespaces.zope.org/cpsskins";>
- <!-- Default engine's displays -->
+ <!-- Standard displays -->
<include package=".displays" />
- <!-- Default engine's formats -->
+ <!-- Standard formats -->
<include package=".formats" />
- <!-- Default engine's filters -->
+ <!-- Standard engine's filters -->
<include package=".filters" />
- <!-- Default engine definition -->
+ <!-- Standard engine definition -->
<include file="engine.zcml" />
+
+
+ <!-- Standard negotiation schemes -->
+
+ <include package=".negotiation" />
</configure>
Modified: cpsskins/branches/jmo-perspectives/ui/standard/negotiation/engine.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/negotiation/plugins/engine.py
(original)
+++ cpsskins/branches/jmo-perspectives/ui/standard/negotiation/engine.py
Mon Apr 3 21:26:36 2006
@@ -20,7 +20,7 @@
from zope.interface import implements
from cpsskins.browser.negotiation.scheme import NegotiationScheme
-from cpsskins.browser.negotiation.plugins.interfaces import \
+from cpsskins.ui.standard.negotiation.interfaces import \
IRequestNegotiationScheme
class Request(NegotiationScheme):
Modified: cpsskins/branches/jmo-perspectives/ui/standard/negotiation/page.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/negotiation/plugins/page.py
(original)
+++ cpsskins/branches/jmo-perspectives/ui/standard/negotiation/page.py Mon Apr
3 21:26:36 2006
@@ -21,7 +21,7 @@
from zope.component import queryUtility
from cpsskins.browser.negotiation.scheme import NegotiationScheme
-from cpsskins.browser.negotiation.plugins.interfaces import (
+from cpsskins.ui.standard.negotiation.interfaces import (
IQueryParameterNegotiationScheme, ICookieNegotiationScheme,
ILocalNegotiationScheme, IDefaultNegotiationScheme,
IContextNegotiationScheme)
Modified:
cpsskins/branches/jmo-perspectives/ui/standard/negotiation/perspective.py
==============================================================================
---
cpsskins/branches/jmo-perspectives/browser/negotiation/plugins/perspective.py
(original)
+++ cpsskins/branches/jmo-perspectives/ui/standard/negotiation/perspective.py
Mon Apr 3 21:26:36 2006
@@ -21,7 +21,7 @@
from zope.interface import implements
from cpsskins.browser.negotiation.scheme import NegotiationScheme
-from cpsskins.browser.negotiation.plugins.interfaces import \
+from cpsskins.ui.standard.negotiation.interfaces import \
ISessionNegotiationScheme
class Session(NegotiationScheme):
Modified: cpsskins/branches/jmo-perspectives/ui/standard/negotiation/theme.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/negotiation/plugins/theme.py
(original)
+++ cpsskins/branches/jmo-perspectives/ui/standard/negotiation/theme.py Mon Apr
3 21:26:36 2006
@@ -21,7 +21,7 @@
from zope.interface import implements
from cpsskins.browser.negotiation.scheme import NegotiationScheme
-from cpsskins.browser.negotiation.plugins.interfaces import (
+from cpsskins.ui.standard.negotiation.interfaces import (
IQueryParameterNegotiationScheme, ICookieNegotiationScheme,
ILocalNegotiationScheme, IDefaultNegotiationScheme,
IContextNegotiationScheme)
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
