From 81a1f41502f5c2332ab3a817c51f97bbdc4a8c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Thu, 28 Feb 2008 22:19:01 +0000
Subject: [PATCH] - used the Package interface to print Version numbers from
 MANIFESTs

---
 build.xml                                     | 44 +++++++++++--------
 .../exmo/align/service/AlignmentService.java  |  4 +-
 .../exmo/align/service/HTMLAServProfile.java  |  2 +-
 .../inrialpes/exmo/align/util/EvalAlign.java  |  3 +-
 .../inrialpes/exmo/align/util/GroupAlign.java |  2 +
 .../inrialpes/exmo/align/util/GroupEval.java  |  2 +
 .../exmo/align/util/ParserPrinter.java        |  4 +-
 .../inrialpes/exmo/align/util/Procalign.java  |  3 +-
 8 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/build.xml b/build.xml
index 23e2f369..60c43722 100644
--- a/build.xml
+++ b/build.xml
@@ -40,7 +40,7 @@
     <filter token="DATE" value="${date}"/>
     <filter token="VERS" value="${version}"/>
     
-    <property name="jarclasspath" value="mappingapilite.jar icu4j_3_4.jar iri.jar xercesImpl.jar jena.jar api.jar impl.jar io.jar rdfparser.jar getopt.jar commons-logging.jar log4j.jar rdfapi.jar align.jar procalign.jar"/>
+    <property name="jarclasspath" value="mappingapilite.jar api.jar impl.jar io.jar rdfparser.jar getopt.jar commons-logging.jar log4j.jar rdfapi.jar align.jar procalign.jar"/>
 
     <path id="classpath">
       <fileset dir="./lib">
@@ -71,7 +71,7 @@
   </target>
 
   <!-- tested -->
-  <target name="compilelint" depends="init">
+  <target name="lint" depends="init">
     <!-- values: all, deprecation, unchecked, fallthrough, path, serial, finally -->
     <echo message="Setting property..."/>
     <property name="javacargs" value="-Xlint:all" />
@@ -86,10 +86,8 @@
     <jar jarfile="lib/align.jar">
       <manifest>
 	<attribute name="Built-Date" value="${TODAY}"/>
-	<section name="Alignment API">
-	  <attribute name="Specification-Title" value="Alignment API"/>
-	  <attribute name="Specification-Version" value="${version}"/>
-	</section>
+	<attribute name="Specification-Title" value="Alignment API"/>
+	<attribute name="Specification-Version" value="${version}"/>
       </manifest>
       <fileset dir="classes" includes="org/semanticweb/owl/align/*.class"/>
       <fileset dir="classes" includes="LICENSE.TXT"/>
@@ -100,10 +98,8 @@
 	<attribute name="Built-Date" value="${TODAY}"/>
         <attribute name="Main-Class" value="fr.inrialpes.exmo.align.util.Procalign"/>
         <attribute name="Class-Path" value="${jarclasspath}"/>
-	<section name="Alignment API implementation">
-	  <attribute name="Implementation-Title" value="Alignment API implementation"/>
-	  <attribute name="Implementation-Version" value="${version}"/> 
-	</section>
+	<attribute name="Implementation-Title" value="Alignment API implementation"/>
+	<attribute name="Implementation-Version" value="${version}"/> 
       </manifest>
       <fileset dir="classes" includes="org/ivml/**/*.class"/>
       <fileset dir="classes" includes="fr/inrialpes/exmo/align/util/**/*.class"/>
@@ -117,10 +113,8 @@
 	<attribute name="Built-Date" value="${TODAY}"/>
         <attribute name="Main-Class" value="fr.inrialpes.exmo.align.util.Procalign"/>
         <attribute name="Class-Path" value="procalign.jar jwnl.jar"/>
-	<section name="Alignment API WordNet support">
-	  <attribute name="Implementation-Title" value="Alignment API WordNet support"/>
-	  <attribute name="Implementation-Version" value="${version}"/> 
-	</section>
+	<attribute name="Implementation-Title" value="Alignment API WordNet support"/>
+	<attribute name="Implementation-Version" value="${version}"/> 
       </manifest>
       <fileset dir="classes" includes="fr/inrialpes/exmo/align/ling/**/*.class"/>
       <fileset dir="classes" includes="LICENSE.TXT"/>
