[kateglo] r502 committed - bugfix

[kat...@googlecode.com]

Revision: 502
Author: arthur.purnama
Date: Wed Oct 10 04:21:21 2012
Log: bugfix
http://code.google.com/p/kateglo/source/detail?r=502

Modified:
/branches/kateglox/.idea/workspace.xml
/branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp

=======================================
--- /branches/kateglox/.idea/workspace.xml Thu Aug 2 08:50:12 2012
+++ /branches/kateglox/.idea/workspace.xml Wed Oct 10 04:21:21 2012
@@ -4,7 +4,6 @@
<list default="true" readonly="true"
id="7fad7703-02e1-4f4f-8603-084b2e534c9a" name="Default" comment="">
<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$/vagrant/puppet/modules/solr/manifests/init.pp"
afterPath="$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp" />
</list>
<ignored path="kateglo.iws" />
<ignored path=".idea/workspace.xml" />
@@ -21,6 +20,7 @@
<component name="DaemonCodeAnalyzer">
<disable_hints />
</component>
+ <component name="ExecutionTargetManager"
SELECTED_TARGET="default_target" />
<component name="FavoritesManager">
<favorites_list name="kateglo" />
</component>
@@ -63,8 +63,8 @@
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
<option name="y" value="-8" />
- <option name="width" value="1382" />
- <option name="height" value="754" />
+ <option name="width" value="1616" />
+ <option name="height" value="886" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
@@ -114,6 +114,16 @@
<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>
@@ -420,16 +430,6 @@
<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 USER_OBJECT="Root">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</pane>
</panes>
@@ -465,17 +465,7 @@
<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">
- <servers>
- <server id="5947b0bc-2fa8-46b7-b5d6-2f09f74c0bdc">
- <serverdata>
- <mappings>
- <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
- </mappings>
- </serverdata>
- </server>
- </servers>
- </component>
+ <component name="PublishConfig" serverName="kateglo-vagrant"
serverId="5947b0bc-2fa8-46b7-b5d6-2f09f74c0bdc" autoUpload="true" />
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent
name="C:\Users\Purnama\StormWorkspace\kateglo\vagrant\puppet\modules\kateglo\templates"
/>
@@ -488,14 +478,10 @@
<component name="RunManager">
<configuration default="true" type="PHPUnitRunConfigurationType"
factoryName="PHPUnit">
<TestRunner />
- <method>
- <option name="PhingTarget" enabled="false" />
- </method>
+ <method />
</configuration>
<configuration default="true" type="PhpLocalRunConfigurationType"
factoryName="PHP Console">
- <method>
- <option name="PhingTarget" enabled="false" />
- </method>
+ <method />
</configuration>
<configuration default="true" type="JavascriptDebugSession"
factoryName="Remote">
<JSRemoteDebuggerConfigurationSettings>
@@ -505,13 +491,7 @@
<method />
</configuration>
<configuration default="true" type="PhpUnitRemoteRunConfigurationType"
factoryName="PHPUnit on Server"
server_id="5947b0bc-2fa8-46b7-b5d6-2f09f74c0bdc"
server_name="kateglo-vagrant">
- <method>
- <option name="FtpUpload" enabled="false">
- <server_id />
- <server_name />
- </option>
- <option name="PhingTarget" enabled="false" />
- </method>
+ <method />
</configuration>
<list size="0" />
</component>
@@ -540,20 +520,20 @@
<option name="myMappingRoots">
<list>
<SvnCopyRootSimple>
- <option name="myVcsRoot"
value="C:\Users\Purnama\StormWorkspace\kateglo" />
- <option name="myCopyRoot"
value="C:\Users\Purnama\StormWorkspace\kateglo" />
+ <option name="myVcsRoot"
value="C:\Users\Public\Documents\stormworkspace\kateglo" />
+ <option name="myCopyRoot"
value="C:\Users\Public\Documents\stormworkspace\kateglo" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot"
value="C:\Users\Purnama\StormWorkspace\kateglo\.idea" />
- <option name="myCopyRoot"
value="C:\Users\Purnama\StormWorkspace\kateglo\.idea" />
+ <option name="myVcsRoot"
value="C:\Users\Public\Documents\stormworkspace\kateglo\.idea" />
+ <option name="myCopyRoot"
value="C:\Users\Public\Documents\stormworkspace\kateglo\.idea" />
</SvnCopyRootSimple>
</list>
</option>
<option name="myMoreRealMappingRoots">
<list>
<SvnCopyRootSimple>
- <option name="myVcsRoot"
value="C:\Users\Purnama\StormWorkspace\kateglo" />
- <option name="myCopyRoot"
value="C:\Users\Purnama\StormWorkspace\kateglo" />
+ <option name="myVcsRoot"
value="C:\Users\Public\Documents\stormworkspace\kateglo" />
+ <option name="myCopyRoot"
value="C:\Users\Public\Documents\stormworkspace\kateglo" />
</SvnCopyRootSimple>
</list>
</option>
@@ -668,21 +648,22 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1382" height="754" extended-state="6" />
+ <frame x="-8" y="-8" width="1616" height="886" extended-state="6" />
<editor active="false" />
<layout>
- <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="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" />
<window_info id="TODO" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32996634" sideWeight="0.5" order="6" side_tool="false"
content_ui="tabs" />
+ <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.23106061" 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.23745173" sideWeight="0.6750842" 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="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="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" />
@@ -715,7 +696,6 @@
<option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
<option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
<option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND"
value="false" />
- <option name="ENABLE_BACKGROUND_PROCESSES" value="false" />
<option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
@@ -725,12 +705,11 @@
<option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
<option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
- <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
<option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
<option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="Making Puppet configurable"
/>
+ <option name="LAST_COMMIT_MESSAGE" value="bugfix" />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -752,6 +731,7 @@
<MESSAGE value="ignore composer artifacts" />
<MESSAGE value="Refactor Kateglo to work with new third party library
structure" />
<MESSAGE value="Making Puppet configurable" />
+ <MESSAGE value="bugfix" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -762,48 +742,14 @@
<state line="2" column="47" selection-start="192"
selection-end="192" vertical-scroll-proportion="0.046831954" />
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/public/initializr/img/glyphicons-halflings-white.png">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry
file="file://$PROJECT_DIR$/public/initializr/img/glyphicons-halflings.png">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry
file="file://$PROJECT_DIR$/public/initializr/apple-touch-icon.png">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry
file="file://$PROJECT_DIR$/public/initializr/apple-touch-icon-114x114-precomposed.png">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/public/initializr/404.html">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="-1.5222552" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/public/initializr/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/templates/application.ini.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="24" selection-start="591"
selection-end="591" vertical-scroll-proportion="0.045212764">
- <folding />
- </state>
+ <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">
- <folding />
- </state>
+ <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">
@@ -818,35 +764,17 @@
</entry>
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/mysql/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="30" selection-start="992"
selection-end="994" vertical-scroll-proportion="0.3443526">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/public/initializr/humans.txt">
- <provider selected="true" editor-type-id="text-editor">
- <state line="9" column="18" selection-start="132"
selection-end="132" vertical-scroll-proportion="0.045212764">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/public/initializr/crossdomain.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0" />
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state line="229" column="23" selection-start="8051"
selection-end="8056" vertical-scroll-proportion="-19.32">
- <folding />
- </state>
+ <state line="229" column="23" selection-start="8051"
selection-end="8056" vertical-scroll-proportion="-19.32" />
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/solr/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="73" column="127" selection-start="2588"
selection-end="2588" vertical-scroll-proportion="0.68945867">
- <folding />
- </state>
+ <state line="73" column="127" selection-start="2588"
selection-end="2588" vertical-scroll-proportion="0.68945867" />
</provider>
</entry>
</component>
=======================================
--- /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Mon
Aug 27 23:54:30 2012
+++ /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Wed
Oct 10 04:21:21 2012
@@ -260,8 +260,8 @@

}
}else{
- notify{ "restart jetty and do full import":
- message: 'Please restart jetty with "sudo service jetty restart"
and do full import with "sudo curl
http://127.0.0.1:8080/solr/dataimport?command=full-import"',
+ notify { "restart jetty and do full import":
+ message => 'Please restart jetty with "sudo service jetty restart"
and do full import with "sudo curl
http://127.0.0.1:8080/solr/dataimport?command=full-import"',

}
}