diff --git a/.classpath b/.classpath old mode 100644 new mode 100755 index f5c5351..7634d37 --- a/.classpath +++ b/.classpath @@ -4,7 +4,16 @@ - - + + + + + + + + + + + diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 1220790..1220790 --- a/.gitignore +++ b/.gitignore diff --git a/.project b/.project old mode 100644 new mode 100755 index bc8206f..bc8206f --- a/.project +++ b/.project diff --git a/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs old mode 100644 new mode 100755 index a3bdaf2..a3bdaf2 --- a/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs +++ b/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs diff --git a/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs b/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs old mode 100644 new mode 100755 index 8597d78..8597d78 --- a/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs +++ b/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs old mode 100644 new mode 100755 index a698e59..a698e59 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs diff --git a/20150907212700-configuração GIT.txt b/20150907212700-configuração GIT.txt old mode 100644 new mode 100755 index 9e1b2ae..9e1b2ae --- a/20150907212700-configuração GIT.txt +++ b/20150907212700-configuração GIT.txt diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 6e348a8..6e348a8 --- a/README.md +++ b/README.md diff --git a/api/.classpath b/api/.classpath new file mode 100644 index 0000000..7a42b37 --- /dev/null +++ b/api/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/api/build.gradle b/api/build.gradle new file mode 100644 index 0000000..ee07aaa --- /dev/null +++ b/api/build.gradle @@ -0,0 +1,10 @@ +apply plugin: 'java' +apply plugin: 'eclipse' + +repositories { + mavenCentral() +} + +dependencies { + testCompile "junit:junit-dep:4.10" +} \ No newline at end of file diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 index a0b4739..2673f52 --- a/build.gradle +++ b/build.gradle @@ -1,22 +1,17 @@ +apply plugin: 'application' apply plugin: 'java' apply plugin: 'eclipse' sourceCompatibility = 1.8 version = '0.1' -jar { - manifest { - attributes 'Implementation-Title': 'Auto Leitura', - 'Implementation-Version': version - } -} - repositories { mavenCentral() } - + dependencies { - compile group: 'commons-collections', name: 'commons-collections', version: '3.2' - testCompile group: 'junit', name: 'junit', version: '4.+' + compile 'log4j:log4j:1.2.17' + compile project(':api') + compile project(':ws') } test { diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..c4492ac --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +include 'api' +include 'ws' \ No newline at end of file diff --git a/src/main/java/br/org/softwarepublico/modelo/Imovel.java b/src/main/java/br/org/softwarepublico/modelo/Imovel.java deleted file mode 100644 index 43d7f56..0000000 --- a/src/main/java/br/org/softwarepublico/modelo/Imovel.java +++ /dev/null @@ -1,26 +0,0 @@ -package br.org.softwarepublico.modelo; - -import java.io.Serializable; - -public class Imovel implements Serializable { - - private static final long serialVersionUID = 5168449993099540127L; - - private String matricula; - - public Imovel() {} - - public String getMatricula() { - return matricula; - } - - public void setMatricula(String matricula) { - this.matricula = matricula; - } - - @Override - public boolean equals(Object obj) { - return ((Imovel)obj).getMatricula().equals(this.getMatricula()); - } - -} diff --git a/src/test/java/br/gov/softwarepublico/teste/modelo/ImovelTeste.java b/src/test/java/br/gov/softwarepublico/teste/modelo/ImovelTeste.java deleted file mode 100644 index 6d07414..0000000 --- a/src/test/java/br/gov/softwarepublico/teste/modelo/ImovelTeste.java +++ /dev/null @@ -1,35 +0,0 @@ -package br.gov.softwarepublico.teste.modelo; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import br.org.softwarepublico.modelo.Imovel; - -public class ImovelTeste { - - Imovel imovel1; - Imovel imovel2; - - @Before - public void setup() { - imovel1 = new Imovel(); - imovel2 = new Imovel(); - } - - @Test - public void imoveisIguais() { - imovel1.setMatricula("12345"); - imovel2.setMatricula("12345"); - - Assert.assertTrue(imovel1.equals(imovel2)); - } - - @Test - public void imoveisDiferentes() { - imovel1.setMatricula("12345"); - imovel2.setMatricula("12344"); - - Assert.assertFalse(imovel1.equals(imovel2)); - } -} diff --git a/ws/.classpath b/ws/.classpath new file mode 100644 index 0000000..39bfde8 --- /dev/null +++ b/ws/.classpath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/ws/build.gradle b/ws/build.gradle new file mode 100644 index 0000000..db07adb --- /dev/null +++ b/ws/build.gradle @@ -0,0 +1,17 @@ +apply plugin: 'java' +apply plugin: 'eclipse' +apply plugin: 'war' + +repositories { + mavenCentral() +} + +dependencies { + compile "javax.ws.rs:jsr311-api:1.1.1" + + compile 'com.sun.jersey:jersey-server:1.13' + compile 'com.sun.jersey:jersey-core:1.13' + compile 'com.sun.jersey:jersey-servlet:1.13' + + testCompile "junit:junit-dep:4.10" +} \ No newline at end of file -- libgit2 0.21.2