Skip to content

Commit 194a654

Browse files
danielguedesbdanielguedesb
authored
Merge pull request #4 from eugenp/master
get up to date with main repo
2 parents d05f457 + 5a76e44 commit 194a654

2,953 files changed

Lines changed: 71497 additions & 16314 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.

‎.gitignore‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,11 @@ core-java-io/hard_link.txt
5656
core-java-io/target_link.txt
5757
core-java/src/main/java/com/baeldung/manifest/MANIFEST.MF
5858
ethereum/logs/
59-
jmeter/src/main/resources/*-JMeter.csv
59+
jmeter/src/main/resources/*-JMeter.csv
60+
61+
**/node_modules/
62+
**/dist
63+
**/tmp
64+
**/out-tsc
65+
**/nbproject/
66+
**/nb-configuration.xml

‎JGit/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.baeldung</groupId>
6-
<artifactId>JGitSnippets</artifactId>
6+
<artifactId>JGit</artifactId>
77
<version>1.0-SNAPSHOT</version>
88
<packaging>jar</packaging>
99
<url>http://maven.apache.org</url>
10+
<name>JGit</name>
1011

1112
<parent>
1213
<groupId>com.baeldung</groupId>

‎JGit/src/main/resources/logback.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
6+
</pattern>
7+
</encoder>
8+
</appender>
9+
10+
<root level="INFO">
11+
<appender-ref ref="STDOUT" />
12+
</root>
13+
</configuration>

‎README.md‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,27 @@
22
The "REST with Spring" Classes
33
==============================
44

