[Beeframework-svn] SF.net SVN: beeframework:[263] trunk/framework/Bee
Brought to you by:
b_hartmann,
m_plomer
Menu
▾
▴
[Beeframework-svn] SF.net SVN: beeframework:[263] trunk/framework/Bee
|
From: <m_p...@us...> - 2014-10-18 05:50:51
|
Revision: 263
http://sourceforge.net/p/beeframework/code/263
Author: m_plomer
Date: 2014-10-18 05:50:48 +0000 (Sat, 18 Oct 2014)
Log Message:
-----------
- some more namespacing
Modified Paths:
--------------
trunk/framework/Bee/Context/Xml/DefaultNamespaceHandlerResolver.php
trunk/framework/Bee/Security/XmlNamespace/AbstractInterceptorDrivenBeanDefinitionDecorator.php
trunk/framework/Bee/Security/XmlNamespace/GlobalMethodSecurityBeanDefinitionParser.php
trunk/framework/Bee/Security/XmlNamespace/Handler.php
trunk/framework/Bee/Security/XmlNamespace/InterceptMethodsBeanDefinitionDecorator.php
Added Paths:
-----------
trunk/framework/Bee/Security/XmlNamespace/
trunk/framework/Bee/Security/XmlNamespace/HttpSecurityBeanDefinitionParser.php
Removed Paths:
-------------
trunk/framework/Bee/Security/HttpSecurityBeanDefinitionParser.php
trunk/framework/Bee/Security/Namespace/
trunk/framework/Bee/Security/NamespaceHandler.php
Modified: trunk/framework/Bee/Context/Xml/DefaultNamespaceHandlerResolver.php
===================================================================
--- trunk/framework/Bee/Context/Xml/DefaultNamespaceHandlerResolver.php 2014-10-18 05:40:51 UTC (rev 262)
+++ trunk/framework/Bee/Context/Xml/DefaultNamespaceHandlerResolver.php 2014-10-18 05:50:48 UTC (rev 263)
@@ -29,8 +29,8 @@
private static $NAMESPACE_HANDLERS = array(
'http://www.beeframework.org/schema/aop' => 'Bee_AOP_Namespace_Handler',
- 'http://www.beeframework.org/schema/security' => 'Bee_Security_Namespace_Handler',
- 'http://www.beeframework.org/schema/tx' => null,
+ 'http://www.beeframework.org/schema/security' => 'Bee\Security\XmlNamespace\Handler',
+// 'http://www.beeframework.org/schema/tx' => null,
'http://www.beeframework.org/schema/util' => 'Bee\Context\Util\XmlNamespace\Handler',
'http://www.beeframework.org/schema/mvc' => 'Bee\MVC\XmlNamespace\Handler'
);
Deleted: trunk/framework/Bee/Security/HttpSecurityBeanDefinitionParser.php
===================================================================
--- trunk/framework/Bee/Security/HttpSecurityBeanDefinitionParser.php 2014-10-18 05:40:51 UTC (rev 262)
+++ trunk/framework/Bee/Security/HttpSecurityBeanDefinitionParser.php 2014-10-18 05:50:48 UTC (rev 263)
@@ -1,31 +0,0 @@
-<?php
-namespace Bee\Security;
-/*
- * Copyright 2008-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-use Bee\Context\Xml\ParserContext;
-use Bee\Context\Xml\XmlNamespace\IBeanDefinitionParser;
-use DOMElement;
-
-/**
- * Class HttpSecurityBeanDefinitionParser
- * @package Bee\Security
- */
-class HttpSecurityBeanDefinitionParser implements IBeanDefinitionParser {
-
- public function parse(DOMElement $element, ParserContext $parserContext) {
- trigger_error('Bee\Security\HttpSecurityBeanDefinitionParser.parse() : TO BE IMPLEMENTED', E_USER_ERROR);
- }
-}
\ No newline at end of file
Deleted: trunk/framework/Bee/Security/NamespaceHandler.php
===================================================================
--- trunk/framework/Bee/Security/NamespaceHandler.php 2014-10-18 05:40:51 UTC (rev 262)
+++ trunk/framework/Bee/Security/NamespaceHandler.php 2014-10-18 05:50:48 UTC (rev 263)
@@ -1,30 +0,0 @@
-<?php
-namespace Bee\Security;
-/*
- * Copyright 2008-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-use Bee\Context\Xml\XmlNamespace\HandlerSupport;
-
-/**
- * Class Bee_Security_NamespaceHandler
- * @package Bee\Security
- */
-class Bee_Security_NamespaceHandler extends HandlerSupport {
-
- public function init() {
- $this->registerBeanDefinitionParser(Elements::HTTP, new HttpSecurityBeanDefinitionParser());
- }
-}
\ No newline at end of file
Modified: trunk/framework/Bee/Security/XmlNamespace/AbstractInterceptorDrivenBeanDefinitionDecorator.php
===================================================================
--- trunk/framework/Bee/Security/Namespace/AbstractInterceptorDrivenBeanDefinitionDecorator.php 2014-10-15 00:20:24 UTC (rev 257)
+++ trunk/framework/Bee/Security/XmlNamespace/AbstractInterceptorDrivenBeanDefinitionDecorator.php 2014-10-18 05:50:48 UTC (rev 263)
@@ -1,4 +1,5 @@
<?php
+namespace Bee\Security\XmlNamespace;
/*
* Copyright 2008-2014 the original author or authors.
*
@@ -23,7 +24,7 @@
* To change this template use File | Settings | File Templates.
*/
// todo: work in progress...
-//class Bee_Security_Namespace_AbstractInterceptorDrivenBeanDefinitionDecorator implements IBeanDefinitionDecorator {
+//class AbstractInterceptorDrivenBeanDefinitionDecorator implements IBeanDefinitionDecorator {
//
// public final function decorate(DOMNode $node, BeanDefinitionHolder $definitionHolder, ParserContext $parserContext) {
// $registry = $parserContext->getRegistry();
Modified: trunk/framework/Bee/Security/XmlNamespace/GlobalMethodSecurityBeanDefinitionParser.php
===================================================================
--- trunk/framework/Bee/Security/Namespace/GlobalMethodSecurityBeanDefinitionParser.php 2014-10-15 00:20:24 UTC (rev 257)
+++ trunk/framework/Bee/Security/XmlNamespace/GlobalMethodSecurityBeanDefinitionParser.php 2014-10-18 05:50:48 UTC (rev 263)
@@ -1,4 +1,5 @@
<?php
+namespace Bee\Security\XmlNamespace;
/*
* Copyright 2008-2014 the original author or authors.
*
@@ -22,6 +23,10 @@
use Bee\Context\Xml\ParserContext;
use Bee\Context\Xml\XmlNamespace\IBeanDefinitionParser;
use Bee\Utils\Strings;
+use Bee_AOP_Namespace_Utils;
+use Bee_Security_Config_IBeanIds;
+use Bee_Security_Config_Utils;
+use DOMElement;
/**
* Created by IntelliJ IDEA.
@@ -31,7 +36,7 @@
* To change this template use File | Settings | File Templates.
*/
-class Bee_Security_Namespace_GlobalMethodSecurityBeanDefinitionParser implements IBeanDefinitionParser {
+class GlobalMethodSecurityBeanDefinitionParser implements IBeanDefinitionParser {
const SECURED_METHOD_DEFINITION_SOURCE_CLASS = 'Bee\Security\Annotations\SecuredMethodDefinitionSource';
Modified: trunk/framework/Bee/Security/XmlNamespace/Handler.php
===================================================================
--- trunk/framework/Bee/Security/Namespace/Handler.php 2014-10-15 00:20:24 UTC (rev 257)
+++ trunk/framework/Bee/Security/XmlNamespace/Handler.php 2014-10-18 05:50:48 UTC (rev 263)
@@ -1,6 +1,7 @@
<?php
+namespace Bee\Security\XmlNamespace;
/*
- * Copyright 2008-2010 the original author or authors.
+ * Copyright 2008-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,6 +16,7 @@
* limitations under the License.
*/
use Bee\Context\Xml\XmlNamespace\HandlerSupport;
+use Bee\Security\Elements;
/**
* Created by IntelliJ IDEA.
@@ -24,7 +26,7 @@
* To change this template use File | Settings | File Templates.
*/
-class Bee_Security_Namespace_Handler extends HandlerSupport {
+class Handler extends HandlerSupport {
const INTERCEPT_METHODS = "intercept-methods";
const GLOBAL_METHOD_SECURITY = 'global-method-security';
@@ -33,11 +35,11 @@
// $this->registerBeanDefinitionParser(Elements.LDAP_PROVIDER, new LdapProviderBeanDefinitionParser());
// $this->registerBeanDefinitionParser(Elements.LDAP_SERVER, new LdapServerBeanDefinitionParser());
// $this->registerBeanDefinitionParser(Elements.LDAP_USER_SERVICE, new LdapUserServiceBeanDefinitionParser());
-// $this->registerBeanDefinitionParser(Elements.HTTP, new HttpSecurityBeanDefinitionParser());
+ $this->registerBeanDefinitionParser(Elements::HTTP, new HttpSecurityBeanDefinitionParser());
// $this->registerBeanDefinitionParser(Elements.USER_SERVICE, new UserServiceBeanDefinitionParser());
// $this->registerBeanDefinitionParser(Elements.JDBC_USER_SERVICE, new JdbcUserServiceBeanDefinitionParser());
// $this->registerBeanDefinitionParser(Elements.AUTHENTICATION_PROVIDER, new AuthenticationProviderBeanDefinitionParser());
- $this->registerBeanDefinitionParser(self::GLOBAL_METHOD_SECURITY, new Bee_Security_Namespace_GlobalMethodSecurityBeanDefinitionParser());
+ $this->registerBeanDefinitionParser(self::GLOBAL_METHOD_SECURITY, new GlobalMethodSecurityBeanDefinitionParser());
// $this->registerBeanDefinitionParser(Elements.AUTHENTICATION_MANAGER, new AuthenticationManagerBeanDefinitionParser());
// $this->registerBeanDefinitionParser(Elements.FILTER_INVOCATION_DEFINITION_SOURCE, new FilterInvocationDefinitionSourceBeanDefinitionParser());
Copied: trunk/framework/Bee/Security/XmlNamespace/HttpSecurityBeanDefinitionParser.php (from rev 261, trunk/framework/Bee/Security/HttpSecurityBeanDefinitionParser.php)
===================================================================
--- trunk/framework/Bee/Security/XmlNamespace/HttpSecurityBeanDefinitionParser.php (rev 0)
+++ trunk/framework/Bee/Security/XmlNamespace/HttpSecurityBeanDefinitionParser.php 2014-10-18 05:50:48 UTC (rev 263)
@@ -0,0 +1,31 @@
+<?php
+namespace Bee\Security\XmlNamespace;
+/*
+ * Copyright 2008-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+use Bee\Context\Xml\ParserContext;
+use Bee\Context\Xml\XmlNamespace\IBeanDefinitionParser;
+use DOMElement;
+
+/**
+ * Class HttpSecurityBeanDefinitionParser
+ * @package Bee\Security
+ */
+class HttpSecurityBeanDefinitionParser implements IBeanDefinitionParser {
+
+ public function parse(DOMElement $element, ParserContext $parserContext) {
+ trigger_error('Bee\Security\HttpSecurityBeanDefinitionParser.parse() : TO BE IMPLEMENTED', E_USER_ERROR);
+ }
+}
\ No newline at end of file
Modified: trunk/framework/Bee/Security/XmlNamespace/InterceptMethodsBeanDefinitionDecorator.php
===================================================================
--- trunk/framework/Bee/Security/Namespace/InterceptMethodsBeanDefinitionDecorator.php 2014-10-15 00:20:24 UTC (rev 257)
+++ trunk/framework/Bee/Security/XmlNamespace/InterceptMethodsBeanDefinitionDecorator.php 2014-10-18 05:50:48 UTC (rev 263)
@@ -1,4 +1,5 @@
<?php
+namespace Bee\Security\XmlNamespace;
/*
* Copyright 2008-2014 the original author or authors.
*
@@ -17,6 +18,7 @@
use Bee\Context\Config\BeanDefinitionHolder;
use Bee\Context\Xml\ParserContext;
use Bee\Context\Xml\XmlNamespace\IBeanDefinitionDecorator;
+use DOMNode;
/**
* Created by IntelliJ IDEA.
@@ -26,7 +28,7 @@
* To change this template use File | Settings | File Templates.
*/
-class Bee_Security_Namespace_InterceptMethodsBeanDefinitionDecorator implements IBeanDefinitionDecorator {
+class InterceptMethodsBeanDefinitionDecorator implements IBeanDefinitionDecorator {
function decorate(DOMNode $node, BeanDefinitionHolder $definition, ParserContext $parserContext) {
// TODO: Implement decorate() method.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
