summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--demos/personal/protected/application.xml2
-rwxr-xr-xdocs/application.xml28
-rw-r--r--framework/Collections/TStack.php2
-rw-r--r--framework/Xml/TXmlDocument.php10
-rw-r--r--tests/UnitTests/framework/TestSystem/protected/application.xml2
5 files changed, 20 insertions, 24 deletions
diff --git a/demos/personal/protected/application.xml b/demos/personal/protected/application.xml
index 2565d1a0..ce3b4435 100644
--- a/demos/personal/protected/application.xml
+++ b/demos/personal/protected/application.xml
@@ -4,7 +4,7 @@
<!-- modules configured and loaded for all services -->
<modules>
<!-- Remove this comment mark to enable caching
- <module id="cache" class="System.Data.TSqliteCache" />
+ <module id="cache" class="System.Caching.TSqliteCache" />
-->
<!-- Remove this comment mark to enable PATH url format
<module id="request" class="THttpRequest" UrlFormat="Path" />
diff --git a/docs/application.xml b/docs/application.xml
index 9f360ec5..2cc01143 100755
--- a/docs/application.xml
+++ b/docs/application.xml
@@ -4,15 +4,15 @@
<paths>
<alias id="Demo" path="." />
<alias id="Pages" path="pages" />
-
+
</paths>
-
+
<!-- modules configured and loaded for all services -->
<modules>
- <module id="cache" type="System.Data.TSqliteCache" DbFile="Demo.cache"/>
+ <module id="cache" type="System.Caching.TSqliteCache" DbFile="Demo.cache"/>
<module id="session" type="THttpSession" />
</modules>
-
+
<services>
<!-- page service, BasePath is required -->
<service id="page" BasePath="Demo.pages" DefaultPage="home">
@@ -36,7 +36,7 @@ application.xml::::
<alias id path/>
<using namespace/>
</paths>
-
+
<modules>
<module id type /> other params get stored as an array.
<!-- user manager module -->
@@ -46,18 +46,18 @@ application.xml::::
</module>
<!-- auth manager module -->
<module id="auth" type="System.Security.TAuthManager" UserManager="users" LoginPage="login" />
-
-
+
+
</modules>
-
+
<services>
<service id type /> extra params get stored as an array.
</services>
-
+
<parameters>
<parameter id [type] /> extra params get stored as an array.
</parameters>
-</application>
+</application>
config.xml
@@ -74,14 +74,14 @@ config.xml
-
+
config.xml:::::
<configuration>
<paths>
<alias id path/>
<using namespace/>
</paths>
-
+
<modules>
<module id type /> other params get stored as an array.
</modules>
@@ -89,11 +89,11 @@ config.xml:::::
<parameters>
<parameter id [type] /> extra params get stored as an array.
</parameters>
-
+
<authorization>
<allow|deny [pages=",delimited"] [users=",delimited *|?|username"] [roles=",delimited"] verb="get|post" />
</authorization>
-
+
<pages [MasterClass]>
<page id type [MasterClass] [TemplateFile]/>
</pages>
diff --git a/framework/Collections/TStack.php b/framework/Collections/TStack.php
index 72ca2dd0..79d17902 100644
--- a/framework/Collections/TStack.php
+++ b/framework/Collections/TStack.php
@@ -135,7 +135,7 @@ class TStack extends TComponent implements IteratorAggregate
/**
* Pushes an item into the stack.
- * @return mixed the item to be pushed into the stack
+ * @param mixed the item to be pushed into the stack
*/
public function push($item)
{
diff --git a/framework/Xml/TXmlDocument.php b/framework/Xml/TXmlDocument.php
index a69d982d..66f2f13b 100644
--- a/framework/Xml/TXmlDocument.php
+++ b/framework/Xml/TXmlDocument.php
@@ -386,13 +386,10 @@ class TXmlDocument extends TXmlElement
/**
- * TXmlElement class.
+ * TXmlElementList class.
*
- * TXmlElement represents an XML element node.
- * You can obtain its tagname, attributes, text between the openning and closing
- * tags via the TagName, Attributes, and Value properties, respectively.
- * You can also retrieve its parent and child elements by Parent and Elements
- * properties, respectively.
+ * TXmlElementList represents a collection of {@link TXmlElement}.
+ * You may manipulate the collection with the operations defined in {@link TList}.
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @version $Revision: $ $Date: $
@@ -423,7 +420,6 @@ class TXmlElementList extends TList
return $this->_o;
}
-
/**
* Inserts an item at the specified position.
* This overrides the parent implementation by performing additional
diff --git a/tests/UnitTests/framework/TestSystem/protected/application.xml b/tests/UnitTests/framework/TestSystem/protected/application.xml
index 6ca4aaa8..38bfff9e 100644
--- a/tests/UnitTests/framework/TestSystem/protected/application.xml
+++ b/tests/UnitTests/framework/TestSystem/protected/application.xml
@@ -7,7 +7,7 @@
</paths>
<modules>
<module id="request" />
- <module id="cache" type="System.Data.TSqliteCache" DbFile="TestSystem/protected/data/test.db" />
+ <module id="cache" type="System.Caching.TSqliteCache" DbFile="TestSystem/protected/data/test.db" />
</modules>
<services>
<service id="page" BasePath="TestSystem/protected/pages" />