Skip to content

Commit 54f4547

Browse files
author
Artem Pronchakov
committed
Project
1 parent 21dfc72 commit 54f4547

2,149 files changed

Lines changed: 334870 additions & 245545 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎EJB/ejb-pom-module/ejb-ear-module/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
66
<groupId>edu.javacourse</groupId>
@@ -9,10 +9,10 @@
99
<relativePath>../../../</relativePath>
1010
</parent>
1111

12-
<groupId>edu.javacourse.ejb</groupId>
13-
<artifactId>ejb-ear-module</artifactId>
14-
<version>1.0-SNAPSHOT</version>
15-
<packaging>ear</packaging>
12+
<groupId>edu.javacourse.ejb</groupId>
13+
<artifactId>ejb-ear-module</artifactId>
14+
<version>1.0-SNAPSHOT</version>
15+
<packaging>ear</packaging>
1616

1717
<name>EJB ejb-ear-module</name>
1818

‎EJB/ejb-pom-module/ejb-war-module/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

‎EJB/ejb-pom-module/ejb-war-module/src/main/java/edu/javacourse/Book.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@ public void setName(String name) {
3131
}
3232

3333
@Override
34-
public String toString()
35-
{
36-
final StringBuilder sb = new StringBuilder( "Book{" );
37-
sb.append( "id=" ).append( id );
38-
sb.append( ", name='" ).append( name ).append( '\'' );
39-
sb.append( '}' );
34+
public String toString() {
35+
final StringBuilder sb = new StringBuilder("Book{");
36+
sb.append("id=").append(id);
37+
sb.append(", name='").append(name).append('\'');
38+
sb.append('}');
4039
return sb.toString();
4140
}
4241
}

‎EJB/ejb-pom-module/ejb-war-module/src/main/java/edu/javacourse/BookEJB.java‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
55

6-
import javax.annotation.PostConstruct;
7-
import javax.ejb.Init;
86
import javax.ejb.Stateless;
97
import java.util.ArrayList;
108
import java.util.List;
@@ -15,23 +13,21 @@
1513

