Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 31 additions & 22 deletions FitRank/.classpath
Original file line number Diff line number Diff line change
@@ -1,22 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
<attributes>
<attribute name="owner.project.facets" value="jst.web"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_75">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
<attributes>
<attribute name="owner.project.facets" value="jst.web"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
1 change: 1 addition & 0 deletions FitRank/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target/
18 changes: 9 additions & 9 deletions FitRank/.settings/org.eclipse.wst.common.component
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="FitRank">
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
<property name="context-root" value="FitRank"/>
<property name="java-output-path" value="/FitRank/build/classes"/>
</wb-module>
</project-modules>
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="FitRank">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<property name="context-root" value="FitRank"/>
<property name="java-output-path" value="/FitRank/build/classes"/>
</wb-module>
</project-modules>
1 change: 1 addition & 0 deletions FitRank/.tern-project
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"libs":["browser","ecma5"],"ide":{}}
23 changes: 22 additions & 1 deletion FitRank/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
<version>0.0.1-SNAPSHOT</version>
<name>FitRank Maven Webapp</name>
<url>http://maven.apache.org</url>
<properties>
<javax.persistence.version>1.0.2</javax.persistence.version>
<eclipselink.version>2.6.0-M3</eclipselink.version>
<mysql.version>5.1.34</mysql.version>
</properties>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down Expand Up @@ -44,7 +49,23 @@
<!-- <artifactId>hibernate-core</artifactId> -->
<!-- <version>3.6.1.Final</version> -->
<!-- </dependency> -->


<!-- PERSISTENCE -->
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>${javax.persistence.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
<version>${eclipselink.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency>
</dependencies>
<build>
<finalName>FitRank</finalName>
Expand Down
28 changes: 0 additions & 28 deletions FitRank/src/br/com/fitrank/persistencia/UsuarioDAO.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
package br.com.fitrank.persistencia;

import br.com.fitrank.modelo.Fitness;

public class FitnessDAO {
public class FitnessDAO extends GenericDAO<Fitness>{

public FitnessDAO() {
super(Fitness.class);
}

// private final EntityManager em;
//
Expand Down
53 changes: 53 additions & 0 deletions FitRank/src/main/java/br/com/fitrank/persistencia/GenericDAO.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package br.com.fitrank.persistencia;

import java.sql.SQLException;

import javax.persistence.EntityManager;

public abstract class GenericDAO<T> extends JpaDAO {

private Class<T> entityClass;

public GenericDAO(Class<T> entityClass) {
this.entityClass = entityClass;
}

public void insert(T type) throws SQLException {
super.open();
super.beginTransaction();
super.persist(type);
super.flush();
super.refresh(type);
super.commitTransaction();
super.close();
}

@SuppressWarnings("unchecked")
public T update(T type) throws SQLException {
super.open();
super.beginTransaction();
T merge = (T) super.merge(type);
super.commitTransaction();
super.close();
return merge;
}

@SuppressWarnings("unchecked")
public void delete(T type) throws SQLException {
super.open();
super.beginTransaction();
type = (T) super.merge(type);
super.remove(type);
super.commitTransaction();
super.close();
}

public T find(int entityID) throws SQLException {
super.open();
EntityManager em = super.getEntityManager();
T find = em.find(entityClass, entityID);
super.close();
return find;
}

}
73 changes: 73 additions & 0 deletions FitRank/src/main/java/br/com/fitrank/persistencia/JpaDAO.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
package br.com.fitrank.persistencia;

import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.EntityTransaction;
import javax.persistence.Persistence;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceUnit;

public abstract class JpaDAO {
private final String PERSISTENCE_UNIT = "livrariaPU";

@PersistenceContext
private EntityManager em;

@PersistenceUnit
private EntityManagerFactory emf;

private EntityTransaction transaction;

protected void open() {
if (emf == null || !emf.isOpen()) {
emf = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT);
}

if (em == null || !em.isOpen()) {
em = emf.createEntityManager();
}

}

protected void beginTransaction() {
transaction = em.getTransaction();
transaction.begin();
}

protected void commitTransaction() {
transaction.commit();
}

protected void persist(Object o) {
em.persist(o);
}

protected void remove(Object o) {
em.remove(o);
}

protected Object merge(Object o) {
return em.merge(o);
}

protected void refresh(Object o) {
em.refresh(o);
}

protected void flush() {
em.flush();
}

protected void close() {
if (em != null && em.isOpen()) {
em.close();
}
if (em != null && emf.isOpen()) {
emf.close();
}
}

public EntityManager getEntityManager() {
return em;
}
}
32 changes: 32 additions & 0 deletions FitRank/src/main/java/br/com/fitrank/persistencia/UsuarioDAO.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package br.com.fitrank.persistencia;

//import java.sql.Connection;

import br.com.fitrank.modelo.Usuario;
//import br.com.fitrank.util.JDBCFactory;

public class UsuarioDAO extends GenericDAO<Usuario> {

public UsuarioDAO() {
super(Usuario.class);
}

// // private final EntityManager em;
// private Connection conexao;
//
// public UsuarioDAO() {
// this.conexao = new JDBCFactory().getConnection();
// }
//
//
// //
// // //Persiste o novo usuario do facebook
// public Usuario persisteUsuario(Usuario usuario) {
// // em.getTransaction().begin();
// // usuario = em.merge(usuario);
// // em.getTransaction().commit();
// //
// return usuario;
// }

}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package br.com.fitrank.service;

import java.sql.SQLException;

import br.com.fitrank.modelo.Usuario;
import br.com.fitrank.persistencia.UsuarioDAO;

Expand Down Expand Up @@ -36,8 +38,17 @@ public Usuario persisteUsuarioServico(User usuarioFacebook){
usuario.setDataNascimento(usuarioFacebook.getBirthday());

UsuarioDAO persiste = new UsuarioDAO();
return persiste.persisteUsuario(usuario);
//return persiste.persisteUsuario(usuario);

try {
persiste.insert(usuario);
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}

return usuario;

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
import java.sql.DriverManager;
import java.sql.SQLException;

/**
* @deprecated
*
*/
public class JDBCFactory {

// private static EntityManagerFactory entityManagerFactory=
Expand Down
13 changes: 13 additions & 0 deletions FitRank/src/main/resources/META-INF/persistence.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<persistence-unit name="livrariaPU" transaction-type="RESOURCE_LOCAL">
<shared-cache-mode>NONE</shared-cache-mode>
<properties>
<property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
<property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/livraria_db"/>
<property name="javax.persistence.jdbc.user" value="root"/>
<property name="eclipselink.logging.level" value="FINE"/>
<!-- <property name="eclipselink.logging.parameters" value="true"/> -->
</properties>
</persistence-unit>
</persistence>
9 changes: 9 additions & 0 deletions FitRank/src/main/webapp/WEB-INF/jboss-web.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<jboss-web>
<context-root>/livraria</context-root>
<!-- <security-domain>VisionErp</security-domain>
<context-root>/odata-server</context-root>
<valve>
<class-name>org.apache.catalina.authenticator.SingleSignOn</class-name>
</valve> -->
</jboss-web>
Loading