Skip to content

Commit f2c126d

Browse files
committed
Seems Eclipse Kepler comes with Git and Maven.
1 parent 5b4724b commit f2c126d

File tree

5 files changed

+56
-105
lines changed

5 files changed

+56
-105
lines changed

src/site/es/xdoc/sample.xml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -406,21 +406,17 @@ public interface OrderMapper {
406406

407407
<subsection name="Running JPetStore">
408408
<p>Te prenguntarás. ¿Esto funciona? ¡Sí! Ejecutémoslo.</p>
409-
<p>Asumiendo que tienes un PC limpio estos son los pasos que debes seguir para ejecutar el ejemplo en Tomcat 7 y Eclipse.</p>
409+
<p>Asumiendo que tienes un PC limpio estos son los pasos que debes seguir para ejecutar el ejemplo en Tomcat y Eclipse.</p>
410410
<ul>
411411
<li>Descarga e instala un JDK 6 o posterior</li>
412412
<li>Descarga y descomprime Eclipse</li>
413-
<li>Descarga y descomprime Tomcat 7</li>
413+
<li>Descarga y descomprime Tomcat</li>
414414
<li>Ejecuta Eclipse</li>
415-
<li>En eclipse, ve a Help/Eclipse Marketplace</li>
416-
<li>Instala m2e plugin (maven)</li>
417-
<li>Instala m2e-wtp plugin (maven for wtp)</li>
418-
<li>Instala Egit (git)</li>
419415
<li>Ve a la pestaña Git</li>
420-
<li>En SVN añade un nuevo repositorio "http://mybatis.googlecode.com/svn"</li>
421-
<li>En SVN ve al directorio "sub-projects/jpetstore-6/trunk" </li>
422-
<li>Botón derecho de ratón y selecciona "Check out", nombra el proyecto como "jpetstore"</li>
423-
<li>Aparecerá un nuevo proyecto llamado"jpetstore"</li>
416+
<li>Clona el repositorio https://github.com/mybatis/jpetstore-6.git</li>
417+
<li>Selecciona working directory, pulsa botón derecho y selecciona Import Projects (general)</li>
418+
<li>Ve a la pestaña Java EE</li>
419+
<li>Botón derecho en el projecto jpetstore y selecciona "Configure/Convert to Maven project"</li>
424420
<li>Botón derecho en el proyecto jpetstore y selecciona "run on server"</li>
425421
<li>Selecciona Tomcat 7 Server y configura el directorio donde lo descomprimiste</li>
426422
<li>¡¡La home de JPetStore debería mostrarse!!</li>
@@ -430,9 +426,8 @@ public interface OrderMapper {
430426
Ya estás listo para jugar con la demo, experimentar tus propios cambios o lo que tú quieras.
431427
</p>
432428
<p>
433-
Y recuerda que si encuentras un bug o ves que falta algo o que hay algo mejorable (por ejemplo faltan los tests!),m
434-
cambialo, crea un fichero diff patch y rellena un issue con él en el
435-
<a href="http://code.google.com/p/mybatis/issues/entry">tracker</a>. Gracias de antemano!
429+
Y recuerda que si encuentras un bug o ves que falta algo o que hay algo mejorable (por ejemplo faltan los tests!),
430+
haz un fork del repositorio, cámbialo y abre un pull request. Gracias de antemano!
436431
</p>
437432
<p>
438433
<span class="label important">NOTE</span>

src/site/ja/xdoc/sample.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -366,23 +366,19 @@ public interface OrderMapper {
366366

367367
<subsection name="JPetStore の実行">
368368
<p>本当に動くの?と思うかも知れません。もちろんです! 実際に試してみましょう。/</p>
369-
<p>クリーンなコンピューターを持っているとして、Eclipse 上の Tomcat 7 を使ってサンプルを実行する手順を下記に示します。
369+
<p>クリーンなコンピューターを持っているとして、Eclipse 上の Tomcat を使ってサンプルを実行する手順を下記に示します。
370370
</p>
371371
<ul>
372372
<li>JDK 6 以降をダウンロードしてインストールします。</li>
373373
<li>Eclipse をダウンロードして解凍します。</li>
374-
<li>Tomcat 7 をダウンロードして解凍します。</li>
374+
<li>Tomcat をダウンロードして解凍します。</li>
375375
<li>Eclipse を起動します。</li>
376-
<li>Help/Eclipse Marketplace を選択します。</li>
377-
<li>m2e plugin (maven) をインストールします。</li>
378-
<li>m2e-wtp plugin (maven for wtp) をインストールします。</li>
379-
<li>EGit plugin (git) をインストールします。</li>
380376
<li>新規のリポジトリ "https://github.com/mybatis/jpetstore-6.git" を追加します。</li>
381377
<li>右クリックして "Check out" を選択し、プロジェクト名 "jpetstore" を入力します。</li>
382378
<li>Java EE タブを開きます。</li>
383379
<li>jpetstore プロジェクトを右クリックして "Configure/Convert to Maven Project" を選択します。</li>
384380
<li>jpetstore プロジェクトを右クリックして "run on server" を選択します。</li>
385-
<li>Tomcat 7 Server を選び、Tomcat 7 をインストールしたディレクトリを指定します。</li>
381+
<li>Tomcat Server を選び、Tomcat 7 をインストールしたディレクトリを指定します。</li>
386382
<li>JPetStore のホームページが表示されるはずです!</li>
387383
</ul>
388384
<p>

src/site/ko/xdoc/sample.xml

Lines changed: 19 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -369,43 +369,28 @@ public interface OrderMapper {
369369

370370
<subsection name="Running JPetStore">
371371
<p>물어보자. 더볼게 없나? "예"라고 답변한다면 이제 실행해보자. </p>
372-
<p>당신의 컴퓨터가 깨끗한 상태라고 생각해보자. 톰캣 7과 NetBeans 7을 사용한다고 가정하면 다음단계를 거친다. </p>
372+
<p>Let's assume you have a clean computer. These are the steps you should follow to
373+
have the sample running on Tomcat with Eclipse:
374+
</p>
373375
<ul>
374-
<li>톰캣 7과 NetBeans 7.x JEE 을 다운로드하고 설치</li>
375-
<li>NetBeans 에서 Team/Subversion/Checkout 를 선택</li>
376-
<li>저장소(repository) URL에 "http://mybatis.googlecode.com/svn" 입력</li>
377-
<li>원격 저장소 폴더를 "sub-projects/jpetstore-6/trunk" 로 입력</li>
378-
<li>프로젝트 폴더명을 적는다. 내 경우는 "/home/eduardo/NetBeansProjects/jpetstore6" 이다.</li>
379-
<li>NetBeans가 "A new project was found do you want to open it"라고 물어보면 ok를 클릭</li>
380-
<li>NetBeans 프로젝트 탭에 새로운 프로젝트명으로 "JPetStore Demo 6" 가 보일것이다. </li>
381-
<li>jpetstore프로젝트를 선택하고 마우스 우측 버튼을 클릭 후 "Run"을 실행</li>
382-
<li>톰캣 7 서버 선택</li>
383-
<li>JPetStore 홈페이지가 보일것이다. </li>
384-
</ul>
385-
<p>이클립스에서 실행하기 위해 몇가지 단계가 있다.
386-
이클립스가 내장된 SVN과 메이븐을 지원하지 않고 톰캣을 별도로 설정해야 하기 때문에 과정이 다소 좀 오래걸린다.</p>
387-
<ul>
388-
<li>JDK 6 과 이상의 버전을 다운로드하고 설치</li>
389-
<li>이클립스를 다운로드하고 압축을 해제</li>
390-
<li>톰캣 7 을 다운로드하고 압축을 해제</li>
391-
<li>이클립스 실행</li>
392-
<li>이클립스에서 Help/Eclipse Marketplace 선택</li>
393-
<li>m2e 플러그인(메이븐) 설치</li>
394-
<li>m2e-wtp(wtp를 위한 메이븐) 플러그인 설치</li>
395-
<li>subclipse 플러그인(서브버전) 설치</li>
396-
<li>SVN 탭으로 이동</li>
397-
<li>SVN 에서 새로운 저장소로 "http://mybatis.googlecode.com/svn" 추가</li>
398-
<li>SVN 에서 "sub-projects/jpetstore-6/trunk" 로 이동</li>
399-
<li>마우스 우측버튼을 클릭하고 "Check out" 선택, 프로젝트명은 "jpetstore" 로 셋팅</li>
400-
<li>Java EE 탭으로 이동</li>
401-
<li>jpetstore 프로젝트에서 마우스 우측 버튼을 클릭하고 "Configure/Convert to Maven Project" 를 선택</li>
402-
<li>jpetstore 프로젝트에서 마우스 우측 버튼을 클릭하고 "run on server" 를 선택</li>
403-
<li>톰캣 7 서버를 선택하고 설치디렉터리를 셋팅</li>
404-
<li>JPetStore 홈페이지가 보일것이다. </li>
376+
<li>Download and install a JDK 6 or later</li>
377+
<li>Download and upzip Eclipse</li>
378+
<li>Download and unzip Tomcat</li>
379+
<li>Run Eclipse</li>
380+
<li>Go to Git tab</li>
381+
<li>Clone the repo https://github.com/mybatis/jpetstore-6.git</li>
382+
<li>Select working directory, right click and select Import Projects (general)</li>
383+
<li>Go to Java EE tab</li>
384+
<li>Right click on jpetstore project and select "Configure/Convert to Maven Project"</li>
385+
<li>Right click on jpetstore project and select "run on server"</li>
386+
<li>Select Tomcat Server and set your installation directory</li>
387+
<li>JPetStore home page should be shown!!</li>
405388
</ul>
406389
<p>실행할 준비가 되었다면 스스로 원하는 것을 변경해보자. </p>
407-
<p>버그를 찾았거나 일부 빠진 내용이 있고 개선이 가능한 내용이 있다면 변경해서 diff패치파일을 생성해서
408-
<a href="http://code.google.com/p/mybatis/issues/entry">트래커</a>에 이슈를 올려달라. </p>
390+
<p>
391+
And remember that if you find a bug or something that is missing or can be improved (for example the missing tests!),
392+
fork the repo, change it, and open a pull request. Thanks in advance!!!
393+
</p>
409394
<p>
410395
<span class="label important">중요</span>
411396
JPetStore 6 은 서블릿 2.5 와 JSP 2.1 과 호환되는 자바서버에서 돌아간다.

src/site/xdoc/sample.xml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -397,37 +397,32 @@ public interface OrderMapper {
397397
<subsection name="Running JPetStore">
398398
<p>You may ask. Does all this work? Yes it does! Let's run it.</p>
399399
<p>Let's assume you have a clean computer. These are the steps you should follow to
400-
have the sample running on Tomcat 7 with Eclipse:
400+
have the sample running on Tomcat with Eclipse:
401401
</p>
402402
<ul>
403403
<li>Download and install a JDK 6 or later</li>
404404
<li>Download and upzip Eclipse</li>
405-
<li>Download and unzip Tomcat 7</li>
405+
<li>Download and unzip Tomcat</li>
406406
<li>Run Eclipse</li>
407-
<li>In eclipse, go to Help/Eclipse Marketplace</li>
408-
<li>Install m2e plugin (maven)</li>
409-
<li>Install m2e-wtp plugin (maven for wtp)</li>
410-
<li>Install EGit plugin (git)</li>
411407
<li>Go to Git tab</li>
412-
<li>Add a new repo from https://github.com/mybatis/jpetstore-6.git</li>
413-
<li>Select working directory, right click and select Import Projects</li>
408+
<li>Clone the repo https://github.com/mybatis/jpetstore-6.git</li>
409+
<li>Select working directory, right click and select Import Projects (general)</li>
414410
<li>Go to Java EE tab</li>
415411
<li>Right click on jpetstore project and select "Configure/Convert to Maven Project"</li>
416412
<li>Right click on jpetstore project and select "run on server"</li>
417-
<li>Select Tomcat 7 Server and set your installation directory</li>
413+
<li>Select Tomcat Server and set your installation directory</li>
418414
<li>JPetStore home page should be shown!!</li>
419415
</ul>
420416
<p>
421417
Now you are ready to play with it, experiment with your own changes or whatever you want.
422418
</p>
423419
<p>
424420
And remember that if you find a bug or something that is missing or can be improved (for example the missing tests!),
425-
change it, create a diff patch file and fill an issue with it in the
426-
<a href="http://code.google.com/p/mybatis/issues/entry">tracker</a>. Thanks in advance!!!
421+
fork the repo, change it, and open a pull request. Thanks in advance!!!
427422
</p>
428423
<p>
429424
<span class="label important">NOTE</span>
430-
JPetStore 6 should run in any Servlet 2.5 y JSP 2.1 compliant Java server. Netbeans or Eclipse are not needed
425+
JPetStore 6 should run in any Servlet 2.5 y JSP 2.1 compliant Java server. Eclipse is not needed
431426
either, you can run the sample from your favorite IDE or the command line.
432427
</p>
433428
</subsection>

src/site/zh/xdoc/sample.xml

Lines changed: 19 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323

2424
<properties>
2525
<title>MyBatis-Spring | Sample Code</title>
26-
<author email="[email protected]">Hunter Presnall</author>
2726
<author email="[email protected]">Eduardo Macarron</author>
28-
<author email="[email protected]">Nan Lei</author>
2927
</properties>
3028

3129
<body>
@@ -40,15 +38,17 @@
4038
</p>
4139
<subsection name="Purpose">
4240
<p>
43-
This new JPetStore comes with the same idea in mind than for its predecessors: <strong>keep it simple</strong>. The main purpose behind JPetStore 6
44-
is to demonstrate that a full web application can be built with just a few classes, and what is more important, with no advanced coding
45-
skills. You just need to know plain Java and SQL.
41+
This new JPetStore comes with the same idea in mind than its predecessors: <strong>keep it simple</strong>.
42+
The purpose of JPetStore 6 is to demonstrate how to build a web application with very few classes and no advanced coding skills.
43+
You just need to know plain Java and SQL.
4644
</p>
4745
<p>
48-
The 6th version of JPetStore is the smallest one in the family. It uses just 24 java classes while keeping a good design and program structure.
49-
As we will see a bit later, you will not find JDBC code, object creation, binding code or transaction handling code. What is more
50-
impressive is that you <strong>will not even find any call to the MyBatis API</strong>. Although this sounds magical, you will see that the
51-
combination of MyBatis mappers and dependency injection lets you build applications with no dependency on MyBatis.
46+
The 6th version of JPetStore is the smallest one in the family.
47+
It uses just 24 java classes while keeping a good design and program structure.
48+
As we will see later on, you will find no code for dealing with JDBC, for creating objects or bind them or to handle transactions.
49+
What is more impressive is that you <strong>will not find any call to the MyBatis API</strong>.
50+
Although this sounds magical, you will see that the combination of MyBatis mappers and dependency injection lets you
51+
build applications without dependencies.
5252
</p>
5353
</subsection>
5454
<subsection name="Program Structure">
@@ -173,8 +173,8 @@
173173

174174
<p>
175175
<span class="label important">NOTE</span> Spring's component scan feature is not able to find MyBatis mappers.
176-
A mapper is not a plain bean and Spring would not know how to instantiate it. We will need a
177-
<code>MapperScannerConfigurer</code> for that, as we will see soon.
176+
A mapper is not a plain bean and Spring would not know how to instantiate it. We will see how to search for
177+
mappers soon.
178178
</p>
179179

180180
<p>We will also need a <code>DataSource</code> and a <code>TransactionManager</code>. Given that this is a demo application
@@ -397,52 +397,32 @@ public interface OrderMapper {
397397
<subsection name="Running JPetStore">
398398
<p>You may ask. Does all this work? Yes it does! Let's run it.</p>
399399
<p>Let's assume you have a clean computer. These are the steps you should follow to
400-
have the sample running on Tomcat 7 with NetBeans 7:
400+
have the sample running on Tomcat with Eclipse:
401401
</p>
402-
<ul>
403-
<li>Download and install NetBeans 7.x JEE version with Tomcat 7</li>
404-
<li>In NetBeans select Team/Subversion/Checkout</li>
405-
<li>Enter "http://mybatis.googlecode.com/svn" as repository URL</li>
406-
<li>Enter "sub-projects/jpetstore-6/trunk" as remote repository folder</li>
407-
<li>Enter your projects folder name, in my case "/home/eduardo/NetBeansProjects/jpetstore6"</li>
408-
<li>NetBeans will prompt "A new project was found do you want to open it". Press ok</li>
409-
<li>A new project named "JPetStore Demo 6" will be shown in NetBeans projects tab</li>
410-
<li>Right click on jpetstore project and select "Run"</li>
411-
<li>Select Tomcat 7 Server</li>
412-
<li>JPetStore home page should be shown!!</li>
413-
</ul>
414-
<p>These are the steps to run it in Eclipse. The process is a bit longer because Eclipse does not provide
415-
built-in SVN and maven support and does not provide an option to install Tomcat.</p>
416402
<ul>
417403
<li>Download and install a JDK 6 or later</li>
418404
<li>Download and upzip Eclipse</li>
419-
<li>Download and unzip Tomcat 7</li>
405+
<li>Download and unzip Tomcat</li>
420406
<li>Run Eclipse</li>
421-
<li>In eclipse, go to Help/Eclipse Marketplace</li>
422-
<li>Install m2e plugin (maven)</li>
423-
<li>Install m2e-wtp plugin (maven for wtp)</li>
424-
<li>Install subclipse plugin (subversion)</li>
425-
<li>Go to SVN tab</li>
426-
<li>In SVN add a new repository "http://mybatis.googlecode.com/svn"</li>
427-
<li>In SVN go to "sub-projects/jpetstore-6/trunk" </li>
428-
<li>Mouse right click and select "Check out", name the project as "jpetstore"</li>
407+
<li>Go to Git tab</li>
408+
<li>Clone the repo https://github.com/mybatis/jpetstore-6.git</li>
409+
<li>Select working directory, right click and select Import Projects (general)</li>
429410
<li>Go to Java EE tab</li>
430411
<li>Right click on jpetstore project and select "Configure/Convert to Maven Project"</li>
431412
<li>Right click on jpetstore project and select "run on server"</li>
432-
<li>Select Tomcat 7 Server and set your installation directory</li>
413+
<li>Select Tomcat Server and set your installation directory</li>
433414
<li>JPetStore home page should be shown!!</li>
434415
</ul>
435416
<p>
436417
Now you are ready to play with it, experiment with your own changes or whatever you want.
437418
</p>
438419
<p>
439420
And remember that if you find a bug or something that is missing or can be improved (for example the missing tests!),
440-
change it, create a diff patch file and fill an issue with it in the
441-
<a href="http://code.google.com/p/mybatis/issues/entry">tracker</a>. Thanks in advance!!!
421+
fork the repo, change it, and open a pull request. Thanks in advance!!!
442422
</p>
443423
<p>
444424
<span class="label important">NOTE</span>
445-
JPetStore 6 should run in any Servlet 2.5 y JSP 2.1 compliant Java server. Netbeans or Eclipse are not needed
425+
JPetStore 6 should run in any Servlet 2.5 y JSP 2.1 compliant Java server. Eclipse is not needed
446426
either, you can run the sample from your favorite IDE or the command line.
447427
</p>
448428
</subsection>

0 commit comments

Comments
 (0)