iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BAEL-20537: Migrate apache-* modules to the com.baeldung package

Browse Source
This commit is contained in:
Krzysztof Woyke 2019-12-24 10:38:48 +01:00
parent fe17c22c81
commit e86eeeb593
10 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache-fop/src/main/webapp/WEB-INF/web.xml
View File

@ -16,7 +16,7 @@
</context-param>
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>org.baeldung.config</param-value>
<param-value>com.baeldung.config</param-value>
</context-param>
<listener>

2
apache-fop/src/test/java/org/baeldung/java/ApacheFOPConvertHTMLIntegrationTest.java → apache-fop/src/test/java/com/baeldung/java/ApacheFOPConvertHTMLIntegrationTest.java
View File

@ -1,4 +1,4 @@
package org.baeldung.java;
package com.baeldung.java;
import java.io.BufferedOutputStream;
import java.io.File;

2
apache-fop/src/test/java/org/baeldung/java/ApacheFOPHeroldLiveTest.java → apache-fop/src/test/java/com/baeldung/java/ApacheFOPHeroldLiveTest.java
View File

@ -1,4 +1,4 @@
package org.baeldung.java;
package com.baeldung.java;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;

2
apache-olingo/olingo2/pom.xml
View File

@ -3,7 +3,7 @@
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>
<groupId>org.baeldung.examples.olingo2</groupId>
<groupId>com.baeldung.examples.olingo2</groupId>
<artifactId>olingo2</artifactId>
<name>olingo2</name>
<description>Sample Olingo 2 Project</description>

9
apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java → apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java
View File

@ -1,4 +1,4 @@
package org.baeldung.examples.olingo2;
package com.baeldung.examples.olingo2;
import java.util.List;
import java.util.Map;
@ -9,10 +9,8 @@ import javax.persistence.EntityManagerFactory;
import javax.persistence.EntityTransaction;
import javax.persistence.FlushModeType;
import javax.persistence.LockModeType;
import javax.persistence.Persistence;
import javax.persistence.Query;
import javax.persistence.StoredProcedureQuery;
import javax.persistence.SynchronizationType;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaDelete;
@ -25,11 +23,8 @@ import org.apache.olingo.odata2.api.processor.ODataContext;
import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext;
import org.apache.olingo.odata2.jpa.processor.api.ODataJPAServiceFactory;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
import org.baeldung.examples.olingo2.JerseyConfig.EntityManagerFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.orm.jpa.EntityManagerFactoryUtils;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.stereotype.Component;
/**
@ -58,7 +53,7 @@ public class CarsODataJPAServiceFactory extends ODataJPAServiceFactory {
ODataJPAContext ctx = getODataJPAContext();
ODataContext octx = ctx.getODataContext();
HttpServletRequest request = (HttpServletRequest)octx.getParameter(ODataContext.HTTP_SERVLET_REQUEST_OBJECT);
EntityManager em = (EntityManager)request.getAttribute(EntityManagerFilter.EM_REQUEST_ATTRIBUTE);
EntityManager em = (EntityManager)request.getAttribute(JerseyConfig.EntityManagerFilter.EM_REQUEST_ATTRIBUTE);
// Here we're passing the EM that was created by the EntityManagerFilter (see JerseyConfig)
ctx.setEntityManager(new EntityManagerWrapper(em));

3
apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/JerseyConfig.java → apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/JerseyConfig.java
View File

@ -1,11 +1,10 @@
package org.baeldung.examples.olingo2;
package com.baeldung.examples.olingo2;
import java.io.IOException;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.EntityTransaction;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.ApplicationPath;
import javax.ws.rs.Path;

3
apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/Olingo2SampleApplication.java → apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/Olingo2SampleApplication.java
View File

@ -1,8 +1,7 @@
package org.baeldung.examples.olingo2;
package com.baeldung.examples.olingo2;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@SpringBootApplication

2
apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarMaker.java → apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/domain/CarMaker.java
View File

@ -1,4 +1,4 @@
package org.baeldung.examples.olingo2.domain;
package com.baeldung.examples.olingo2.domain;
import java.util.List;

2
apache-olingo/olingo2/src/main/java/org/baeldung/examples/olingo2/domain/CarModel.java → apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/domain/CarModel.java
View File

@ -1,4 +1,4 @@
package org.baeldung.examples.olingo2.domain;
package com.baeldung.examples.olingo2.domain;
import javax.persistence.Entity;
import javax.persistence.FetchType;

2
apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationUnitTest.java → apache-olingo/olingo2/src/test/java/com/baeldung/examples/olingo2/Olingo2SampleApplicationUnitTest.java
View File

@ -1,4 +1,4 @@
package org.baeldung.examples.olingo2;
package com.baeldung.examples.olingo2;
import org.junit.Test;
import org.junit.runner.RunWith;