From eb15c026eda27c8b33d9dca38ff7602dbf316a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Faria?= <andre.java@gmail.com>
Date: Wed, 15 Feb 2012 16:30:10 -0200
Subject: [PATCH] Corrigindo Bug ao Desacoplar Ticket

---
 .classpath                                    |  2 +-
 .project                                      |  6 +--
 pom.xml                                       | 47 +++++++++----------
 .../com/bluesoft/pronto/model/Ticket.groovy   |  6 +--
 src/main/webapp/commons/menuRapido.jsp        |  2 +-
 5 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/.classpath b/.classpath
index 73a74b09..87271096 100644
--- a/.classpath
+++ b/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="src/test/groovy"/>
 	<classpathentry kind="src" path="src/main/groovy"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
diff --git a/.project b/.project
index 6d5cf2b2..b5d621d4 100644
--- a/.project
+++ b/.project
@@ -21,12 +21,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -34,11 +34,11 @@
 	<natures>
 		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/pom.xml b/pom.xml
index 5fb3dc3d..f25e9fc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,31 +11,30 @@
 
 	<build>
 		<directory>${directory}</directory>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.codehaus.gmaven</groupId>
-					<artifactId>gmaven-plugin</artifactId>
-					<version>1.3</version>
-					<executions>
-						<execution>
-							<goals>
-								<goal>compile</goal>
-								<goal>testCompile</goal>
-							</goals>
-						</execution>
-					</executions>
-					<configuration>
-						<encoding>UTF-8</encoding>
-						<providerSelection>1.7</providerSelection>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<plugins>
 			<plugin>
-				<groupId>org.codehaus.gmaven</groupId>
-				<artifactId>gmaven-plugin</artifactId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
+				<configuration>
+					<encoding>utf-8</encoding>
+					<optimize>true</optimize>
+					<source>1.6</source>
+					<target>1.6</target>
+					<compilerId>groovy-eclipse-compiler</compilerId>
+				</configuration>
+				<extensions>true</extensions>
+				<dependencies>
+					<dependency>
+						<groupId>org.codehaus.groovy</groupId>
+						<artifactId>groovy-eclipse-compiler</artifactId>
+						<version>2.6.0-01</version>
+					</dependency>
+					<dependency>
+						<groupId>org.codehaus.groovy</groupId>
+						<artifactId>groovy-eclipse-batch</artifactId>
+						<version>1.7.10-06</version>
+					</dependency>
+				</dependencies>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -320,7 +319,7 @@
 			<version>${spock.version}</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
diff --git a/src/main/groovy/br/com/bluesoft/pronto/model/Ticket.groovy b/src/main/groovy/br/com/bluesoft/pronto/model/Ticket.groovy
index c49cd1a9..6f901933 100644
--- a/src/main/groovy/br/com/bluesoft/pronto/model/Ticket.groovy
+++ b/src/main/groovy/br/com/bluesoft/pronto/model/Ticket.groovy
@@ -302,14 +302,14 @@ class Ticket {
 		logs.add(log)
 	}
 	
-	void addLogDeExclusao(final String campo, final String valor) {
+	void addLogDeExclusao(def campo, def valor) {
 		final TicketLog log = new TicketLog()
 		log.setTicket(this)
 		log.setData(new Date())
 		log.setUsuario(Seguranca.getUsuario().getUsername())
 		log.setOperacao(TicketLog.EXCLUSAO)
-		log.setCampo(campo)
-		log.setValorAntigo(valor)
+		log.setCampo(String.valueOf(campo))
+		log.setValorAntigo(String.valueOf(valor))
 		log.setValorNovo(null)
 		logs.add(log)
 	}
diff --git a/src/main/webapp/commons/menuRapido.jsp b/src/main/webapp/commons/menuRapido.jsp
index eab040f8..606702d7 100644
--- a/src/main/webapp/commons/menuRapido.jsp
+++ b/src/main/webapp/commons/menuRapido.jsp
@@ -9,7 +9,7 @@
 
 <c:if test="${usuarioLogado.administrador or usuarioLogado.productOwner or usuarioLogado.equipe or usuarioLogado.scrumMaster}">
 	<span id="menuRapido" align="right">
-		<a href="${ticketsEnvolvidosUrl}"><pronto:icons name="minhas_pendencias.png" title="Ver ticket pendêntes em que você está envolvido."/></a>
+		<a href="${ticketsEnvolvidosUrl}"><pronto:icons name="minhas_pendencias.png" title="Ver ticket pendentes em que você está envolvido."/></a>
 		<a href="${inboxUrl}"><pronto:icons name="inbox.png" title="Ir para Inbox"/></a>
 		<a href="${productBacklogUrl}"><pronto:icons name="product_backlog.png" title="Ir para Product Backlog"/></a>
 		<a href="${sprintAtualUrl}"><pronto:icons name="sprint_atual.png" title="Ir para Sprint Atual"/></a>