Skip to content

Commit

Permalink
Merge pull request #7 from MISO4203-201520/Development
Browse files Browse the repository at this point in the history 
Arreglos para el despliegue
  • Loading branch information
@CindyVHO
CindyVHO committed Oct 21, 2015
2 parents 6d5a6f2 + 80167d9 commit b767876
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 585 deletions.
177 changes: 4 additions & 173 deletions mpcellphone.web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,6 @@
<name>mpcellphone.web</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.sourceEncoding>UTF-8</sonar.sourceEncoding>
<sonar.junit.reportsPath>target/surefire-reports</sonar.junit.reportsPath>
<sonar.jacoco.itReportPath>${project.basedir}/target/jacoco-it.exec</sonar.jacoco.itReportPath>
<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
<sonar.jacoco.outReportPath>target/jacoco</sonar.jacoco.outReportPath>
<sonar.jacoco.outItReportPath>target/jacoco-it</sonar.jacoco.outItReportPath>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<org.slf4j.version>1.7.12</org.slf4j.version>
</properties>
<dependencies>
<dependency>
<groupId>org.postgresql</groupId>
Expand All @@ -26,8 +15,8 @@
<dependency>
<groupId>org.glassfish.main.extras</groupId>
<artifactId>glassfish-embedded-all</artifactId>
<version>4.0</version>
<type>jar</type>
<version>3.1.2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>co.edu.uniandes.csw.mpcellphone</groupId>
Expand Down Expand Up @@ -123,176 +112,18 @@
<version>1.0.RC2</version>
<type>jar</type>
</dependency>
<!-- Logger implementation -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${org.slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${org.slf4j.version}</version>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<!-- For executing & reporting ntegration tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.18</version>
<executions>
<execution>
<id>integration-test</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18</version>
<executions>
<execution>
<id>run-unit-tests</id>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.4.201502262128</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
<configuration>
<!-- <destFile>${sonar.jacoco.reportPath}</destFile>-->
<propertyName>surefireArgLine</propertyName>
<excludes>
<exclude>**/*IT.java</exclude>
</excludes>
</configuration>
</execution>
<execution>
<id>post-unit-test</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<!-- Sets the path to the file which contains the execution data. -->
<dataFile>${sonar.jacoco.reportPath}</dataFile>
<!-- Sets the output directory for the code coverage report. -->
<outputDirectory>${sonar.jacoco.outReportPath}</outputDirectory>
</configuration>
</execution>

<!--we want to execute <span class="hiddenSpellError" pre="execute " data-mce-bogus="1">jacoco</span>:prepare-agent-integration in test phase,
but before executing maven failsafe plugin -->
<execution>
<configuration>
<destFile>${sonar.jacoco.itReportPath}</destFile>
<propertyName>jacoco.agent.argLine</propertyName>
<excludes>
<exclude>**/*Test.java</exclude>
</excludes>
</configuration>
<id>pre-itest</id>
<phase>pre-integration-test</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
</execution>
<!-- Ensures that the code coverage report for integration tests after integration tests have been run. -->
<execution>
<id>post-integration-test</id>
<phase>post-integration-test</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<!-- Sets the path to the file which contains the execution data. -->
<dataFile>${sonar.jacoco.itReportPath}</dataFile>
<!-- Sets the output directory for the code coverage report. -->
<outputDirectory>${sonar.jacoco.outItReportPath}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.18</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<argLine>${jacoco.agent.argLine} -XX:MaxPermSize=1024m</argLine>
<reportsDirectory>${project.build.directory}/target/failsafe-reports</reportsDirectory>
<excludes>
<exclude>**/*Test.java</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>failsafe-integration-tests</id>
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18</version>
<configuration>
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>${surefireArgLine}</argLine>
<!-- Skips unit tests if the value of skip.unit.tests property is true -->
<!-- Excludes integration tests when unit tests are run. -->
<excludes>
<exclude>**/*IT.java</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>run-unit-tests</id>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>2.4</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</plugins>
</build>
</project>
2 changes: 0 additions & 2 deletions mpcellphone.web/src/main/java/co/edu/uniandes/csw/mpcellphone/services/ProductService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import co.edu.uniandes.csw.mpcellphone.dtos.QuestionDTO;
import co.edu.uniandes.csw.mpcellphone.providers.StatusCreated;
import co.edu.uniandes.csw.mpcellphone.utils.RequestUtilsMP;
import javax.ws.rs.core.Response;
import java.util.List;
import javax.inject.Inject;
import javax.servlet.http.HttpServletResponse;
Expand All @@ -29,7 +28,6 @@
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.xml.ws.soap.AddressingFeature;
import org.apache.shiro.SecurityUtils;

/**
Expand Down
11 changes: 0 additions & 11 deletions mpcellphone.web/src/main/java/co/edu/uniandes/csw/mpcellphone/shiro/ApiKeyProperties.java
View file

This file was deleted.

3 changes: 1 addition & 2 deletions mpcellphone.web/src/main/webapp/WEB-INF/shiro.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ rolesFilter = co.edu.uniandes.csw.mpcellphone.shiro.AuthzFilter
#Integrate with Stormpath:
stormpathClient = com.stormpath.shiro.client.ClientFactory
stormpathClient.cacheManager = $cacheManager
apiKeyProps = co.edu.uniandes.csw.mpcellphone.shiro.ApiKeyProperties
stormpathClient.apiKeyProperties = $apiKeyProps
stormpathClient.apiKeyFileLocation = /stormpath/apiKey.properties
stormpathRealm = com.stormpath.shiro.realm.ApplicationRealm
stormpathRealm.client = $stormpathClient

Expand Down
87 changes: 0 additions & 87 deletions ...hone.web/src/test/java/co/edu/uniandes/csw/mpcellphone/test/services/CityServiceTest.java
View file

This file was deleted.

Loading

0 comments on commit b767876

Please sign in to comment.