5-
After 5 months of work, here's the Master Class of REST With Spring: <br/>
6-
**[>> THE REST WITH SPRING MASTER CLASS](http://www.baeldung.com/rest-with-spring-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=rws#master-class)**
5+
Here's the Master Class of REST With Spring (along with the newly announced Boot 2 material): <br/>
6+
**[>> THE REST WITH SPRING - MASTER CLASS](http://www.baeldung.com/rest-with-spring-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=rws#master-class)**
77

88
And here's the Master Class of Learn Spring Security: <br/>
9-
**[>> LEARN SPRING SECURITY MASTER CLASS](http://www.baeldung.com/learn-spring-security-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=lss#master-class)**
9+
**[>> LEARN SPRING SECURITY - MASTER CLASS](http://www.baeldung.com/learn-spring-security-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=lss#master-class)**
1010

1111

1212

13-
Spring Tutorials
13+
Java and Spring Tutorials
1414
================
1515

16-
This project is **a collection of small and focused tutorials** each covering a single and well defined area of development.
17-
Most of the tutorial projects are focused on the `Spring Framework` (and `Spring Security`).
16+
This project is **a collection of small and focused tutorials** - each covering a single and well defined area of development in the Java ecosystem.
17+
A strong focus of these is, of course, the Spring Framework - Spring, Spring Boot and Spring Securiyt.
1818
In additional to Spring, the following technologies are in focus: `core Java`, `Jackson`, `HttpClient`, `Guava`.
1919

20+
2021
Building the project
2122
====================
2223
To do the full build, do: `mvn install -Pdefault -Dgib.enabled=false`
2324

2425

25-
Working with the code in Eclipse
26-
================================
27-
Any IDE can be used to work with the projects, but if you're using Eclipse, consider the following.
28-
29-
- import the included **formatter** in Eclipse:
30-
`https://github.com/eugenp/tutorials/tree/master/eclipse`
31-
32-
33-
CI - Jenkins
34-
================================
35-
This tutorials project is being built **[>> HERE](https://rest-security.ci.cloudbees.com/job/tutorials-unit/)**
36-
37-
### Relevant Articles:
38-
================================
39-
40-
- [Apache Maven Standard Directory Layout](http://www.baeldung.com/maven-directory-structure)
41-
- [Apache Maven Tutorial](http://www.baeldung.com/maven)
42-
- [Designing a User Friendly Java Library](http://www.baeldung.com/design-a-user-friendly-java-library)
26+
Building a single module
27+
====================
28+
To build a specific module run the command: `mvn clean install -Dgib.enabled=false` in the module directory

‎Twitter4J/pom.xml‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
5-
<groupId>com.mabsisa</groupId>
64
<artifactId>Twitter4J</artifactId>
75
<packaging>jar</packaging>
8-
<version>1.0-SNAPSHOT</version>
96
<name>Twitter4J</name>
10-
<url>http://maven.apache.org</url>
117

128
<parent>
139
<groupId>com.baeldung</groupId>
@@ -23,27 +19,6 @@
2319
</dependency>
2420
</dependencies>
2521

26-
<build>
27-
<finalName>${project.artifactId}</finalName>
28-
<resources>
29-
<resource>
30-
<directory>src/main/resources</directory>
31-
</resource>
32-
</resources>
33-
<plugins>
34-
<plugin>
35-
<groupId>org.apache.maven.plugins</groupId>
36-
<artifactId>maven-surefire-plugin</artifactId>
37-
<version>${maven-surefire-plugin.version}</version>
38-
<configuration>
39-
<excludes>
40-
<exclude>**/ApplicationTest.java</exclude>
41-
</excludes>
42-
</configuration>
43-
</plugin>
44-
</plugins>
45-
</build>
46-
4722
<properties>
4823
<twitter4j-stream.version>4.0.6</twitter4j-stream.version>
4924
</properties>

‎Twitter4J/src/main/resources/logback.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
6+
</pattern>
7+
</encoder>
8+
</appender>
9+
10+
<root level="INFO">
11+
<appender-ref ref="STDOUT" />
12+
</root>
13+
</configuration>

‎activejdbc/pom.xml‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
4-
<groupId>com.baeldung</groupId>
54
<artifactId>activejdbc</artifactId>
65
<version>1.0-SNAPSHOT</version>
76
<packaging>jar</packaging>
@@ -79,55 +78,11 @@
7978
</dependency>
8079
</dependencies>
8180
</plugin>
82-
<plugin>
83-
<groupId>org.apache.maven.plugins</groupId>
84-
<artifactId>maven-surefire-plugin</artifactId>
85-
<version>${maven-surefire-plugin.version}</version>
86-
<configuration>
87-
<reportFormat>brief</reportFormat>
88-
<trimStackTrace>true</trimStackTrace>
89-
<useFile>false</useFile>
90-
<includes>
91-
<include>**/*Spec*.java</include>
92-
<include>**/*Test*.java</include>
93-
</includes>
94-
<excludes>
95-
<exclude>**/helpers/*</exclude>
96-
<exclude>**/*$*</exclude>
97-
</excludes>
98-
</configuration>
99-
</plugin>
10081
</plugins>
10182
</build>
10283

103-
<repositories>
104-
<repository>
105-
<id>snapshots1</id>
106-
<name>JavaLite Snapshots1</name>
107-
<url>http://repo.javalite.io/</url>
108-
<snapshots>
109-
<enabled>true</enabled>
110-
<updatePolicy>always</updatePolicy>
111-
<checksumPolicy>warn</checksumPolicy>
112-
</snapshots>
113-
</repository>
114-
</repositories>
115-
116-
<pluginRepositories>
117-
<pluginRepository>
118-
<id>snapshots2</id>
119-
<name>JavaLite Snapshots2</name>
120-
<url>http://repo.javalite.io/</url>
121-
<snapshots>
122-
<enabled>true</enabled>
123-
<updatePolicy>always</updatePolicy>
124-
<checksumPolicy>warn</checksumPolicy>
125-
</snapshots>
126-
</pluginRepository>
127-
</pluginRepositories>
128-
12984
<properties>
130-
<activejdbc.version>1.4.13</activejdbc.version>
85+
<activejdbc.version>2.0</activejdbc.version>
13186
<environments>development.test,development</environments>
13287
<mysql.connector.version>5.1.34</mysql.connector.version>
13388
</properties>

‎activejdbc/src/main/java/com/baeldung/model/Employee.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@ public Employee(String firstName, String lastName, String gender, String created
1616
set("created_by",createdBy);
1717
}
1818

19+
public String getLastName() {
20+
return getString("last_name");
21+
}
22+
1923
}

‎activejdbc/src/main/java/com/baeldung/model/Role.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@ public Role(String role,String createdBy){
1515
set("role_name",role);
1616
set("created_by",createdBy);
1717
}
18+
19+
public String getRoleName() {
20+
return getString("role_name");
21+
}
1822
}

‎activejdbc/src/main/resources/logback.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
6+
</pattern>
7+
</encoder>
8+
</appender>
9+
10+
<root level="INFO">
11+
<appender-ref ref="STDOUT" />
12+
</root>
13+
</configuration>

0 commit comments

Comments
 (0)