<commit_before><?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:util="http://www.springframework.org/schema/util"
       xsi:schemaLocation=
         "http://www.springframework.org/schema/beans 
          http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
          http://www.springframework.org/schema/util 
          http://www.springframework.org/schema/util/spring-util-3.0.xsd">
  
  <!-- 
    this makes application properties accessible to the rest of the beans in the app via ${}-style variable references instead
    of the ref element 
  --> 
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
    <property name="location" value="file://${configDir:/etc/ohmage}/configuration.properties"/>
    <property name="propertiesArray">
      <list>
        <ref bean="dbProps" />
      </list>
    </property>
    <property name="ignoreResourceNotFound" value="true"/>
  </bean>
  
  <util:map id="dbProps">
    <entry key="db.driver" value="com.mysql.jdbc.Driver"/>
    <entry key="db.jdbcurl" value="jdbc:mysql://${mysql.host:localhost}:${mysql.port:3306}/${mysql.db:ohmage}"/>
    <entry key="db.username" value="${mysql.user:ohmage}"/>
    <entry key="db.password" value="${mysql.pw:&amp;!sickly}"/>
  </util:map>

</beans><commit_msg>Revert "changes to spring config to allow for external config file"<commit_after><?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:util="http://www.springframework.org/schema/util"
       xsi:schemaLocation=
         "http://www.springframework.org/schema/beans 
          http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
          http://www.springframework.org/schema/util 
          http://www.springframework.org/schema/util/spring-util-3.0.xsd">
  
  <!-- 
    this makes application properties accessible to the rest of the beans in the app via ${}-style variable references instead
    of the ref element 
  --> 
  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
    <property name="propertiesArray">
      <list>
        <ref bean="dbProps" />
      </list>
    </property>
  </bean>
  
  <util:map id="dbProps">
    <entry key="db.driver" value="com.mysql.jdbc.Driver"/>
    <entry key="db.jdbcurl" value="jdbc:mysql://localhost:3306/ohmage"/>
    <entry key="db.username" value="ohmage"/>
    <entry key="db.password" value="<PASSWORD>"/>
  </util:map>

</beans>
{'fraction_non_alphanumeric': 0.1706676669167292, 'fraction_numerical': 0.012003000750187547, 'mean_word_length': 3.400990099009901, 'pattern_counts': {'":': 0, '<': 40, '<?xml version=': 2, '>': 40, 'https://': 0, 'lorem ipsum': 0, 'www.': 14, 'xml': 8}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '2988090', 'n_tokens_mistral': 850, 'n_tokens_neox': 810, 'n_words': 137}