updated solutions feb28 12.35pm

krishperumal · Feb 28, 2013 · a3af8cd · a3af8cd
2 parents ee2f422 + b56cfe4
commit a3af8cd
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 0 deletions.
diff --git a/Solutions/.classpath b/Solutions/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/saplo/api/saplo4java/3.0.0/saplo4java-3.0.0.jar"/>
+</classpath>
diff --git a/Solutions/.project b/Solutions/.project
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
+<<<<<<< HEAD
 	<name>Solutions</name>
 	<comment></comment>
 	<projects>
@@ -15,3 +16,17 @@
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
+=======
+  <name>Solutions</name>
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>
+>>>>>>> b56cfe464cb5a6b98d490a07fed999c576d7e264
diff --git a/Solutions/.settings/org.eclipse.jdt.core.prefs b/Solutions/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Wed Feb 27 12:25:42 IST 2013
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
diff --git a/Solutions/target/classes/com/solutions/App.class b/Solutions/target/classes/com/solutions/App.class
diff --git a/Solutions/target/classes/com/solutions/Department$department.class b/Solutions/target/classes/com/solutions/Department$department.class
diff --git a/Solutions/target/classes/com/solutions/Department.class b/Solutions/target/classes/com/solutions/Department.class
diff --git a/Solutions/target/classes/com/solutions/Person.class b/Solutions/target/classes/com/solutions/Person.class
diff --git a/Solutions/target/classes/com/solutions/TestingWithSaploAPI.class b/Solutions/target/classes/com/solutions/TestingWithSaploAPI.class
diff --git a/Solutions/target/test-classes/com/solutions/AppTest.class b/Solutions/target/test-classes/com/solutions/AppTest.class