[kateglo] r503 committed - bugfix

2 views
Skip to first unread message

kat...@googlecode.com

unread,
Dec 7, 2012, 9:28:58 AM12/7/12
to kat...@googlegroups.com
Revision: 503
Author: arthurpurnama
Date: Fri Dec 7 06:28:38 2012
Log: bugfix
http://code.google.com/p/kateglo/source/detail?r=503

Modified:
/branches/kateglox/.idea/kateglo.iml
/branches/kateglox/.idea/workspace.xml
/branches/kateglox/application/configs/application.ini
/branches/kateglox/composer.json
/branches/kateglox/vagrant/Vagrantfile

=======================================
--- /branches/kateglox/.idea/kateglo.iml Tue Jul 3 04:33:58 2012
+++ /branches/kateglox/.idea/kateglo.iml Fri Dec 7 06:28:38 2012
@@ -4,6 +4,22 @@
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library name="PHARS">
+ <CLASSES>
+ <root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/composer.phar"
/>
+ <root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/vendor/zendframework/zendframework1/tests/Zend/Loader/_files/classmap.phar"
/>
+ <root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/vendor/zendframework/zendframework1/library/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder.phar"
/>
+ <root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/vendor/zendframework/zendframework1/tests/Zend/Loader/_files/Zend_LoaderTest.phar"
/>
+ </CLASSES>
+ <SOURCES>
+ <root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/composer.phar"
/>
+ <root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/vendor/zendframework/zendframework1/tests/Zend/Loader/_files/classmap.phar"
/>
+ <root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/vendor/zendframework/zendframework1/library/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder.phar"
/>
+ <root
url="phar:///Users/arthurpurnama/Vagrant/kateglo/shared/kateglo/vendor/zendframework/zendframework1/tests/Zend/Loader/_files/Zend_LoaderTest.phar"
/>
+ </SOURCES>
+ </library>
+ </orderEntry>
</component>
</module>

