restore site configuration

Author: awxiaoxian2020

pom.xml

@@ -400,38 +400,11 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <!-- prepare site content by filtering ${project.*} values-->
-          <execution>
-            <id>filter-site</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/site-src</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/site</directory>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <escapeString>\</escapeString>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
           <locales>en,es,ja,fr,zh_CN,ko</locales>
-          <siteDirectory>${project.build.directory}/site-src</siteDirectory>
         </configuration>
       </plugin>
       <plugin>

src/site/markdown/configuration.md

@@ -34,10 +34,10 @@ The properties can then be used throughout the configuration files to substitute
 
 ```xml
 <dataSource type="POOLED">
-  <property name="driver" value="\${driver}"/>
-  <property name="url" value="\${url}"/>
-  <property name="username" value="\${username}"/>
-  <property name="password" value="\${password}"/>
+  <property name="driver" value="${driver}"/>
+  <property name="url" value="${url}"/>
+  <property name="username" value="${username}"/>
+  <property name="password" value="${password}"/>
 </dataSource>
 ```
 
@@ -68,7 +68,7 @@ Since the MyBatis 3.4.2, your can specify a default value into placeholder as fo
 ```xml
 <dataSource type="POOLED">
   <!-- ... -->
-  <property name="username" value="\${username:ut_user}"/> <!-- If 'username' property not present, username become 'ut_user' -->
+  <property name="username" value="${username:ut_user}"/> <!-- If 'username' property not present, username become 'ut_user' -->
 </dataSource>
 ```
 
@@ -81,7 +81,7 @@ This feature is disabled by default. If you specify a default value into placeho
 </properties>
 ```
 
-<span class="label important">NOTE</span> This will conflict with the `":"` character in property keys (e.g. `db:username`) or the ternary operator of OGNL expressions (e.g. `\${tableName != null ? tableName : 'global_constants'}`) on a SQL definition. If you use either and want default property values, you must change the default value separator by adding this special property:
+<span class="label important">NOTE</span> This will conflict with the `":"` character in property keys (e.g. `db:username`) or the ternary operator of OGNL expressions (e.g. `${tableName != null ? tableName : 'global_constants'}`) on a SQL definition. If you use either and want default property values, you must change the default value separator by adding this special property:
 
 ```xml
 <properties resource="org/mybatis/example/config.properties">
@@ -93,7 +93,7 @@ This feature is disabled by default. If you specify a default value into placeho
 ```xml
 <dataSource type="POOLED">
   <!-- ... -->
-  <property name="username" value="\${db:username?:ut_user}"/>
+  <property name="username" value="${db:username?:ut_user}"/>
 </dataSource>
 ```
 
@@ -562,10 +562,10 @@ The environments element defines how the environment is configured.
       <property name="..." value="..."/>
     </transactionManager>
     <dataSource type="POOLED">
-      <property name="driver" value="\${driver}"/>
-      <property name="url" value="\${url}"/>
-      <property name="username" value="\${username}"/>
-      <property name="password" value="\${password}"/>
+      <property name="driver" value="${driver}"/>
+      <property name="url" value="${url}"/>
+      <property name="username" value="${username}"/>
+      <property name="password" value="${password}"/>
     </dataSource>
   </environment>
 </environments>

src/site/markdown/getting-started.md

@@ -13,7 +13,7 @@ If you are using Maven just add the following dependency to your pom.xml:
 <dependency>
   <groupId>org.mybatis</groupId>
   <artifactId>mybatis</artifactId>
