diff --git a/JQuery/JQueryExampleN10/pom.xml b/JQuery/JQueryExampleN10/pom.xml index 28d43dd7..9fb82ef9 100755 --- a/JQuery/JQueryExampleN10/pom.xml +++ b/JQuery/JQueryExampleN10/pom.xml @@ -20,9 +20,13 @@ javax javaee-web-api - 6.0 + 7.0 provided + + + + diff --git a/JQuery/JQueryExampleN10/src/main/webapp/index.jsp b/JQuery/JQueryExampleN10/src/main/webapp/index.jsp index a4ce680e..7cfb4218 100755 --- a/JQuery/JQueryExampleN10/src/main/webapp/index.jsp +++ b/JQuery/JQueryExampleN10/src/main/webapp/index.jsp @@ -9,12 +9,19 @@ diff --git a/JQuery/JQueryExampleN11/pom.xml b/JQuery/JQueryExampleN11/pom.xml index 8d7cd079..531060f5 100755 --- a/JQuery/JQueryExampleN11/pom.xml +++ b/JQuery/JQueryExampleN11/pom.xml @@ -20,7 +20,7 @@ javax javaee-web-api - 6.0 + 7.0 provided diff --git a/JQuery/JQueryExampleN11/src/main/webapp/index.jsp b/JQuery/JQueryExampleN11/src/main/webapp/index.jsp index 0a62488a..5f74eb4d 100755 --- a/JQuery/JQueryExampleN11/src/main/webapp/index.jsp +++ b/JQuery/JQueryExampleN11/src/main/webapp/index.jsp @@ -11,7 +11,7 @@ $('#button').click(function () { $.ajax({ "url": "GetRandom", - "timeout": 2000, + "timeout": 3500, "beforeSend": function () { $('#info').text("Requesting new random value..."); }, diff --git a/Logging/log4j/src/main/java/ru/test/logging/App.java b/Logging/log4j/src/main/java/ru/test/logging/App.java index 7e700286..91a338c3 100644 --- a/Logging/log4j/src/main/java/ru/test/logging/App.java +++ b/Logging/log4j/src/main/java/ru/test/logging/App.java @@ -3,6 +3,7 @@ import org.apache.log4j.Logger; public class App { +// App.class отражение категории private static final Logger log = Logger.getLogger(App.class); public static void main(String[] args) { diff --git a/Logging/log4j/src/main/resources/log4j.xml b/Logging/log4j/src/main/resources/log4j.xml index ab498997..07037e9a 100644 --- a/Logging/log4j/src/main/resources/log4j.xml +++ b/Logging/log4j/src/main/resources/log4j.xml @@ -3,6 +3,7 @@ + @@ -13,6 +14,7 @@ + diff --git a/Logging/slf4j/slf4j-target/pom.xml b/Logging/slf4j/slf4j-target/pom.xml index 49e6309e..08a3a02e 100644 --- a/Logging/slf4j/slf4j-target/pom.xml +++ b/Logging/slf4j/slf4j-target/pom.xml @@ -22,6 +22,9 @@ slf4j-source 1.0-SNAPSHOT + + + org.slf4j slf4j-log4j12 diff --git a/Spring/GS_Spring_17_JUnit/src/test/java/edu/javacourse/spring/test/SimpleTest.java b/Spring/GS_Spring_17_JUnit/src/test/java/edu/javacourse/spring/test/SimpleTest.java index 05c9a4e9..185db6ac 100644 --- a/Spring/GS_Spring_17_JUnit/src/test/java/edu/javacourse/spring/test/SimpleTest.java +++ b/Spring/GS_Spring_17_JUnit/src/test/java/edu/javacourse/spring/test/SimpleTest.java @@ -1,21 +1,24 @@ package edu.javacourse.spring.test; import edu.javacourse.spring.bean.RegionManager; -import junit.framework.TestCase; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.junit.Assert.assertNotNull; + /** - * Author: Georgy Gobozov - * Date: 18.07.13 + * RunWith аннот junit. Вставляется класс, который junit будет использовать + * У спринга есть спец класс, зависимость spring-test */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:springExample.xml"}) -public class SimpleTest extends TestCase { - +public class SimpleTest { + @Autowired + ApplicationContext context; @Autowired RegionManager manager; diff --git a/Spring/GS_Spring_22_Hibernate/pom.xml b/Spring/GS_Spring_22_Hibernate/pom.xml index 7b557232..51a05529 100644 --- a/Spring/GS_Spring_22_Hibernate/pom.xml +++ b/Spring/GS_Spring_22_Hibernate/pom.xml @@ -9,15 +9,32 @@ http://maven.apache.org + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.5.1 + + 1.7 + 1.7 + + + - + + org.springframework + spring-beans + 3.1.4.RELEASE + org.springframework spring-context 3.1.4.RELEASE + org.springframework spring-tx @@ -29,6 +46,7 @@ spring-jdbc 3.1.4.RELEASE + org.springframework spring-orm @@ -41,41 +59,26 @@ 3.6.9.Final - - org.hibernate - hibernate-annotations - 3.5.6-Final - + + + + + - - - javassist - javassist - 3.12.1.GA - + + + org.postgresql + postgresql + 9.4.1208.jre7 + - - mysql - mysql-connector-java - 5.1.18 - + + + + + + - - cglib - cglib - 2.2 - - - - org.aspectj - aspectjlib - 1.6.2 - - - org.aspectj - aspectjweaver - 1.7.3 - log4j log4j diff --git a/Spring/GS_Spring_22_Hibernate/src/main/java/edu/javacourse/spring/model/Region.java b/Spring/GS_Spring_22_Hibernate/src/main/java/edu/javacourse/spring/model/Region.java index 5206117e..710644fc 100644 --- a/Spring/GS_Spring_22_Hibernate/src/main/java/edu/javacourse/spring/model/Region.java +++ b/Spring/GS_Spring_22_Hibernate/src/main/java/edu/javacourse/spring/model/Region.java @@ -1 +1 @@ -package edu.javacourse.spring.model; import java.io.Serializable; /** * Author: Georgy Gobozov * Date: 21.07.13 */ @Entity @Table(name = "jc_region") public class Region implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "region_id") private Integer id; @Column(name = "region_name", nullable = false) private String name; public Region(String name) { this.name = name; } public Region() { } public Integer getId() { return id; } public void setId(Integer id) { this.id = id; } public String getName() { return name; } public void setName(String name) { this.name = name; } } \ No newline at end of file +package edu.javacourse.spring.model; import javax.persistence.*; import java.io.Serializable; /** * Author: Georgy Gobozov * Date: 21.07.13 */ @Entity @Table(name = "jc_region") public class Region implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "region_id") private Integer id; @Column(name = "region_name", nullable = false) private String name; public Region(String name) { this.name = name; } public Region() { } public Integer getId() { return id; } public void setId(Integer id) { this.id = id; } public String getName() { return name; } public void setName(String name) { this.name = name; } } \ No newline at end of file diff --git a/Spring/GS_Spring_22_Hibernate/src/main/java/edu/javacourse/spring/service/RegionService.java b/Spring/GS_Spring_22_Hibernate/src/main/java/edu/javacourse/spring/service/RegionService.java index bb41d852..6352a322 100644 --- a/Spring/GS_Spring_22_Hibernate/src/main/java/edu/javacourse/spring/service/RegionService.java +++ b/Spring/GS_Spring_22_Hibernate/src/main/java/edu/javacourse/spring/service/RegionService.java @@ -1 +1 @@ -package edu.javacourse.spring.service; import edu.javacourse.spring.model.Region; /** * Author: Georgy Gobozov * Date: 21.07.13 */ public interface RegionService { public Region createRegion(Region region); public void deleteRegion(Region region); public Region getRegionByName(String name); public void readOnly(String name); } \ No newline at end of file +package edu.javacourse.spring.service; import edu.javacourse.spring.model.Region; /** * Author: Georgy Gobozov * Date: 21.07.13 */ public interface RegionService { // интерфейс не обязателен для выполнения примера public Region createRegion(Region region); public void deleteRegion(Region region); public Region getRegionByName(String name); public void readOnly(String name); } \ No newline at end of file diff --git a/Spring/GS_Spring_22_Hibernate/src/main/java/edu/javacourse/spring/service/RegionServiceImpl.java b/Spring/GS_Spring_22_Hibernate/src/main/java/edu/javacourse/spring/service/RegionServiceImpl.java index fa4716f8..54a7a9a6 100644 --- a/Spring/GS_Spring_22_Hibernate/src/main/java/edu/javacourse/spring/service/RegionServiceImpl.java +++ b/Spring/GS_Spring_22_Hibernate/src/main/java/edu/javacourse/spring/service/RegionServiceImpl.java @@ -1 +1 @@ -package edu.javacourse.spring.service; import edu.javacourse.spring.dao.RegionDao; import edu.javacourse.spring.model.Region; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; /** * Author: Georgy Gobozov * Date: 21.07.13 */ @Transactional public class RegionServiceImpl implements RegionService { RegionDao regionDao; public void setRegionDao(RegionDao regionDao) { this.regionDao = regionDao; } @Override @Transactional public Region createRegion(Region region) { int id = regionDao.createRegion(region); System.out.println("Region " + id + " : " + region.getName() + " created..."); return region; } @Override public void deleteRegion(Region region) { regionDao.deleteRegion(region); System.out.println("Region " + region.getName() + " deleted..."); } @Override public Region getRegionByName(String name) { return regionDao.getRegionByName(name); } @Override @Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW) public void readOnly(String name) { // write operation createRegion(new Region(name)); //read operation regionDao.getRegionByName(name); } } \ No newline at end of file +package edu.javacourse.spring.service; import edu.javacourse.spring.dao.RegionDao; import edu.javacourse.spring.model.Region; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; // уровень БЛ @Transactional // не нужно вручную открывать/и закрывать тр-кцию, ею управляет спринг // то есть мы не вызываем Сессию, то есть не используем конкретную реализацию public class RegionServiceImpl implements RegionService { RegionDao regionDao; public void setRegionDao(RegionDao regionDao) { this.regionDao = regionDao; } @Override @Transactional // все вызовы к дао будут выполняться в одной транзакции public Region createRegion(Region region) { int id = regionDao.createRegion(region); System.out.println("Region " + id + " : " + region.getName() + " created..."); return region; } @Override public void deleteRegion(Region region) { regionDao.deleteRegion(region); System.out.println("Region " + region.getName() + " deleted..."); } @Override public Region getRegionByName(String name) { return regionDao.getRegionByName(name); } @Override @Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW) public void readOnly(String name) { // write operation createRegion(new Region(name)); //read operation regionDao.getRegionByName(name); } } \ No newline at end of file diff --git a/Spring/GS_Spring_22_Hibernate/src/main/resources/log4j.properties b/Spring/GS_Spring_22_Hibernate/src/main/resources/log4j.properties index c1d8d7d0..26fe1df2 100644 --- a/Spring/GS_Spring_22_Hibernate/src/main/resources/log4j.properties +++ b/Spring/GS_Spring_22_Hibernate/src/main/resources/log4j.properties @@ -5,7 +5,7 @@ log4j.rootLogger=INFO, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.Target=System.out log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n +log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n log4j.logger.org.springframework.transaction=DEBUG diff --git a/Spring/GS_Spring_22_Hibernate/src/main/resources/springExample.xml b/Spring/GS_Spring_22_Hibernate/src/main/resources/springExample.xml index b6359783..08d5fbd9 100644 --- a/Spring/GS_Spring_22_Hibernate/src/main/resources/springExample.xml +++ b/Spring/GS_Spring_22_Hibernate/src/main/resources/springExample.xml @@ -7,19 +7,20 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> - +

- - - + + + - - + + + @@ -37,7 +38,7 @@ - hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect + hibernate.dialect=org.hibernate.dialect.PostgreSQL9Dialect hibernate.show_sql=true diff --git a/Spring/GS_Spring_3_AnnotationConfig/src/main/java/edu/javacourse/spring/config/ApplicationConfig.java b/Spring/GS_Spring_3_AnnotationConfig/src/main/java/edu/javacourse/spring/config/ApplicationConfig.java index 93ba0d6c..5991e92e 100644 --- a/Spring/GS_Spring_3_AnnotationConfig/src/main/java/edu/javacourse/spring/config/ApplicationConfig.java +++ b/Spring/GS_Spring_3_AnnotationConfig/src/main/java/edu/javacourse/spring/config/ApplicationConfig.java @@ -7,6 +7,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +/** + * настройки с помощью кода! + */ @Configuration @Import(CoreConfig.class) public class ApplicationConfig { diff --git a/Spring/IoC/IoC-01-Simple-Annotation/pom.xml b/Spring/IoC/IoC-01-Simple-Annotation/pom.xml new file mode 100644 index 00000000..d5b5b28d --- /dev/null +++ b/Spring/IoC/IoC-01-Simple-Annotation/pom.xml @@ -0,0 +1,34 @@ + + 4.0.0 + + + edu.javacourse + examples + 1.0-SNAPSHOT + ../../../ + + + edu.javacourse.spring.ioc + ioc-01-simple-annotation + 1.0-SNAPSHOT + jar + + Spring IoC 01 Simple Bean + + + + org.springframework + spring-context + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + + diff --git a/Spring/IoC/IoC-01-Simple-Annotation/src/main/java/edu/javacourse/spring/ioc/SimpleBeanExample.java b/Spring/IoC/IoC-01-Simple-Annotation/src/main/java/edu/javacourse/spring/ioc/SimpleBeanExample.java new file mode 100644 index 00000000..8ac50e06 --- /dev/null +++ b/Spring/IoC/IoC-01-Simple-Annotation/src/main/java/edu/javacourse/spring/ioc/SimpleBeanExample.java @@ -0,0 +1,31 @@ +package edu.javacourse.spring.ioc; + +import edu.javacourse.spring.ioc.beans.Car; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import java.util.Date; + +/** + * @author Artem Pronchakov | email/xmpp: artem.pronchakov@calisto.email + */ +public class SimpleBeanExample { + + private static Logger log = LoggerFactory.getLogger(SimpleBeanExample.class); + + public static void main(String[] args) { +// ApplicationContext контекст спринга!!! + ApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"springContext.xml"}); + + log.debug("\n\n\n"); + + // id бина!! + final Car car = context.getBean("car", Car.class); + log.debug("Car owner: {}", car.getOwner()); + + context.getBean("currentDate", Date.class); + } + +} diff --git a/Spring/IoC/IoC-01-Simple-Annotation/src/main/java/edu/javacourse/spring/ioc/beans/Car.java b/Spring/IoC/IoC-01-Simple-Annotation/src/main/java/edu/javacourse/spring/ioc/beans/Car.java new file mode 100644 index 00000000..6fd62196 --- /dev/null +++ b/Spring/IoC/IoC-01-Simple-Annotation/src/main/java/edu/javacourse/spring/ioc/beans/Car.java @@ -0,0 +1,80 @@ +package edu.javacourse.spring.ioc.beans; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; + +import java.util.Date; + +/** + * @author Artem Pronchakov | email/xmpp: artem.pronchakov@calisto.email + */ +public class Car { + + private Long id; + private String model; + private int year; + private Date lastService; + + /* + ищет бин + имя свойства = id в контексет + потом ищет по типу, но если будет два типа подходящих, но будет рантайм эксепшн + +Аннотации работают только в том случае, если объект Car создаётся Спрингом! + */ + @Autowired + @Qualifier("person2") + private Person owner; + + public Car() { + System.out.println("Default co"); + } + + public Car(Long id, String model, int year, Date lastService, Person owner) { + this.id = id; + this.model = model; + this.year = year; + this.lastService = lastService; + this.owner = owner; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getModel() { + return model; + } + + public void setModel(String model) { + this.model = model; + } + + public int getYear() { + return year; + } + + public void setYear(int year) { + this.year = year; + } + + public Date getLastService() { + return lastService; + } + + public void setLastService(Date lastService) { + this.lastService = lastService; + } + + public Person getOwner() { + return owner; + } + + public void setOwner(Person owner) { + this.owner = owner; + } +} diff --git a/Spring/IoC/IoC-01-Simple-Annotation/src/main/java/edu/javacourse/spring/ioc/beans/Person.java b/Spring/IoC/IoC-01-Simple-Annotation/src/main/java/edu/javacourse/spring/ioc/beans/Person.java new file mode 100644 index 00000000..30374be2 --- /dev/null +++ b/Spring/IoC/IoC-01-Simple-Annotation/src/main/java/edu/javacourse/spring/ioc/beans/Person.java @@ -0,0 +1,45 @@ +package edu.javacourse.spring.ioc.beans; + +import java.util.Date; + +/** + * @author Artem Pronchakov | email/xmpp: artem.pronchakov@calisto.email + */ +public class Person { + private Long id; + private String name; + private Date birth; + + public Person() { + } + + public Person(Long id, String name, Date birth) { + this.id = id; + this.name = name; + this.birth = birth; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Date getBirth() { + return birth; + } + + public void setBirth(Date birth) { + this.birth = birth; + } +} diff --git a/Spring/IoC/IoC-01-Simple-Annotation/src/main/resources/log4j.xml b/Spring/IoC/IoC-01-Simple-Annotation/src/main/resources/log4j.xml new file mode 100644 index 00000000..89f04d92 --- /dev/null +++ b/Spring/IoC/IoC-01-Simple-Annotation/src/main/resources/log4j.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Spring/IoC/IoC-01-Simple-Annotation/src/main/resources/springContext.xml b/Spring/IoC/IoC-01-Simple-Annotation/src/main/resources/springContext.xml new file mode 100644 index 00000000..f78df5ba --- /dev/null +++ b/Spring/IoC/IoC-01-Simple-Annotation/src/main/resources/springContext.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Spring/IoC/IoC-01-Simple-Bean/src/main/java/edu/javacourse/spring/ioc/SimpleBeanExample.java b/Spring/IoC/IoC-01-Simple-Bean/src/main/java/edu/javacourse/spring/ioc/SimpleBeanExample.java index a490d60e..e836d3ab 100644 --- a/Spring/IoC/IoC-01-Simple-Bean/src/main/java/edu/javacourse/spring/ioc/SimpleBeanExample.java +++ b/Spring/IoC/IoC-01-Simple-Bean/src/main/java/edu/javacourse/spring/ioc/SimpleBeanExample.java @@ -6,6 +6,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import java.util.Date; + /** * @author Artem Pronchakov | email/xmpp: artem.pronchakov@calisto.email */ @@ -14,12 +16,16 @@ public class SimpleBeanExample { private static Logger log = LoggerFactory.getLogger(SimpleBeanExample.class); public static void main(String[] args) { +// ApplicationContext контекст спринга!!! ApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"springContext.xml"}); log.debug("\n\n\n"); + // id бина!! final Car car = context.getBean("car", Car.class); log.debug("Car model: {}", car.getModel()); + + context.getBean("currentDate", Date.class); } } diff --git a/Spring/IoC/IoC-01-Simple-Bean/src/main/java/edu/javacourse/spring/ioc/beans/Car.java b/Spring/IoC/IoC-01-Simple-Bean/src/main/java/edu/javacourse/spring/ioc/beans/Car.java index 5b574a81..f8079902 100644 --- a/Spring/IoC/IoC-01-Simple-Bean/src/main/java/edu/javacourse/spring/ioc/beans/Car.java +++ b/Spring/IoC/IoC-01-Simple-Bean/src/main/java/edu/javacourse/spring/ioc/beans/Car.java @@ -14,6 +14,7 @@ public class Car { private Person owner; public Car() { + System.out.println("Default co"); } public Car(Long id, String model, int year, Date lastService, Person owner) { diff --git a/Spring/IoC/IoC-01-Simple-Bean/src/main/resources/springContext.xml b/Spring/IoC/IoC-01-Simple-Bean/src/main/resources/springContext.xml index 6b51e734..37632192 100644 --- a/Spring/IoC/IoC-01-Simple-Bean/src/main/resources/springContext.xml +++ b/Spring/IoC/IoC-01-Simple-Bean/src/main/resources/springContext.xml @@ -5,6 +5,8 @@ + + diff --git a/Spring/IoC/IoC-02-Inheritance/src/main/resources/springContext.xml b/Spring/IoC/IoC-02-Inheritance/src/main/resources/springContext.xml index 13a7a5c7..fe1b0ef8 100644 --- a/Spring/IoC/IoC-02-Inheritance/src/main/resources/springContext.xml +++ b/Spring/IoC/IoC-02-Inheritance/src/main/resources/springContext.xml @@ -5,18 +5,21 @@ + + + diff --git a/Spring/IoC/IoC-03-Instantiation/src/main/resources/springContext.xml b/Spring/IoC/IoC-03-Instantiation/src/main/resources/springContext.xml index 9ff8cc7c..f3e860db 100644 --- a/Spring/IoC/IoC-03-Instantiation/src/main/resources/springContext.xml +++ b/Spring/IoC/IoC-03-Instantiation/src/main/resources/springContext.xml @@ -26,10 +26,15 @@ - + - +

diff --git a/Spring/IoC/IoC-04-Scope/src/main/resources/springContext.xml b/Spring/IoC/IoC-04-Scope/src/main/resources/springContext.xml index b3c8c6ab..9b3fa56d 100644 --- a/Spring/IoC/IoC-04-Scope/src/main/resources/springContext.xml +++ b/Spring/IoC/IoC-04-Scope/src/main/resources/springContext.xml @@ -5,6 +5,7 @@ + \ No newline at end of file diff --git a/Spring/IoC/IoC-05-Lazy-Init/src/main/resources/springContext.xml b/Spring/IoC/IoC-05-Lazy-Init/src/main/resources/springContext.xml index 8326eee2..01c05efb 100644 --- a/Spring/IoC/IoC-05-Lazy-Init/src/main/resources/springContext.xml +++ b/Spring/IoC/IoC-05-Lazy-Init/src/main/resources/springContext.xml @@ -3,9 +3,16 @@ xmlns="http://www.springframework.org/schema/beans" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" default-lazy-init="false"> + - + + + + \ No newline at end of file diff --git a/Spring/IoC/IoC-06-Init-Destroy/src/main/java/edu/javacourse/spring/ioc/InitDestroyExample.java b/Spring/IoC/IoC-06-Init-Destroy/src/main/java/edu/javacourse/spring/ioc/InitDestroyExample.java index 95bb21ef..df730f28 100644 --- a/Spring/IoC/IoC-06-Init-Destroy/src/main/java/edu/javacourse/spring/ioc/InitDestroyExample.java +++ b/Spring/IoC/IoC-06-Init-Destroy/src/main/java/edu/javacourse/spring/ioc/InitDestroyExample.java @@ -12,6 +12,7 @@ public class InitDestroyExample { private static Logger log = LoggerFactory.getLogger(InitDestroyExample.class); public static void main(String[] args) throws InterruptedException { +// ClassPathXmlApplicationContext уточняем тип ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"springContext.xml"}); log.debug("\n\n\n"); @@ -19,6 +20,7 @@ public static void main(String[] args) throws InterruptedException { Thread.sleep(5000); log.debug("Destroying context..."); +// объект будут жить дальше, просто у них вызовется метод destroy context.destroy(); } diff --git a/Spring/IoC/IoC-06-Init-Destroy/src/main/java/edu/javacourse/spring/ioc/beans/AnnotationsInitBean.java b/Spring/IoC/IoC-06-Init-Destroy/src/main/java/edu/javacourse/spring/ioc/beans/AnnotationsInitBean.java index 881dada8..59b79b25 100644 --- a/Spring/IoC/IoC-06-Init-Destroy/src/main/java/edu/javacourse/spring/ioc/beans/AnnotationsInitBean.java +++ b/Spring/IoC/IoC-06-Init-Destroy/src/main/java/edu/javacourse/spring/ioc/beans/AnnotationsInitBean.java @@ -13,12 +13,14 @@ public class AnnotationsInitBean { private static Logger log = LoggerFactory.getLogger(AnnotationsInitBean.class); +// javax.annotation.PostConstruct; @PostConstruct public void annotatedInitMethod() { log.debug(""); log.debug("annotatedInitMethod invoked"); } +// javax.annotation.PreDestroy; @PreDestroy public void annotatedDestroyMethod() { log.debug(""); diff --git a/Spring/IoC/IoC-06-Init-Destroy/src/main/resources/springContext.xml b/Spring/IoC/IoC-06-Init-Destroy/src/main/resources/springContext.xml index 0a439695..d72e595f 100644 --- a/Spring/IoC/IoC-06-Init-Destroy/src/main/resources/springContext.xml +++ b/Spring/IoC/IoC-06-Init-Destroy/src/main/resources/springContext.xml @@ -8,7 +8,11 @@ default-destroy-method="someDefaultDestroyMethod"> - + + + @@ -18,6 +22,7 @@

+ \ No newline at end of file diff --git a/Spring/MVC/GS_Spring_003/src/main/java/com/gemini/spring/controller/AjaxController.java b/Spring/MVC/GS_Spring_003/src/main/java/com/gemini/spring/controller/AjaxController.java index 2b87b8b1..145aa850 100755 --- a/Spring/MVC/GS_Spring_003/src/main/java/com/gemini/spring/controller/AjaxController.java +++ b/Spring/MVC/GS_Spring_003/src/main/java/com/gemini/spring/controller/AjaxController.java @@ -24,7 +24,8 @@ public String getAjaxPage() { } @RequestMapping(value = "/plus", method = RequestMethod.GET) - public @ResponseBody String plus(@RequestParam String d1, @RequestParam String d2, HttpServletResponse response) { + @ResponseBody // возвращаемое значение будет записываться в респонс + public String plus(@RequestParam String d1, @RequestParam String d2, HttpServletResponse response) { try { return String.valueOf(Integer.parseInt(d1) + Integer.parseInt(d2)); } catch (Exception e) { diff --git a/Spring/MVC/GS_Spring_003/src/main/webapp/index.jsp b/Spring/MVC/GS_Spring_003/src/main/webapp/index.jsp index a68d66a8..c748c8fc 100755 --- a/Spring/MVC/GS_Spring_003/src/main/webapp/index.jsp +++ b/Spring/MVC/GS_Spring_003/src/main/webapp/index.jsp @@ -8,6 +8,7 @@ $("#helloLink").click(function() { $.ajax({ + // по дефолту пост-запрос! "url": "helloajax", "timeout": 2000, "success": function (data, textStatus, jqXHR) { diff --git a/Spring/pom.xml b/Spring/pom.xml index af5fd024..74d854af 100644 --- a/Spring/pom.xml +++ b/Spring/pom.xml @@ -16,6 +16,7 @@ MVC Spring-JMS WS + GS_Spring_22_Hibernate diff --git a/f.sql b/f.sql new file mode 100644 index 00000000..91be123e --- /dev/null +++ b/f.sql @@ -0,0 +1,49 @@ +CREATE TABLE jc_author +( + author_id INTEGER PRIMARY KEY NOT NULL, + author_name VARCHAR(255) +); +CREATE TABLE jc_book +( + book_id INTEGER PRIMARY KEY NOT NULL, + book_name VARCHAR(255) +); +CREATE TABLE jc_book_author +( + book_id INTEGER NOT NULL, + author_id INTEGER NOT NULL, + CONSTRAINT pk PRIMARY KEY (book_id, author_id), + CONSTRAINT jc_book__fk FOREIGN KEY (book_id) REFERENCES jc_book (book_id), + CONSTRAINT jc_author___fk FOREIGN KEY (author_id) REFERENCES jc_author (author_id) +); + +CREATE TABLE jc_city +( + city_id INTEGER PRIMARY KEY NOT NULL, + city_name VARCHAR(255), + region_id BIGINT, + CONSTRAINT jc_city_region_id_fkey FOREIGN KEY (region_id) REFERENCES jc_region (region_id) +); +CREATE TABLE jc_region +( + region_id INTEGER PRIMARY KEY NOT NULL, + region_name VARCHAR(255) +); +CREATE TABLE jc_region_standalone +( + region_id INTEGER PRIMARY KEY NOT NULL, + region_name VARCHAR(255) +); +-- CREATE TABLE jc_city_city_id_seq +-- ( +-- sequence_name VARCHAR NOT NULL, +-- last_value BIGINT NOT NULL, +-- start_value BIGINT NOT NULL, +-- increment_by BIGINT NOT NULL, +-- max_value BIGINT NOT NULL, +-- min_value BIGINT NOT NULL, +-- cache_value BIGINT NOT NULL, +-- log_cnt BIGINT NOT NULL, +-- is_cycled BOOLEAN NOT NULL, +-- is_called BOOLEAN NOT NULL +-- ); \ No newline at end of file