@@ -132,10 +126,8 @@
 	<attribute name="Built-Date" value="${TODAY}"/>
         <attribute name="Main-Class" value="fr.inrialpes.exmo.align.service.AlignmentService"/>
         <attribute name="Class-Path" value="procalign.jar alignwn.jar jade.jar iiop.jar http.jar mysql-connector-java-5.0.3-bin.jar servlet-api.jar jetty.jar jetty-util.jar"/>
-	<section name="Alignment server">
-	  <attribute name="Implementation-Title" value="Alignment server"/>
-	  <attribute name="Implementation-Version" value="${version}"/> 
-	</section>
+	<attribute name="Implementation-Title" value="Alignment server"/>
+	<attribute name="Implementation-Version" value="${version}"/> 
       </manifest>
       <fileset dir="classes" includes="fr/inrialpes/exmo/align/service/**/*.class"/>
       <fileset dir="classes" includes="fr/inrialpes/exmo/align/service/**/*.wsdl"/>
@@ -144,6 +136,22 @@
     </jar>
   </target>
 
+  <!-- tested -->
+  <target name="aserv" depends="init">
+    <echo message="Setting property..."/>
+    <jar jarfile="lib/aserv.jar">
+      <manifest>
+	<attribute name="Built-Date" value="${TODAY}"/>
+        <attribute name="Main-Class" value="fr.inrialpes.exmo.align.service.AlignmentService"/>
+	<!-- usually each MANIFEST knows what it needs -->
+	<!-- oyster2.jar, semanticmapper-0.1.jar -->
+        <attribute name="Class-Path" value="alignsvc.jar oyster2.jar semanticmapper-0.1.jar"/>
+	<attribute name="Implementation-Title" value="Alignment server custom launcher"/>
+	<attribute name="Implementation-Version" value="${version}"/> 
+      </manifest>
+    </jar>
+  </target>
+
   <!-- not tested -->
   <target name="test" depends="init">
     <echo message="Testing..."/>
diff --git a/src/fr/inrialpes/exmo/align/service/AlignmentService.java b/src/fr/inrialpes/exmo/align/service/AlignmentService.java
index 6fee7cb3..2d2b328b 100644
--- a/src/fr/inrialpes/exmo/align/service/AlignmentService.java
+++ b/src/fr/inrialpes/exmo/align/service/AlignmentService.java
@@ -402,7 +402,9 @@ public class AlignmentService {
 	System.err.println("\t--debug[=n] -d[n]\t\tReport debug info at level n");
 	System.err.println("\t-Dparam=value\t\t\tSet parameter");
 	System.err.println("\t--help -h\t\t\tPrint this message");
-	System.err.println("\n$Id$\n");
+
+	System.err.print("\n"+AlignmentService.class.getPackage().getImplementationTitle()+" "+AlignmentService.class.getPackage().getImplementationVersion());
+	System.err.println(" ($Id$)\n");
     }
     
 }
diff --git a/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java b/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java
index ea644070..cb8a8b42 100644
--- a/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java
+++ b/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java
@@ -336,7 +336,7 @@ public class HTMLAServProfile implements AlignmentServiceProfile {
     }
 
     protected String about() {
-	return "<h1>Alignment Server</h1><center>$Id$<br />"
+	return "<h1>Alignment server</h1><center>"+AlignmentService.class.getPackage().getImplementationTitle()+" "+AlignmentService.class.getPackage().getImplementationVersion()+"<br />"
 	    + "<center><a href=\"/html/\">Access</a></center>"
 	    + "(C) INRIA Rh&ocirc;ne-Alpes, 2006-2008<br />"
 	    + "<a href=\"http://alignapi.gforge.inria.fr\">http://alignapi.gforge.inria.fr</a>"
diff --git a/src/fr/inrialpes/exmo/align/util/EvalAlign.java b/src/fr/inrialpes/exmo/align/util/EvalAlign.java
index 625fd6d8..4a12203d 100644
--- a/src/fr/inrialpes/exmo/align/util/EvalAlign.java
+++ b/src/fr/inrialpes/exmo/align/util/EvalAlign.java
@@ -214,7 +214,8 @@ public class EvalAlign {
 	System.err.println("\t--impl=className -i classname\t\tUse the given evaluator implementation.");
 	System.err.println("\t--output=filename -o filename\tOutput the result in filename");
 	System.err.println("\t--help -h\t\t\tPrint this message");
-	System.err.println("\n$Id$\n");
+	System.err.print("\n"+EvalAlign.class.getPackage().getImplementationTitle()+" "+EvalAlign.class.getPackage().getImplementationVersion());
+	System.err.println(" ($Id$)\n");
 
     }
 }
