iSharkFly-Open/Java-Tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7970 from den314/master

Browse Source 
BAEL-3155 splitting up spring-all module
This commit is contained in:
Josh Cummings
2019-10-09 10:14:17 -06:00
committed by GitHub
parent 4b62fb6cef 2cc76b5a95
commit 804384fe3c
314 changed files with 1305 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2 -1
View File
@@ -83,4 +83,5 @@ jta/transaction-logs/
software-security/sql-injection-samples/derby.log
spring-soap/src/main/java/com/baeldung/springsoap/gen/
/report-*.json
transaction.log
transaction.log
*-shell.log
libraries-2/README.md
+2
View File
@@ -18,4 +18,6 @@ Remember, for advanced libraries like [Jackson](/jackson) and [JUnit](/testing-m
- [Key Value Store with Chronicle Map](https://www.baeldung.com/java-chronicle-map)
- [Guide to MapDB](https://www.baeldung.com/mapdb)
- [A Guide to Apache Mesos](https://www.baeldung.com/apache-mesos)
- [JasperReports with Spring](https://www.baeldung.com/spring-jasper)
- More articles [[<-- prev]](/libraries)
libraries-2/pom.xml
+32 -3
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>libraries-2</artifactId>
<name>libraries-2</name>
@@ -112,10 +112,36 @@
<artifactId>mesos</artifactId>
<version>${mesos.library.version}</version>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>${jasperreports.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
</dependency>
</dependencies>
<properties>
<mapdb.version>3.0.7</mapdb.version>
<mapdb.version>3.0.7</mapdb.version>
<assertj.version>3.6.2</assertj.version>
<classgraph.version>4.8.28</classgraph.version>
<jbpm.version>6.0.0.Final</jbpm.version>
@@ -129,5 +155,8 @@
<gson.version>2.8.5</gson.version>
<mockwebserver.version>3.14.2</mockwebserver.version>
<handlebars.version>4.1.2</handlebars.version>
<jasperreports.version>6.6.0</jasperreports.version>
<spring.version>5.1.9.RELEASE</spring.version>
<hsqldb.version>2.5.0</hsqldb.version>
</properties>
</project>
spring-all/src/main/java/org/baeldung/jasperreports/Main.java → libraries-2/src/main/java/com/baeldung/jasperreports/Main.java
+4 -3
View File
@@ -1,9 +1,10 @@
package org.baeldung.jasperreports;
package com.baeldung.jasperreports;
import com.baeldung.jasperreports.config.JasperRerportsSimpleConfig;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import java.util.HashMap;
import java.util.Map;
import org.baeldung.jasperreports.config.JasperRerportsSimpleConfig;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
public class Main {
public static void main(String[] args) {
spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportExporter.java → libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportExporter.java
+5 -10
View File
@@ -1,22 +1,17 @@
package org.baeldung.jasperreports;
package com.baeldung.jasperreports;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.sf.jasperreports.engine.JRException;
import net.sf.jasperreports.engine.JasperPrint;
import net.sf.jasperreports.engine.export.HtmlExporter;
import net.sf.jasperreports.engine.export.JRCsvExporter;
import net.sf.jasperreports.engine.export.JRPdfExporter;
import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter;
import net.sf.jasperreports.export.SimpleExporterInput;
import net.sf.jasperreports.export.SimpleHtmlExporterOutput;
import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
import net.sf.jasperreports.export.SimplePdfExporterConfiguration;
import net.sf.jasperreports.export.SimplePdfReportConfiguration;
import net.sf.jasperreports.export.SimpleWriterExporterOutput;
import net.sf.jasperreports.export.SimpleXlsxReportConfiguration;
import net.sf.jasperreports.export.*;
import org.springframework.stereotype.Component;
import java.util.logging.Level;
import java.util.logging.Logger;
@Component
public class SimpleReportExporter {
spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportFiller.java → libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportFiller.java
+7 -10
View File
@@ -1,20 +1,17 @@
package org.baeldung.jasperreports;
package com.baeldung.jasperreports;
import net.sf.jasperreports.engine.*;
import net.sf.jasperreports.engine.util.JRSaver;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.sql.DataSource;
import java.io.InputStream;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.sql.DataSource;
import net.sf.jasperreports.engine.JRException;
import net.sf.jasperreports.engine.JasperCompileManager;
import net.sf.jasperreports.engine.JasperFillManager;
import net.sf.jasperreports.engine.JasperPrint;
import net.sf.jasperreports.engine.JasperReport;
import net.sf.jasperreports.engine.util.JRSaver;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class SimpleReportFiller {
spring-all/src/main/java/org/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java → libraries-2/src/main/java/com/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java
+5 -4
View File
@@ -1,13 +1,14 @@
package org.baeldung.jasperreports.config;
package com.baeldung.jasperreports.config;
import javax.sql.DataSource;
import org.baeldung.jasperreports.SimpleReportExporter;
import org.baeldung.jasperreports.SimpleReportFiller;
import com.baeldung.jasperreports.SimpleReportExporter;
import com.baeldung.jasperreports.SimpleReportFiller;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
import javax.sql.DataSource;
@Configuration
public class JasperRerportsSimpleConfig {
libraries-2/src/main/resources/META-INF/kmodule.xml
+1 -1
View File
@@ -1,3 +1,3 @@
<kmodule xmlns="http://jboss.org/kie/6.0.0/kmodule">
<kbase name="kbase" packages="com.baeldung.process" />
<kbase name="kbase" packages="com.baeldung.process"/>
</kmodule>
spring-all/src/main/resources/employee-schema.sql → libraries-2/src/main/resources/employee-schema.sql
View File
libraries-2/src/main/resources/employeeEmailReport.jrxml
+21
View File
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<parameter name="idEmployee" class="java.lang.Integer" isForPrompting="false"/>
<queryString>
<![CDATA[SELECT * FROM EMAIL WHERE ID_EMPLOYEE = $P{idEmployee}]]>
</queryString>
<field name="ADDRESS" class="java.lang.String"/>
<detail>
<band height="20" splitType="Stretch">
<textField>
<reportElement x="0" y="0" width="156" height="20"/>
<textElement/>
<textFieldExpression class="java.lang.String"><![CDATA[$F{ADDRESS}]]></textFieldExpression>
</textField>
</band>
</detail>
</jasperReport>
spring-all/src/main/resources/employeeReport.jrxml → libraries-2/src/main/resources/employeeReport.jrxml
+8 -3
View File
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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">
<parameter name="title" class="java.lang.String" isForPrompting="false"/>
<parameter name="condition" class="java.lang.String" isForPrompting="false">
<defaultValueExpression><![CDATA[" 1 = 1"]]></defaultValueExpression>
</parameter>
<parameter name="minSalary" class="java.lang.Double" isForPrompting="false"/>
<queryString>
<![CDATA[SELECT * FROM EMPLOYEE WHERE SALARY >= $P{minSalary} AND $P!{condition}]]>
<![CDATA[SELECT * FROM EMPLOYEE WHERE SALARY >= $P{minSalary} AND $P!{condition}]]>
</queryString>
<field name="FIRST_NAME" class="java.lang.String"/>
<field name="LAST_NAME" class="java.lang.String"/>
@@ -44,7 +48,8 @@
<subreportParameterExpression><![CDATA[$F{ID}]]></subreportParameterExpression>
</subreportParameter>
<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
<subreportExpression class="java.lang.String"><![CDATA["employeeEmailReport.jasper"]]></subreportExpression>
<subreportExpression class="java.lang.String">
<![CDATA["employeeEmailReport.jasper"]]></subreportExpression>
</subreport>
</band>
</detail>
pom.xml
+6 -3
View File
@@ -599,6 +599,7 @@
<module>spring-boot-performance</module>
<module>spring-boot-properties</module>
<!-- <module>spring-mvc-basics</module> --> <!-- Compilation failure -->
<module>spring-security-kerberos</module>
<module>oauth2-framework-impl</module>
@@ -667,7 +668,6 @@
<module>spring-activiti</module>
<module>spring-akka</module>
<module>spring-all</module>
<module>spring-amqp</module>
<module>spring-aop</module>
<module>spring-apache-camel</module>
@@ -714,6 +714,7 @@
<module>spring-core</module>
<module>spring-core-2</module>
<module>spring-core-3</module>
<module>spring-cucumber</module>
<module>spring-data-rest</module>
@@ -1390,7 +1391,6 @@
<module>spring-5-security-cognito</module>
<module>spring-activiti</module>
<module>spring-akka</module>
<module>spring-all</module>
<module>spring-amqp</module>
<module>spring-aop</module>
<module>spring-apache-camel</module>
@@ -1424,7 +1424,7 @@
<module>spring-boot-property-exp</module>
<module>spring-boot-security</module>
<module>spring-boot-vue</module>
<module>spring-caching</module>
<module>spring-cloud</module>
<module>spring-cloud-bus</module>
<!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
@@ -1463,6 +1463,7 @@
<module>spring-mobile</module>
<module>spring-mockito</module>
<module>spring-mvc-basics-2</module>
<module>spring-mvc-forms-jsp</module>
<module>spring-mvc-forms-thymeleaf</module>
<module>spring-mvc-java</module>
@@ -1492,6 +1493,7 @@
<module>spring-resttemplate</module>
<module>spring-roo</module>
<module>spring-scheduling</module>
<module>spring-security-acl</module>
<module>spring-security-angular/server</module>
<module>spring-security-cache-control</module>
@@ -1514,6 +1516,7 @@
<module>spring-security-thymeleaf</module>
<module>spring-security-x509</module>
<module>spring-session</module>
<module>spring-shell</module>
<module>spring-sleuth</module>
<module>spring-soap</module>
<module>spring-social-login</module>
spring-4/README.md
+1
View File
@@ -6,3 +6,4 @@ This module contains articles about Spring 4
- [A Guide to Flips for Spring](https://www.baeldung.com/flips-spring)
- [Configuring a Hikari Connection Pool with Spring Boot](https://www.baeldung.com/spring-boot-hikari)
- [Spring JSON-P with Jackson](https://www.baeldung.com/spring-jackson-jsonp)
- [What’s New in Spring 4.3?](https://www.baeldung.com/whats-new-in-spring-4-3)
spring-4/pom.xml
+23
View File
@@ -67,6 +67,27 @@
<artifactId>tomcat-embed-jasper</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>${easymock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
@@ -88,6 +109,8 @@
<properties>
<start-class>com.baeldung.flips.ApplicationConfig</start-class>
<flips-web.version>1.0.1</flips-web.version>
<easymock.version>3.6</easymock.version>
<hsqldb.version>2.4.0</hsqldb.version>
</properties>
</project>
spring-all/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java → spring-4/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
View File
spring-all/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java → spring-4/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java
View File
spring-all/src/main/java/org/baeldung/spring43/cache/Foo.java → spring-4/src/main/java/org/baeldung/spring43/cache/Foo.java
Vendored
View File
spring-all/src/main/java/org/baeldung/spring43/cache/FooService.java → spring-4/src/main/java/org/baeldung/spring43/cache/FooService.java
Vendored
View File
spring-all/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java → spring-4/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java
View File
spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java → spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java
View File
spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java → spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java
View File
spring-all/src/main/java/org/baeldung/spring43/ctor/FooRepository.java → spring-4/src/main/java/org/baeldung/spring43/ctor/FooRepository.java
View File
spring-all/src/main/java/org/baeldung/spring43/ctor/FooService.java → spring-4/src/main/java/org/baeldung/spring43/ctor/FooService.java
View File
spring-all/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java → spring-4/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java
View File
spring-all/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java → spring-4/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java
View File
spring-all/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java → spring-4/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java
View File
spring-all/src/main/java/org/baeldung/spring43/depresolution/FooService.java → spring-4/src/main/java/org/baeldung/spring43/depresolution/FooService.java
View File
spring-all/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java → spring-4/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java
View File
spring-all/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java → spring-4/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java
View File
spring-all/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java → spring-4/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java
View File

Some files were not shown because too many files have changed in this diff Show More