Skip to content

Commit 804384f

Browse files
authored
Merge pull request eugenp#7970 from den314/master
BAEL-3155 splitting up spring-all module
2 parents 4b62fb6 + 2cc76b5 commit 804384f

File tree

314 files changed

+1305
-1036
lines changed

Some content is hidden

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

314 files changed

+1305
-1036
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,5 @@ jta/transaction-logs/
8383
software-security/sql-injection-samples/derby.log
8484
spring-soap/src/main/java/com/baeldung/springsoap/gen/
8585
/report-*.json
86-
transaction.log
86+
transaction.log
87+
*-shell.log

libraries-2/README.md

+2

libraries-2/pom.xml

+32-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>libraries-2</artifactId>
77
<name>libraries-2</name>
@@ -112,10 +112,36 @@
112112
<artifactId>mesos</artifactId>
113113
<version>${mesos.library.version}</version>
114114
</dependency>
115+
<dependency>
116+
<groupId>net.sf.jasperreports</groupId>
117+
<artifactId>jasperreports</artifactId>
118+
<version>${jasperreports.version}</version>
119+
<exclusions>
120+
<exclusion>
121+
<artifactId>commons-logging</artifactId>
122+
<groupId>commons-logging</groupId>
123+
</exclusion>
124+
</exclusions>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.hsqldb</groupId>
128+
<artifactId>hsqldb</artifactId>
129+
<version>${hsqldb.version}</version>
130+
</dependency>
131+
<dependency>
132+
<groupId>org.springframework</groupId>
133+
<artifactId>spring-context</artifactId>
134+
<version>${spring.version}</version>
135+
</dependency>
136+
<dependency>
137+
<groupId>org.springframework</groupId>
138+
<artifactId>spring-jdbc</artifactId>
139+
<version>${spring.version}</version>
140+
</dependency>
115141
</dependencies>
116142

117143
<properties>
118-
<mapdb.version>3.0.7</mapdb.version>
144+
<mapdb.version>3.0.7</mapdb.version>
119145
<assertj.version>3.6.2</assertj.version>
120146
<classgraph.version>4.8.28</classgraph.version>
121147
<jbpm.version>6.0.0.Final</jbpm.version>
@@ -129,5 +155,8 @@
129155
<gson.version>2.8.5</gson.version>
130156
<mockwebserver.version>3.14.2</mockwebserver.version>
131157
<handlebars.version>4.1.2</handlebars.version>
158+
<jasperreports.version>6.6.0</jasperreports.version>
159+
<spring.version>5.1.9.RELEASE</spring.version>
160+
<hsqldb.version>2.5.0</hsqldb.version>
132161
</properties>
133162
</project>

spring-all/src/main/java/org/baeldung/jasperreports/Main.java renamed to libraries-2/src/main/java/com/baeldung/jasperreports/Main.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
package org.baeldung.jasperreports;
1+
package com.baeldung.jasperreports;
2+
3+
import com.baeldung.jasperreports.config.JasperRerportsSimpleConfig;
4+
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
25

36
import java.util.HashMap;
47
import java.util.Map;
5-
import org.baeldung.jasperreports.config.JasperRerportsSimpleConfig;
6-
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
78