-  <version>${project.version}</version>
+  <version>x.x.x</version>
 </dependency>
 ```
 
@@ -42,10 +42,10 @@ The configuration XML file contains settings for the core of the MyBatis system,
     <environment id="development">
       <transactionManager type="JDBC"/>
       <dataSource type="POOLED">
-        <property name="driver" value="\${driver}"/>
-        <property name="url" value="\${url}"/>
-        <property name="username" value="\${username}"/>
-        <property name="password" value="\${password}"/>
+        <property name="driver" value="${driver}"/>
+        <property name="url" value="${url}"/>
+        <property name="username" value="${username}"/>
+        <property name="password" value="${password}"/>
       </dataSource>
     </environment>
   </environments>

src/site/markdown/java-api.md

@@ -83,7 +83,7 @@ The first four methods are the most common, as they take an InputStream instance
 
 If you call a build method that takes the environment parameter, then MyBatis will use the configuration for that environment. Of course, if you specify an invalid environment, you will receive an error. If you call one of the build methods that does not take the environment parameter, then the default environment is used (which is specified as default="development" in the example above).
 
-If you call a method that takes a properties instance, then MyBatis will load those properties and make them available to your configuration. Those properties can be used in place of most values in the configuration using the syntax: \${propName}
+If you call a method that takes a properties instance, then MyBatis will load those properties and make them available to your configuration. Those properties can be used in place of most values in the configuration using the syntax: ${propName}
 
 Recall that properties can also be referenced from the mybatis-config.xml file, or specified directly within it. Therefore it's important to understand the priority. We mentioned it earlier in this document, but here it is again for easy reference:
 

src/site/markdown/sqlmap-xml.md

@@ -228,7 +228,7 @@ As an irregular case, some databases allow INSERT, UPDATE or DELETE statement to
 This element can be used to define a reusable fragment of SQL code that can be included in other statements. It can be statically (during load phase) parametrized. Different property values can vary in include instances. For example:
 
 ```xml
-<sql id="userColumns"> \${alias}.id,\${alias}.username,\${alias}.password </sql>
+<sql id="userColumns"> ${alias}.id,${alias}.username,${alias}.password </sql>
 ```
 
 The SQL fragment can then be included in another statement, for example:
@@ -247,12 +247,12 @@ Property value can be also used in include refid attribute or property values in
 
 ```xml
 <sql id="sometable">
-  \${prefix}Table
+  ${prefix}Table
 </sql>
 
 <sql id="someinclude">
   from
-    <include refid="\${include_target}"/>
+    <include refid="${include_target}"/>
 </sql>
 
 <select id="select" resultType="map">
@@ -339,7 +339,7 @@ Despite all of these powerful options, most of the time you'll simply specify th
 By default, using the `#{}` syntax will cause MyBatis to generate `PreparedStatement` properties and set the values safely against the `PreparedStatement` parameters (e.g. ?). While this is safer, faster and almost always preferred, sometimes you just want to directly inject an unmodified string into the SQL Statement. For example, for ORDER BY, you might use something like this:
 
 ```sql
-ORDER BY \${columnName}
+ORDER BY ${columnName}
 ```
 
 Here MyBatis won't modify or escape the string.
@@ -362,11 +362,11 @@ User findByEmail(@Param("email") String email);
 you can just write:
 
 ```java
-@Select("select * from user where \${column} = #{value}")
+@Select("select * from user where ${column} = #{value}")
 User findByColumn(@Param("column") String column, @Param("value") String value);
 ```
 
-in which the `\${column}` will be substituted directly and the `#{value}` will be "prepared". Thus you can just do the same work by:
+in which the `${column}` will be substituted directly and the `#{value}` will be "prepared". Thus you can just do the same work by:
 
 ```java
 User userOfId1 = userMapper.findByColumn("id", 1L);
@@ -1265,7 +1265,7 @@ To configure your cache, simply add public JavaBeans properties to your Cache im
 </cache>
 ```
 
-You can use JavaBeans properties of all simple types, MyBatis will do the conversion. And you can specify a placeholder(e.g. `\${cache.file}`) to replace value defined at [configuration properties](configuration.html#properties).
+You can use JavaBeans properties of all simple types, MyBatis will do the conversion. And you can specify a placeholder(e.g. `${cache.file}`) to replace value defined at [configuration properties](configuration.html#properties).
 
 Since 3.4.2, the MyBatis has been supported to call an initialization method after it's set all properties. If you want to use this feature, please implements the `org.apache.ibatis.builder.InitializingObject` interface on your custom cache class.