Skip to content

Commit 1e0d913

Browse files
committed
[ci skip] Change mybatis mappers package from "persistence" to "mapper"
1 parent e4cd8ec commit 1e0d913

File tree

5 files changed

+42
-70
lines changed

5 files changed

+42
-70
lines changed

src/site/es/xdoc/sample.xml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ SUM: 58 823 612 3464
8383
/mybatis
8484
/jpetstore
8585
/domain <tt>&lt;-- Los objetos de negocio van aqui.</tt>
86-
/persistence <tt>&lt;-- Las mapper interfaces van aqui.</tt>
86+
/mapper <tt>&lt;-- Las mapper interfaces van aqui.</tt>
8787
/service <tt>&lt;-- La lógica de aplicación va aqui.</tt>
8888
/web
8989
/actions <tt>&lt;-- La lógica de presentación (actions) van aqui.</tt>
9090
/resources <tt>&lt;-- Aqui van los recursos no-java.</tt>
9191
/org
9292
/mybatis
9393
/jpetstore
94-
/persistence <tt>&lt;-- Los ficheros de mapeo XML van aqui.</tt>
94+
/mapper <tt>&lt;-- Los ficheros XML de mapeo van aqui.</tt>
9595
/database
9696
/webapp
9797
/css
@@ -243,7 +243,7 @@ SUM: 58 823 612 3464
243243

244244
<source><![CDATA[
245245
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
246-
<property name="basePackage" value="org.mybatis.jpetstore.persistence" />
246+
<property name="basePackage" value="org.mybatis.jpetstore.mapper" />
247247
</bean>
248248
]]></source>
249249

@@ -379,7 +379,7 @@ public interface OrderMapper {
379379
}]]></source>
380380