89
public class Main {
910
public static void main(String[] args) {

spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportExporter.java renamed to libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportExporter.java

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
1-
package org.baeldung.jasperreports;
1+
package com.baeldung.jasperreports;
22

3-
import java.util.logging.Level;
4-
import java.util.logging.Logger;
53
import net.sf.jasperreports.engine.JRException;
64
import net.sf.jasperreports.engine.JasperPrint;
75
import net.sf.jasperreports.engine.export.HtmlExporter;
86
import net.sf.jasperreports.engine.export.JRCsvExporter;
97
import net.sf.jasperreports.engine.export.JRPdfExporter;
108
import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter;
11-
import net.sf.jasperreports.export.SimpleExporterInput;
12-
import net.sf.jasperreports.export.SimpleHtmlExporterOutput;
13-
import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
14-
import net.sf.jasperreports.export.SimplePdfExporterConfiguration;
15-
import net.sf.jasperreports.export.SimplePdfReportConfiguration;
16-
import net.sf.jasperreports.export.SimpleWriterExporterOutput;
17-
import net.sf.jasperreports.export.SimpleXlsxReportConfiguration;
9+
import net.sf.jasperreports.export.*;
1810
import org.springframework.stereotype.Component;
1911

12+
import java.util.logging.Level;
13+
import java.util.logging.Logger;
14+
2015
@Component
2116
public class SimpleReportExporter {
2217

spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportFiller.java renamed to libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportFiller.java

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
package org.baeldung.jasperreports;
1+
package com.baeldung.jasperreports;
22

3+
import net.sf.jasperreports.engine.*;
4+
import net.sf.jasperreports.engine.util.JRSaver;
5+
import org.springframework.beans.factory.annotation.Autowired;
6+
import org.springframework.stereotype.Component;
7+
8+
import javax.sql.DataSource;
39
import java.io.InputStream;
410
import java.sql.SQLException;
511
import java.util.HashMap;
612
import java.util.Map;
713
import java.util.logging.Level;
814
import java.util.logging.Logger;
9-
import javax.sql.DataSource;
10-
import net.sf.jasperreports.engine.JRException;
11-
import net.sf.jasperreports.engine.JasperCompileManager;
12-
import net.sf.jasperreports.engine.JasperFillManager;
13-
import net.sf.jasperreports.engine.JasperPrint;
14-
import net.sf.jasperreports.engine.JasperReport;
15-
import net.sf.jasperreports.engine.util.JRSaver;
16-
import org.springframework.beans.factory.annotation.Autowired;
17-
import org.springframework.stereotype.Component;
1815

1916
@Component
2017
public class SimpleReportFiller {

spring-all/src/main/java/org/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java renamed to libraries-2/src/main/java/com/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
package org.baeldung.jasperreports.config;
1+
package com.baeldung.jasperreports.config;
22

3-
import javax.sql.DataSource;
4-
import org.baeldung.jasperreports.SimpleReportExporter;
5-
import org.baeldung.jasperreports.SimpleReportFiller;
3+
import com.baeldung.jasperreports.SimpleReportExporter;
4+
import com.baeldung.jasperreports.SimpleReportFiller;
65
import org.springframework.context.annotation.Bean;
76
import org.springframework.context.annotation.Configuration;
87
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
98
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
109

10+
import javax.sql.DataSource;
11+
1112
@Configuration
1213
public class JasperRerportsSimpleConfig {
1314

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<kmodule xmlns="http://jboss.org/kie/6.0.0/kmodule">
2-
<kbase name="kbase" packages="com.baeldung.process" />
2+
<kbase name="kbase" packages="com.baeldung.process"/>
33
</kmodule>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd"
5+
name="employeeReport" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20"
6+
topMargin="20" bottomMargin="20">
7+
<parameter name="idEmployee" class="java.lang.Integer" isForPrompting="false"/>
8+
<queryString>
9+
<![CDATA[SELECT * FROM EMAIL WHERE ID_EMPLOYEE = $P{idEmployee}]]>
10+
</queryString>
11+
<field name="ADDRESS" class="java.lang.String"/>
12+
<detail>
13+
<band height="20" splitType="Stretch">
14+
<textField>
15+
<reportElement x="0" y="0" width="156" height="20"/>
16+
<textElement/>
17+
<textFieldExpression class="java.lang.String"><![CDATA[$F{ADDRESS}]]></textFieldExpression>
18+
</textField>
19+
</band>
20+
</detail>
21+
</jasperReport>

spring-all/src/main/resources/employeeReport.jrxml renamed to libraries-2/src/main/resources/employeeReport.jrxml

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="employeeReport" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
2+
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd"
5+
name="employeeReport" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20"
6+
topMargin="20" bottomMargin="20">
37
<parameter name="title" class="java.lang.String" isForPrompting="false"/>
48
<parameter name="condition" class="java.lang.String" isForPrompting="false">
59
<defaultValueExpression><![CDATA[" 1 = 1"]]></defaultValueExpression>
610
</parameter>
711
<parameter name="minSalary" class="java.lang.Double" isForPrompting="false"/>
812
<queryString>
9-
<![CDATA[SELECT * FROM EMPLOYEE WHERE SALARY >= $P{minSalary} AND $P!{condition}]]>
13+
<![CDATA[SELECT * FROM EMPLOYEE WHERE SALARY >= $P{minSalary} AND $P!{condition}]]>
1014
</queryString>
1115
<field name="FIRST_NAME" class="java.lang.String"/>
1216
<field name="LAST_NAME" class="java.lang.String"/>
@@ -44,7 +48,8 @@
4448
<subreportParameterExpression><![CDATA[$F{ID}]]></subreportParameterExpression>
4549
</subreportParameter>
4650
<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
47-
<subreportExpression class="java.lang.String"><![CDATA["employeeEmailReport.jasper"]]></subreportExpression>
51+
<subreportExpression class="java.lang.String">
52+
<![CDATA["employeeEmailReport.jasper"]]></subreportExpression>
4853
</subreport>
4954
</band>
5055
</detail>

pom.xml

+6-3
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,7 @@
599599
<module>spring-boot-performance</module>
600600
<module>spring-boot-properties</module>
601601
<!-- <module>spring-mvc-basics</module> --> <!-- Compilation failure -->
602+
602603
<module>spring-security-kerberos</module>
603604
<module>oauth2-framework-impl</module>
604605

@@ -667,7 +668,6 @@
667668

668669
<module>spring-activiti</module>
669670
<module>spring-akka</module>
670-
<module>spring-all</module>
671671
<module>spring-amqp</module>
672672
<module>spring-aop</module>
673673
<module>spring-apache-camel</module>
@@ -714,6 +714,7 @@
714714

715715
<module>spring-core</module>
716716
<module>spring-core-2</module>
717+
<module>spring-core-3</module>
717718
<module>spring-cucumber</module>
718719

719720
<module>spring-data-rest</module>
@@ -1390,7 +1391,6 @@
13901391
<module>spring-5-security-cognito</module>
13911392
<module>spring-activiti</module>
13921393
<module>spring-akka</module>
1393-
<module>spring-all</module>
13941394
<module>spring-amqp</module>
13951395
<module>spring-aop</module>
13961396
<module>spring-apache-camel</module>
@@ -1424,7 +1424,7 @@
14241424
<module>spring-boot-property-exp</module>
14251425
<module>spring-boot-security</module>
14261426
<module>spring-boot-vue</module>
1427-
1427+
<module>spring-caching</module>
14281428
<module>spring-cloud</module>
14291429
<module>spring-cloud-bus</module>
14301430
<!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
@@ -1463,6 +1463,7 @@
14631463

14641464
<module>spring-mobile</module>
14651465
<module>spring-mockito</module>
1466+
<module>spring-mvc-basics-2</module>
14661467
<module>spring-mvc-forms-jsp</module>
14671468
<module>spring-mvc-forms-thymeleaf</module>
14681469
<module>spring-mvc-java</module>
@@ -1492,6 +1493,7 @@
14921493
<module>spring-resttemplate</module>
14931494
<module>spring-roo</module>
14941495

1496+
<module>spring-scheduling</module>
14951497
<module>spring-security-acl</module>
14961498
<module>spring-security-angular/server</module>
14971499
<module>spring-security-cache-control</module>
@@ -1514,6 +1516,7 @@
15141516
<module>spring-security-thymeleaf</module>
15151517
<module>spring-security-x509</module>
15161518
<module>spring-session</module>
1519+
<module>spring-shell</module>
15171520
<module>spring-sleuth</module>
15181521
<module>spring-soap</module>
15191522
<module>spring-social-login</module>

spring-4/README.md

+1

spring-4/pom.xml

+23
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,27 @@
6767
<artifactId>tomcat-embed-jasper</artifactId>
6868
<scope>provided</scope>
6969
</dependency>
70+
<dependency>
71+
<groupId>org.apache.logging.log4j</groupId>
72+
<artifactId>log4j-api</artifactId>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.apache.logging.log4j</groupId>
76+
<artifactId>log4j-core</artifactId>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.easymock</groupId>
80+
<artifactId>easymock</artifactId>
81+
<version>${easymock.version}</version>
82+
<scope>test</scope>
83+
</dependency>
84+
85+
<dependency>
86+
<groupId>org.hsqldb</groupId>
87+
<artifactId>hsqldb</artifactId>
88+
<version>${hsqldb.version}</version>
89+
<scope>test</scope>
90+
</dependency>
7091
</dependencies>
7192

7293
<build>
@@ -88,6 +109,8 @@
88109
<properties>
89110
<start-class>com.baeldung.flips.ApplicationConfig</start-class>
90111
<flips-web.version>1.0.1</flips-web.version>
112+
<easymock.version>3.6</easymock.version>
113+
<hsqldb.version>2.4.0</hsqldb.version>
91114
</properties>
92115

93116
</project>
+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import org.springframework.web.servlet.ViewResolver;
77
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
88
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
9-
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
9+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
1010
import org.springframework.web.servlet.view.InternalResourceViewResolver;
1111

1212
@Configuration
1313
@ComponentScan
1414
@EnableWebMvc
15-
public class AttributeAnnotationConfiguration implements WebMvcConfigurer {
15+
public class AttributeAnnotationConfiguration extends WebMvcConfigurerAdapter {
1616

1717
@Bean
1818
public ViewResolver viewResolver() {

spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java renamed to spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.apache.logging.log4j.Logger;
1515
import org.springframework.context.annotation.Scope;
1616

17-
import static org.easymock.EasyMock.*;
17+
import static org.easymock.EasyMock.replay;
1818

1919
@Configuration
2020
@ComponentScan

spring-all/README.md

-33
This file was deleted.

0 commit comments

Comments
 (0)