1614
@Stateless
1715
public class BookEJB
18-
implements BookEJBLocal
19-
{
16+
implements BookEJBLocal {
2017

21-
private static final Logger log = LoggerFactory.getLogger( BookEJB.class );
18+
private static final Logger log = LoggerFactory.getLogger(BookEJB.class);
2219

2320
@Override
24-
public List< Book > getBooks()
25-
{
26-
log.trace( "Inside EJB's getBooks" );
27-
List< Book > list = new ArrayList< Book >();
28-
list.add( new Book( 1L, "Book1" ) );
29-
list.add( new Book( 2L, "Book2" ) );
30-
list.add( new Book( 3L, "Book3" ) );
21+
public List<Book> getBooks() {
22+
log.trace("Inside EJB's getBooks");
23+
List<Book> list = new ArrayList<Book>();
24+
list.add(new Book(1L, "Book1"));
25+
list.add(new Book(2L, "Book2"));
26+
list.add(new Book(3L, "Book3"));
3127

32-
log.debug( "Returned books: {}", list );
28+
log.debug("Returned books: {}", list);
3329

34-
log.trace( "getBooks return" );
30+
log.trace("getBooks return");
3531
return list;
3632
}
3733

‎EJB/ejb-pom-module/ejb-war-module/src/main/java/edu/javacourse/BookServlet.java‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,35 @@
1717
* @author Artem Pronchakov | email/xmpp: artem.pronchakov@calisto.email
1818
*/
1919

20-
@WebServlet(name = "BookServlet", urlPatterns = { "/bookServlet" })
21-
public class BookServlet
22-
extends HttpServlet
23-
{
20+
@WebServlet(name = "BookServlet", urlPatterns = {"/bookServlet"})
21+
public class BookServlet extends HttpServlet {
2422

25-
private static final Logger log = LoggerFactory.getLogger( BookServlet.class );
23+
private static final Logger log = LoggerFactory.getLogger(BookServlet.class);
2624

2725
@EJB
2826
private BookEJBLocal bookEJBLocal;
2927

3028
@Override
31-
protected void doGet( HttpServletRequest request, HttpServletResponse response )
32-
throws ServletException, IOException
33-
{
34-
log.trace( "Servlet BookServlet doGet begin" );
35-
log.debug( "BookEJBLocal class: {}", bookEJBLocal == null ? "EJB not initialized" : bookEJBLocal.getClass().getCanonicalName() );
29+
protected void doGet(HttpServletRequest request, HttpServletResponse response)
30+
throws ServletException, IOException {
31+
log.trace("Servlet BookServlet doGet begin");
32+
log.debug("BookEJBLocal class: {}", bookEJBLocal == null ? "EJB not initialized" : bookEJBLocal.getClass().getCanonicalName());
3633

37-
List< Book > books = bookEJBLocal.getBooks();
34+
List<Book> books = bookEJBLocal.getBooks();
3835

39-
log.debug( "Books returned by EJB: {}", books );
36+
log.debug("Books returned by EJB: {}", books);
4037

41-
request.setAttribute( "books", books );
38+
request.setAttribute("books", books);
4239

43-
getServletContext().getRequestDispatcher( "/index.jsp" ).forward( request, response );
44-
log.trace( "Servlet BookServlet doGet end" );
40+
getServletContext().getRequestDispatcher("/index.jsp").forward(request, response);
41+
log.trace("Servlet BookServlet doGet end");
4542
}
4643

47-
public BookEJBLocal getBookEJBLocal()
48-
{
44+
public BookEJBLocal getBookEJBLocal() {
4945
return bookEJBLocal;
5046
}
5147

52-
public void setBookEJBLocal( BookEJBLocal bookEJBLocal )
53-
{
48+
public void setBookEJBLocal(BookEJBLocal bookEJBLocal) {
5449
this.bookEJBLocal = bookEJBLocal;
5550
}
5651
}

‎EJB/ejb-pom-module/pom.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>edu.javacourse.ejb</groupId>
6-
<artifactId>ejb-pom-module</artifactId>
7-
<version>1.0-SNAPSHOT</version>
8-
<packaging>pom</packaging>
5+
<groupId>edu.javacourse.ejb</groupId>
6+
<artifactId>ejb-pom-module</artifactId>
7+
<version>1.0-SNAPSHOT</version>
8+
<packaging>pom</packaging>
99

1010
<name>EJB ejb-pom-module</name>
1111

12-
<modules>
13-
<module>ejb-ear-module</module>
14-
<module>ejb-war-module</module>
15-
</modules>
12+
<modules>
13+
<module>ejb-ear-module</module>
14+
<module>ejb-war-module</module>
15+
</modules>
1616

1717
</project>

‎EJB/pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>edu.javacourse</groupId>
6-
<artifactId>ejb</artifactId>
7-
<version>1.0-SNAPSHOT</version>
8-
<packaging>pom</packaging>
5+
<groupId>edu.javacourse</groupId>
6+
<artifactId>ejb</artifactId>
7+
<version>1.0-SNAPSHOT</version>
8+
<packaging>pom</packaging>
99

1010
<name>EJB</name>
1111

12-
<modules>
13-
<module>ejb-pom-module</module>
14-
</modules>
12+
<modules>
13+
<module>ejb-pom-module</module>
14+
</modules>
1515

1616
</project>

‎Hibernate/part1/GS_Hibernate_ConfigProg_Annotation/pom.xml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>edu.javacourse</groupId>
6-
<artifactId>hibernate-prog-annotations</artifactId>
7-
<version>1.0-SNAPSHOT</version>
8-
<packaging>jar</packaging>
5+
<groupId>edu.javacourse</groupId>
6+
<artifactId>hibernate-prog-annotations</artifactId>
7+
<version>1.0-SNAPSHOT</version>
8+
<packaging>jar</packaging>
99

10-
<url>http://maven.apache.org</url>
10+
<url>http://maven.apache.org</url>
1111

12-
1312

14-
<dependencies>
13+
<dependencies>
1514

1615

1716
<dependency>
@@ -31,7 +30,7 @@
3130
<version>1.0.2</version>
3231
<scope>provided</scope>
3332
</dependency>
34-
<dependency>
33+
<dependency>
3534
<groupId>org.hibernate</groupId>
3635
<artifactId>hibernate-annotations</artifactId>
3736
<version>3.5.6-Final</version>

‎Hibernate/part1/GS_Hibernate_ConfigProg_Annotation/src/main/java/edu/javacourse/hibernate/HibernateSimple.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
package edu.javacourse.hibernate;
22

3-
import java.util.List;
43
import org.hibernate.Session;
54
import org.hibernate.SessionFactory;
65
import org.hibernate.cfg.Configuration;
76

7+
import java.util.List;
8+
89
/**
910
* Простой пример работы с программно загружаемой конфигурацией и мапингом в виде аннотаций
10-
*
11+
*
1112
* @author ASaburov
1213
*/
1314
public class HibernateSimple {
1415

1516
public static void main(String[] args) {
1617
HibernateSimple hs = new HibernateSimple();
17-
18+
1819
Session s = hs.getSessionFactory().getCurrentSession();
1920
s.beginTransaction();
2021
List<Region> regionList = s.createQuery("from Region").list();
2122
s.getTransaction().commit();
22-
23-
for(Region r : regionList) {
23+
24+
for (Region r : regionList) {
2425
System.out.println("Region name:" + r.getRegionName());
2526
}
2627
}
2728

2829
private SessionFactory getSessionFactory() {
29-
30+
3031
Configuration cfg = new Configuration()
3132
.addAnnotatedClass(edu.javacourse.hibernate.Region.class)
3233
.setProperty("hibernate.dialect", "org.hibernate.dialect.MySQLInnoDBDialect")

‎Hibernate/part1/GS_Hibernate_ConfigProg_Annotation/src/main/java/edu/javacourse/hibernate/Region.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
package edu.javacourse.hibernate;
22

3+
import javax.persistence.*;
34
import java.io.Serializable;
4-
import javax.persistence.Column;
5-
import javax.persistence.Entity;
6-
import javax.persistence.GeneratedValue;
7-
import javax.persistence.GenerationType;
8-
import javax.persistence.Id;
9-
import javax.persistence.Table;
105

116
@Entity
127
@Table(name = "jc_region")

0 commit comments

Comments
 (0)