381381
<source><![CDATA[
382-
<mapper namespace="org.mybatis.jpetstore.persistence.OrderMapper">
382+
<mapper namespace="org.mybatis.jpetstore.mapper.OrderMapper">
383383
384384
<cache />
385385
@@ -428,20 +428,13 @@ public interface OrderMapper {
428428

429429
<subsection name="Running JPetStore">
430430
<p>Te prenguntarás. ¿Esto funciona? ¡Sí! Ejecutémoslo.</p>
431-
<p>Asumiendo que tienes un PC limpio estos son los pasos que debes seguir para ejecutar el ejemplo en Tomcat y Eclipse.</p>
431+
<p>Asumiendo que tienes un PC limpio estos son los pasos que debes seguir para ejecutar el ejemplo en Tomcat.</p>
432432
<ul>
433-
<li>Descarga e instala un JDK 6 o posterior</li>
434-
<li>Descarga y descomprime Eclipse</li>
435-
<li>Descarga y descomprime Tomcat</li>
436-
<li>Ejecuta Eclipse</li>
437-
<li>Ve a la pestaña Git</li>
438-
<li>Clona el repositorio https://github.com/mybatis/jpetstore-6.git</li>
439-
<li>Selecciona working directory, pulsa botón derecho y selecciona Import Projects (general)</li>
440-
<li>Ve a la pestaña Java EE</li>
441-
<li>Botón derecho en el projecto jpetstore y selecciona "Configure/Convert to Maven project"</li>
442-
<li>Botón derecho en el proyecto jpetstore y selecciona "run on server"</li>
443-
<li>Selecciona Tomcat 7 Server y configura el directorio donde lo descomprimiste</li>
444-
<li>¡¡La home de JPetStore debería mostrarse!!</li>
433+
<li>Clone el repo https://github.com/mybatis/jpetstore-6.git</li>
434+
<li>Abre una shell y ve al directorio donde has clonado el proyecto</li>
435+
<li>Ejecuta este comando: mvn clean tomcat7:run</li>
436+
<li>Navega a la siguiente dirección en tu navegador http://localhost:8080/jpetstore/</li>
437+
<li>Pulsa Ctrl-C para parar el servidor.</li>
445438
</ul>
446439

447440
<p>

src/site/ja/xdoc/sample.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ SUM: 58 823 612 3464
7979
/mybatis
8080
/jpetstore
8181
/domain <tt>&lt;-- ドメインオブジェクト</tt>
82-
/persistence <tt>&lt;-- Mapper インターフェイス</tt>
82+
/mapper <tt>&lt;-- Mapper インターフェイス</tt>
8383
/service <tt>&lt;-- アプリケーションロジック</tt>
8484
/web
8585
/actions <tt>&lt;-- プレゼンテーションロジック(アクション)</tt>
8686
/resources <tt>&lt;-- Java 以外のファイル</tt>
8787
/org
8888
/mybatis
8989
/jpetstore
90-
/persistence <tt>&lt;-- Mapper XML ファイル</tt>
90+
/mapper <tt>&lt;-- Mapper XML ファイル</tt>
9191
/database
9292
/webapp
9393
/css
@@ -222,7 +222,7 @@ SUM: 58 823 612 3464
222222

223223
<source><![CDATA[
224224
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
225-
<property name="basePackage" value="org.mybatis.jpetstore.persistence" />
225+
<property name="basePackage" value="org.mybatis.jpetstore.mapper" />
226226
</bean>
227227
]]></source>
228228

@@ -337,7 +337,7 @@ public interface OrderMapper {
337337
}]]></source>
338338

339339
<source><![CDATA[
340-
<mapper namespace="org.mybatis.jpetstore.persistence.OrderMapper">
340+
<mapper namespace="org.mybatis.jpetstore.mapper.OrderMapper">
341341
342342
<cache />
343343

src/site/ko/xdoc/sample.xml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ SUM: 58 823 612 3464
7575
/mybatis
7676
/jpetstore
7777
/domain <tt>&lt;-- 비즈니스 도메인 객체는 여기</tt>
78-
/persistence <tt>&lt;-- 매퍼 인터페이스는 여기</tt>
78+
/mapper <tt>&lt;-- 매퍼 인터페이스는 여기</tt>
7979
/service <tt>&lt;-- 애플리케이션 로직은 여기</tt>
8080
/web
8181
/actions <tt>&lt;-- 프리젠테이션 로직은 여기</tt>
8282
/resources <tt>&lt;-- 자바 이외의 파일은 여기</tt>
8383
/org
8484
/mybatis
8585
/jpetstore
86-
/persistence <tt>&lt;-- 매퍼 XML파일은 여기</tt>
86+
/mapper <tt>&lt;-- 매퍼 XML파일은 여기</tt>
8787
/database
8888
/webapp
8989
/css
@@ -219,7 +219,7 @@ SUM: 58 823 612 3464
219219

220220
<source><![CDATA[
221221
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
222-
<property name="basePackage" value="org.mybatis.jpetstore.persistence" />
222+
<property name="basePackage" value="org.mybatis.jpetstore.mapper" />
223223
</bean>
224224
]]></source>
225225

@@ -341,7 +341,7 @@ public interface OrderMapper {
341341
}]]></source>
342342

343343
<source><![CDATA[
344-
<mapper namespace="org.mybatis.jpetstore.persistence.OrderMapper">
344+
<mapper namespace="org.mybatis.jpetstore.mapper.OrderMapper">
345345
346346
<cache />
347347
@@ -391,21 +391,14 @@ public interface OrderMapper {
391391
<subsection name="Running JPetStore">
392392
<p>물어보자. 더볼게 없나? "예"라고 답변한다면 이제 실행해보자. </p>
393393
<p>Let's assume you have a clean computer. These are the steps you should follow to
394-
have the sample running on Tomcat with Eclipse:
394+
have the sample running under Tomcat:
395395
</p>
396396
<ul>
397-
<li>Download and install a JDK 6 or later</li>
398-
<li>Download and upzip Eclipse</li>
399-
<li>Download and unzip Tomcat</li>
400-
<li>Run Eclipse</li>
401-
<li>Go to Git tab</li>
402397
<li>Clone the repo https://github.com/mybatis/jpetstore-6.git</li>
403-
<li>Select working directory, right click and select Import Projects (general)</li>
404-
<li>Go to Java EE tab</li>
405-
<li>Right click on jpetstore project and select "Configure/Convert to Maven Project"</li>
406-
<li>Right click on jpetstore project and select "run on server"</li>
407-
<li>Select Tomcat Server and set your installation directory</li>
408-
<li>JPetStore home page should be shown!!</li>
398+
<li>Open command prompt/shell and change to cloned directory</li>
399+
<li>Issue following command to run project using Tomcat 7: mvn clean tomcat7:run</li>
400+
<li>Run application in browser http://localhost:8080/jpetstore/</li>
401+
<li>Press Ctrl-C to stop the server.</li>
409402
</ul>
410403
<p>실행할 준비가 되었다면 스스로 원하는 것을 변경해보자. </p>
411404
<p>

src/site/xdoc/sample.xml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ SUM: 58 823 612 3464
8383
/mybatis
8484
/jpetstore
8585
/domain <tt>&lt;-- Business domain objects go here.</tt>
86-
/persistence <tt>&lt;-- Mapper interfaces go here.</tt>
86+
/mapper <tt>&lt;-- Mapper interfaces go here.</tt>
8787
/service <tt>&lt;-- Application logic goes here.</tt>
8888
/web
8989
/actions <tt>&lt;-- Presentation logic (actions) goes here.</tt>
9090
/resources <tt>&lt;-- Non java files go here.</tt>
9191
/org
9292
/mybatis
9393
/jpetstore
94-
/persistence <tt>&lt;-- Mapper XML files go here.</tt>
94+
/mapper <tt>&lt;-- Mapper XML files go here.</tt>
9595
/database
9696
/webapp
9797
/css
@@ -234,7 +234,7 @@ SUM: 58 823 612 3464
234234

235235
<source><![CDATA[
236236
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
237-
<property name="basePackage" value="org.mybatis.jpetstore.persistence" />
237+
<property name="basePackage" value="org.mybatis.jpetstore.mapper" />
238238
</bean>
239239
]]></source>
240240

@@ -365,7 +365,7 @@ public interface OrderMapper {
365365
}]]></source>
366366

367367
<source><![CDATA[
368-
<mapper namespace="org.mybatis.jpetstore.persistence.OrderMapper">
368+
<mapper namespace="org.mybatis.jpetstore.mapper.OrderMapper">
369369
370370
<cache />
371371
@@ -415,21 +415,14 @@ public interface OrderMapper {
415415
<subsection name="Running JPetStore">
416416
<p>You may ask. Does all this work? Yes it does! Let's run it.</p>
417417
<p>Let's assume you have a clean computer. These are the steps you should follow to
418-
have the sample running on Tomcat with Eclipse:
418+
have the sample running under Tomcat:
419419
</p>
420420
<ul>
421-
<li>Download and install a JDK 6 or later</li>
422-
<li>Download and upzip Eclipse</li>
423-
<li>Download and unzip Tomcat</li>
424-
<li>Run Eclipse</li>
425-
<li>Go to Git tab</li>
426421
<li>Clone the repo https://github.com/mybatis/jpetstore-6.git</li>
427-
<li>Select working directory, right click and select Import Projects (general)</li>
428-
<li>Go to Java EE tab</li>
429-
<li>Right click on jpetstore project and select "Configure/Convert to Maven Project"</li>
430-
<li>Right click on jpetstore project and select "run on server"</li>
431-
<li>Select Tomcat Server and set your installation directory</li>
432-
<li>JPetStore home page should be shown!!</li>
422+
<li>Open command prompt/shell and change to cloned directory</li>
423+
<li>Issue following command to run project using Tomcat 7: mvn clean tomcat7:run</li>
424+
<li>Run application in browser http://localhost:8080/jpetstore/</li>
425+
<li>Press Ctrl-C to stop the server.</li>
433426
</ul>
434427
<p>
435428
Now you are ready to play with it, experiment with your own changes or whatever you want.

src/site/zh/xdoc/sample.xml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright 2010-2012 the original author or authors.
3+
Copyright 2010-2015 the original author or authors.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -83,15 +83,15 @@ SUM: 58 823 612 3464
8383
/mybatis
8484
/jpetstore
8585
/domain <tt>&lt;-- Business domain objects go here.</tt>
86-
/persistence <tt>&lt;-- Mapper interfaces go here.</tt>
86+
/mapper <tt>&lt;-- Mapper interfaces go here.</tt>
8787
/service <tt>&lt;-- Application logic goes here.</tt>
8888
/web
8989
/actions <tt>&lt;-- Presentation logic (actions) goes here.</tt>
9090
/resources <tt>&lt;-- Non java files go here.</tt>
9191
/org
9292
/mybatis
9393
/jpetstore
94-
/persistence <tt>&lt;-- Mapper XML files go here.</tt>
94+
/mapper <tt>&lt;-- Mapper XML files go here.</tt>
9595
/database
9696
/webapp
9797
/css
@@ -234,7 +234,7 @@ SUM: 58 823 612 3464
234234

235235
<source><![CDATA[
236236
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
237-
<property name="basePackage" value="org.mybatis.jpetstore.persistence" />
237+
<property name="basePackage" value="org.mybatis.jpetstore.mapper" />
238238
</bean>
239239
]]></source>
240240

@@ -365,7 +365,7 @@ public interface OrderMapper {
365365
}]]></source>
366366

367367
<source><![CDATA[
368-
<mapper namespace="org.mybatis.jpetstore.persistence.OrderMapper">
368+
<mapper namespace="org.mybatis.jpetstore.mapper.OrderMapper">
369369
370370
<cache />
371371
@@ -415,21 +415,14 @@ public interface OrderMapper {
415415
<subsection name="Running JPetStore">
416416
<p>You may ask. Does all this work? Yes it does! Let's run it.</p>
417417
<p>Let's assume you have a clean computer. These are the steps you should follow to
418-
have the sample running on Tomcat with Eclipse:
418+
have the sample running under Tomcat:
419419
</p>
420420
<ul>
421-
<li>Download and install a JDK 6 or later</li>
422-
<li>Download and upzip Eclipse</li>
423-
<li>Download and unzip Tomcat</li>
424-
<li>Run Eclipse</li>
425-
<li>Go to Git tab</li>
426421
<li>Clone the repo https://github.com/mybatis/jpetstore-6.git</li>
427-
<li>Select working directory, right click and select Import Projects (general)</li>
428-
<li>Go to Java EE tab</li>
429-
<li>Right click on jpetstore project and select "Configure/Convert to Maven Project"</li>
430-
<li>Right click on jpetstore project and select "run on server"</li>
431-
<li>Select Tomcat Server and set your installation directory</li>
432-
<li>JPetStore home page should be shown!!</li>
422+
<li>Open command prompt/shell and change to cloned directory</li>
423+
<li>Issue following command to run project using Tomcat 7: mvn clean tomcat7:run</li>
424+
<li>Run application in browser http://localhost:8080/jpetstore/</li>
425+
<li>Press Ctrl-C to stop the server.</li>
433426
</ul>
434427
<p>
435428
Now you are ready to play with it, experiment with your own changes or whatever you want.

0 commit comments

Comments
 (0)