diff --git a/src/fr/inrialpes/exmo/align/util/GroupAlign.java b/src/fr/inrialpes/exmo/align/util/GroupAlign.java
index 55c77571..a2d69a11 100644
--- a/src/fr/inrialpes/exmo/align/util/GroupAlign.java
+++ b/src/fr/inrialpes/exmo/align/util/GroupAlign.java
@@ -352,5 +352,7 @@ public class GroupAlign {
 	System.err.println("\t-Dparam=value\t\t\tSet parameter");
 	System.err.println("\t--debug[=n] -d [n]\t\tReport debug info at level n");
 	System.err.println("\t--help -h\t\t\tPrint this message");
+	System.err.print("\n"+GroupAlign.class.getPackage().getImplementationTitle()+" "+GroupAlign.class.getPackage().getImplementationVersion());
+	System.err.println(" ($Id$)\n");
     }
 }
diff --git a/src/fr/inrialpes/exmo/align/util/GroupEval.java b/src/fr/inrialpes/exmo/align/util/GroupEval.java
index c36b6a59..51add819 100644
--- a/src/fr/inrialpes/exmo/align/util/GroupEval.java
+++ b/src/fr/inrialpes/exmo/align/util/GroupEval.java
@@ -599,6 +599,8 @@ which the program does...
 	System.out.println("\t--color=color -c color\tSpecifies if the output must color even lines of the output");
 	System.out.println("\t--debug[=n] -d [n]\t\tReport debug info at level n");
 	System.out.println("\t--help -h\t\t\tPrint this message");
+	System.err.print("\n"+GroupEval.class.getPackage().getImplementationTitle()+" "+GroupEval.class.getPackage().getImplementationVersion());
+	System.err.println(" ($Id$)\n");
     }
 }
 
diff --git a/src/fr/inrialpes/exmo/align/util/ParserPrinter.java b/src/fr/inrialpes/exmo/align/util/ParserPrinter.java
index dffb0c09..61168955 100644
--- a/src/fr/inrialpes/exmo/align/util/ParserPrinter.java
+++ b/src/fr/inrialpes/exmo/align/util/ParserPrinter.java
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * Copyright (C) 2003-2004, 2007 INRIA Rhône-Alpes.
+ * Copyright (C) 2003-2004, 2007-2008 INRIA Rhône-Alpes.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -248,6 +248,8 @@ public class ParserPrinter {
 	System.out.println("\t--cutmethod=hard|perc|prop|best|span -T hard|perc|prop|best|span\t\tMethod to use for triming");
 	System.out.println("\t--output=filename -o filename\tOutput the alignment in filename");
 	System.out.println("\t--help -h\t\t\tPrint this message");
+	System.err.print("\n"+ParserPrinter.class.getPackage().getImplementationTitle()+" "+ParserPrinter.class.getPackage().getImplementationVersion());
+	System.err.println(" ($Id$)\n");
 
     }
 }
diff --git a/src/fr/inrialpes/exmo/align/util/Procalign.java b/src/fr/inrialpes/exmo/align/util/Procalign.java
index 0a0fd689..c507f707 100644
--- a/src/fr/inrialpes/exmo/align/util/Procalign.java
+++ b/src/fr/inrialpes/exmo/align/util/Procalign.java
@@ -303,6 +303,7 @@ public class Procalign {
 	System.err.println("\t--debug[=n] -d [n]\t\tReport debug info at level n");
 	System.err.println("\t-Dparam=value\t\t\tSet parameter");
 	System.err.println("\t--help -h\t\t\tPrint this message");
-	System.err.println("\n$Id$\n");
+	System.err.print("\n"+Procalign.class.getPackage().getImplementationTitle()+" "+Procalign.class.getPackage().getImplementationVersion());
+	System.err.println(" ($Id$)\n");
     }
 }
-- 
GitLab