=======================================
--- /branches/kateglox/.idea/workspace.xml Wed Oct 10 04:21:21 2012
+++ /branches/kateglox/.idea/workspace.xml Fri Dec 7 06:28:38 2012
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" readonly="true"
id="7fad7703-02e1-4f4f-8603-084b2e534c9a" name="Default" comment="">
+ <list default="true" readonly="true"
id="7fad7703-02e1-4f4f-8603-084b2e534c9a" name="Default" comment="bugfix">
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/.idea/kateglo.iml"
afterPath="$PROJECT_DIR$/.idea/kateglo.iml" />
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/.idea/workspace.xml"
afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp"
/>
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/application/configs/application.ini"
afterPath="$PROJECT_DIR$/application/configs/application.ini" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/composer.json"
afterPath="$PROJECT_DIR$/composer.json" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/vagrant/Vagrantfile"
afterPath="$PROJECT_DIR$/vagrant/Vagrantfile" />
</list>
<ignored path="kateglo.iws" />
<ignored path=".idea/workspace.xml" />
@@ -25,7 +28,26 @@
<favorites_list name="kateglo" />
</component>
<component name="FileEditorManager">
- <leaf />
+ <leaf>
+ <file leaf-file-name="index.php" pinned="false" current="false"
current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/public/index.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="53" column="0" selection-start="1676"
selection-end="1676" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="composer.json" pinned="false" current="true"
current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/composer.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="4" column="35" selection-start="135"
selection-end="185" vertical-scroll-proportion="0.063025214">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -35,7 +57,6 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option
value="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/files/schema.xml" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/mysql/files/my.cnf" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/php/manifests/init.pp" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/diverse/manifests/init.pp" />
@@ -47,10 +68,11 @@
<option value="$PROJECT_DIR$/vagrant/puppet/manifests/main.pp" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/php/templates/apc.ini.erb" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/application.ini.erb"
/>
- <option value="$PROJECT_DIR$/public/index.php" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/mysql/manifests/init.pp" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp" />
<option
value="$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp" />
+ <option value="$PROJECT_DIR$/composer.json" />
+ <option value="$PROJECT_DIR$/public/index.php" />
</list>
</option>
</component>
@@ -61,10 +83,9 @@
</include_path>
</component>
<component name="ProjectFrameBounds">
- <option name="x" value="-8" />
- <option name="y" value="-8" />
- <option name="width" value="1616" />
- <option name="height" value="886" />
+ <option name="y" value="22" />
+ <option name="width" value="1920" />
+ <option name="height" value="1100" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
@@ -114,16 +135,6 @@
<sortByType />
</navigator>
<panes>
- <pane id="Scope">
- <subPane subId="Project Files">
- <PATH>
- <PATH_ELEMENT USER_OBJECT="Root">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
- </pane>
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -131,304 +142,26 @@
<option name="myItemId" value="kateglo" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemId" value="External Libraries" />
+ <option name="myItemType"
value="com.jetbrains.php.config.PhpExternalLibrariesNodePatcher$PatchedExternalLibrariesNode"
/>
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="kateglo" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="vagrant" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
+ </subPane>
+ </pane>
+ <pane id="Scope">
+ <subPane subId="Project Files">
<PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <PATH_ELEMENT USER_OBJECT="Root">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="vagrant" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="puppet" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="vagrant" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="puppet" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="modules" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="solr" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="templates" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="vagrant" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="puppet" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="modules" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="solr" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="manifests" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="vagrant" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="puppet" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="modules" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="vagrant" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="puppet" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="modules" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="mysql" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="manifests" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="vagrant" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="puppet" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="modules" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="mysql" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="vagrant" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="puppet" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="modules" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="templates" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="vagrant" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="puppet" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="modules" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="manifests" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="vagrant" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="puppet" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="modules" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="files" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="public" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="kateglo" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="build" />
- <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
</subPane>
</pane>
@@ -448,6 +181,7 @@
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth2"
value="103" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder4"
value="4" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth1"
value="102" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth0"
value="103" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth5"
value="777" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth4"
value="103" />
@@ -457,7 +191,7 @@
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth5"
value="780" />
<property name="options.splitter.details.proportions" value="0.2" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder5"
value="5" />
- <property name="options.lastSelected" value="web.server" />
+ <property name="options.lastSelected"
value="reference.settings.deploy.options" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder3"
value="3" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder4"
value="4" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder1"
value="1" />
@@ -465,7 +199,17 @@
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder0"
value="0" />
<property name="options.searchVisible" value="true" />
</component>
- <component name="PublishConfig" serverName="kateglo-vagrant"
serverId="5947b0bc-2fa8-46b7-b5d6-2f09f74c0bdc" autoUpload="true" />
+ <component name="PublishConfig" serverName="Kateglo"
serverId="d51c1b11-52eb-46f8-8e91-478264c4075b">
+ <servers>
+ <server id="d51c1b11-52eb-46f8-8e91-478264c4075b">
+ <serverdata>
+ <mappings>
+ <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
+ </mappings>
+ </serverdata>
+ </server>
+ </servers>
+ </component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent
name="C:\Users\Purnama\StormWorkspace\kateglo\vagrant\puppet\modules\kateglo\templates"
/>
@@ -520,20 +264,20 @@
<option name="myMappingRoots">
<list>
<SvnCopyRootSimple>
- <option name="myVcsRoot"
value="C:\Users\Public\Documents\stormworkspace\kateglo" />
- <option name="myCopyRoot"
value="C:\Users\Public\Documents\stormworkspace\kateglo" />
+ <option name="myVcsRoot" value="$PROJECT_DIR$" />
+ <option name="myCopyRoot" value="$PROJECT_DIR$" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot"
value="C:\Users\Public\Documents\stormworkspace\kateglo\.idea" />
- <option name="myCopyRoot"
value="C:\Users\Public\Documents\stormworkspace\kateglo\.idea" />
+ <option name="myVcsRoot" value="$PROJECT_DIR$/.idea" />
+ <option name="myCopyRoot" value="$PROJECT_DIR$/.idea" />
</SvnCopyRootSimple>
</list>
</option>
<option name="myMoreRealMappingRoots">
<list>
<SvnCopyRootSimple>
- <option name="myVcsRoot"
value="C:\Users\Public\Documents\stormworkspace\kateglo" />
- <option name="myCopyRoot"
value="C:\Users\Public\Documents\stormworkspace\kateglo" />
+ <option name="myVcsRoot" value="$PROJECT_DIR$" />
+ <option name="myCopyRoot" value="$PROJECT_DIR$" />
</SvnCopyRootSimple>
</list>
</option>
@@ -648,7 +392,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1616" height="886" extended-state="6" />
+ <frame x="0" y="22" width="1920" height="1100" extended-state="6" />
<editor active="false" />
<layout>
<window_info id="Changes" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32828283" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
@@ -656,15 +400,15 @@
<window_info id="Database" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="3" side_tool="false"
content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs"
/>
<window_info id="Remote Host" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="3" side_tool="false"
content_ui="tabs" />
- <window_info id="Project" active="true" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.23745173" sideWeight="0.6750842" order="0" side_tool="false"
content_ui="combo" />
+ <window_info id="Project" active="true" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.23212379" sideWeight="0.67517877" order="0" side_tool="false"
content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs"
/>
<window_info id="Favorites" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs"
/>
- <window_info id="Event Log" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32996634" sideWeight="0.5" order="7" side_tool="true"
content_ui="tabs" />
+ <window_info id="Event Log" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.3299285" sideWeight="0.5" order="7" side_tool="true"
content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="2" side_tool="false"
content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32996634" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
- <window_info id="File Transfer" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.32491583" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
<window_info id="Data Sources" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="3" side_tool="false"
content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.25" sideWeight="0.5" order="4" side_tool="false"
content_ui="tabs" />
+ <window_info id="File Transfer" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32482123" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="0" side_tool="false"
content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.25" sideWeight="0.5" order="1" side_tool="false"
content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.28451177" sideWeight="0.5" order="1" side_tool="false"
content_ui="tabs" />
@@ -737,6 +481,20 @@
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/public/index.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="53" column="0" selection-start="1676"
selection-end="1676" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/composer.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="4" column="35" selection-start="135"
selection-end="185" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/data-config.xml.erb">
<provider selected="true" editor-type-id="text-editor">
<state line="2" column="47" selection-start="192"
selection-end="192" vertical-scroll-proportion="0.046831954" />
@@ -747,11 +505,6 @@
<state line="14" column="24" selection-start="591"
selection-end="591" vertical-scroll-proportion="0.045212764" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/index.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="7" column="15" selection-start="287"
selection-end="287" vertical-scroll-proportion="0.04857143" />
- </provider>
- </entry>
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/solr/templates/default.jetty.erb">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0" />
@@ -767,14 +520,28 @@
<state line="36" column="30" selection-start="992"
selection-end="994" vertical-scroll-proportion="0.3443526" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp">
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="229" column="23" selection-start="8051"
selection-end="8056" vertical-scroll-proportion="-19.32" />
+ <state line="73" column="127" selection-start="2588"
selection-end="2588" vertical-scroll-proportion="0.68945867" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp">
+ <entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
- <state line="73" column="127" selection-start="2588"
selection-end="2588" vertical-scroll-proportion="0.68945867" />
+ <state line="4" column="35" selection-start="135"
selection-end="185" vertical-scroll-proportion="0.063025214">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/public/index.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="53" column="0" selection-start="1676"
selection-end="1676" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="229" column="23" selection-start="8051"
selection-end="8056" vertical-scroll-proportion="0.71884984" />
</provider>
</entry>
</component>
=======================================
--- /branches/kateglox/application/configs/application.ini Sat Jul 21
04:14:51 2012
+++ /branches/kateglox/application/configs/application.ini Fri Dec 7
06:28:38 2012
@@ -9,10 +9,10 @@
database.adapter = pdo_mysql
database.host = localhost
database.port = 3306
-database.username = purnama
-database.password = test
+database.username = root
+database.password =
database.charset = UTF8
-database.name = purnama
+database.name = kateglox
errorLog = "/home/vagrant/log/error.log"
cache.tal = APPLICATION_PATH "/../cache/tal/"
cache.doctrine.proxy = APPLICATION_PATH "/../cache/doctrine/"
=======================================
--- /branches/kateglox/composer.json Mon Jul 16 15:08:20 2012
+++ /branches/kateglox/composer.json Fri Dec 7 06:28:38 2012
@@ -3,7 +3,7 @@
"doctrine/orm" : "2.2.2",
"room13/PhpSolrClient" : "dev-master",
"stubbles/core" : "v2.0.0",
- "zendframework/zendframework1": "1.11.9",
+ "zendframework/zendframework1": "1.12.0",
"phptal/phptal" : "dev-html5_with_ns"
}
}
=======================================
--- /branches/kateglox/vagrant/Vagrantfile Wed Jul 4 08:55:39 2012
+++ /branches/kateglox/vagrant/Vagrantfile Fri Dec 7 06:28:38 2012
@@ -40,7 +40,7 @@
# Share an additional folder to the guest VM. The first argument is
# an identifier, the second is the path on the guest to mount the
# folder, and the third is the path on the host to the actual folder.
- # config.vm.share_folder "v-data", "/vagrant_data", "../data"
+ config.vm.share_folder "shared", "/home/vagrant", "./shared", :create
=> true

# Enable provisioning with Puppet stand alone. Puppet manifests
# are contained in a directory path relative to this Vagrantfile.
Reply all
Reply to author
Forward
0 new messages