Merge branch 'JABAWS_Release_2_0'

Conflicts:
	.project
	.settings/org.eclipse.wst.common.component

diff --git a/.classpath b/.classpath
index c9f256a..d6b635a 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -1,18 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" path="datamodel"/>\r
-       <classpathentry kind="src" path="engine"/>\r
-       <classpathentry kind="src" path="runner"/>\r
-       <classpathentry kind="src" path="webservices"/>\r
-       <classpathentry excluding="testdata/" kind="src" path="testsrc"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry kind="lib" path="testsrc/lib/testng-5.10-jdk15.jar"/>\r
-       <classpathentry kind="lib" path="lib/servlet-api.jar"/>\r
-       <classpathentry kind="lib" path="WEB-INF/lib/drmaa.jar"/>\r
-       <classpathentry kind="lib" path="WEB-INF/lib/log4j-1.2.15.jar"/>\r
-       <classpathentry kind="lib" path="WEB-INF/lib/compbio-annotations-1.0.jar"/>\r
-       <classpathentry kind="lib" path="WEB-INF/lib/compbio-util-1.4.jar"/>\r
-       <classpathentry kind="lib" path="WEB-INF/lib/derby.jar"/>\r
-       <classpathentry kind="lib" path="WEB-INF/lib/compbio-ga-1.0.jar"/>\r
-       <classpathentry kind="output" path="WEB-INF/classes"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="datamodel"/>
+       <classpathentry kind="src" path="engine"/>
+       <classpathentry kind="src" path="runner"/>
+       <classpathentry kind="src" path="webservices"/>
+       <classpathentry excluding="testdata/" kind="src" path="testsrc"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="lib" path="testsrc/lib/testng-5.10-jdk15.jar"/>
+       <classpathentry kind="lib" path="lib/servlet-api.jar"/>
+       <classpathentry kind="lib" path="WEB-INF/lib/drmaa.jar"/>
+       <classpathentry kind="lib" path="WEB-INF/lib/log4j-1.2.15.jar"/>
+       <classpathentry kind="lib" path="WEB-INF/lib/compbio-annotations-1.0.jar"/>
+       <classpathentry kind="lib" path="WEB-INF/lib/compbio-util-1.4.jar"/>
+       <classpathentry kind="lib" path="WEB-INF/lib/derby.jar"/>
+       <classpathentry kind="lib" path="WEB-INF/lib/compbio-ga-1.0.jar"/>
+       <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+       <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+       <classpathentry kind="output" path="WEB-INF/classes"/>
+</classpath>

diff --git a/.project b/.project
index 0fadb11..0e16ff7 100644 (file)
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
-       <name>clustengine-2.0</name>\r
+       <name>clustengine-master</name>\r
        <comment></comment>\r
        <projects>\r
        </projects>\r

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 1c91d84..0f3e747 100644 (file)
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -13,6 +13,10 @@
             <dependency-type>uses</dependency-type>
         </dependent-module> -->
         <property name="java-output-path" value="WEB-INF/classes"/>
+<<<<<<< HEAD
+        <property name="context-root" value="jabaws-2.0"/>
+=======
         <property name="context-root" value="jabaws-2.1"/>
+>>>>>>> JABAWS_Release_2_0
     </wb-module>
 </project-modules>