Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development

Former-commit-id: a92bfa9393 [formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]
Former-commit-id: cdd6a986e8

cave/ohd.hseb.common/.classpath

@@ -7,7 +7,7 @@
 	<classpathentry exported="true" kind="lib" path="externaljars/fldat.jar"/>
 	<classpathentry exported="true" kind="lib" path="externaljars/ihfsdb.jar"/>
 	<classpathentry exported="true" kind="lib" path="externaljars/jcchart.jar"/>
-i	<classpathentry exported="true" kind="lib" path="externaljars/jdom.jar"/>
+	<classpathentry exported="true" kind="lib" path="externaljars/jdom.jar"/>
 	<classpathentry exported="true" kind="lib" path="externaljars/junit.jar"/>
 	<classpathentry exported="true" kind="lib" path="externaljars/netcdfUI-2.2.22.jar"/>
 	<classpathentry exported="true" kind="lib" path="externaljars/postgresql-8.3-603.jdbc3.jar"/>

cave/ohd.hseb.common/META-INF/MANIFEST.MF

@@ -120,6 +120,13 @@ Export-Package: ChartDirector,
  org.apache.bsf.util.event.generator,
  org.apache.bsf.util.type,
  org.apache.taglibs.bsf,
+ org.jdom,
+ org.jdom.adapters,
+ org.jdom.filter,
+ org.jdom.input,
+ org.jdom.output,
+ org.jdom.transform,
+ org.jdom.xpath,
  org.postgresql,
  org.postgresql.core,
  org.postgresql.core.types,
@@ -236,6 +243,7 @@ Bundle-ClassPath: externaljars/bsf.jar,
  externaljars/fldat.jar,
  externaljars/ihfsdb.jar,
  externaljars/jcchart.jar,
+ externaljars/jdom.jar,
  externaljars/junit.jar,
  externaljars/netcdfUI-2.2.22.jar,
  externaljars/nlog4j-1.2.21.jar,

cots/net.jcip/.project

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>net.jcip</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>