Merge pull request #16 from fernandezgom/master

Pull from fernandezgom 06/02/2015
it2l · Feb 6, 2015 · f77a9c4 · f77a9c4
2 parents d6879f9 + 1cfacd5
commit f77a9c4
Show file tree

Hide file tree

Showing 146 changed files with 3,620 additions and 2,340 deletions.
diff --git a/pom.xml b/pom.xml
@@ -390,6 +390,27 @@
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.platform.main</groupId>
+			<artifactId>it2l-task-independent-support</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.platform.main</groupId>
+			<artifactId>it2l-perceive-difficulty-task</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.platform.main</groupId>
+			<artifactId>it2l-sequencer</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
         <!-- runtime -->
 		<!-- activemq -->
 <!--         <dependency> -->
@@ -565,7 +586,7 @@
 				<artifactId>tomcat-maven-plugin</artifactId>
 				<version>1.0-beta-1</version>
 				<configuration>
-					<url>http://193.61.29.166:8080/manager/text/</url>
+					<url>http://localhost:8080/manager/text/</url>
 					<server>mytomcat</server>
 					<path>/${project.build.finalName}</path>
 				</configuration>

diff --git a/src/main/java/Italk2learn.h b/src/main/java/Italk2learn.h
diff --git a/src/main/java/com/hibernate/dto/Ctatexercise.java b/src/main/java/com/hibernate/dto/Ctatexercise.java
diff --git a/src/main/java/com/hibernate/dto/Exercises.java b/src/main/java/com/hibernate/dto/Exercises.java