diff --git a/.gitignore b/.gitignore index a07e4314dbc96e55df882e28e4bec0527465c4ee..1f5834acedc09cb58c1b5223a12b1c354a87993d 100644 --- a/.gitignore +++ b/.gitignore @@ -91,4 +91,5 @@ target/ testdb/ tomcat.*/ /jams -userguide/site \ No newline at end of file +userguide/site +versions.json \ No newline at end of file diff --git a/ad-connector/pom.xml b/ad-connector/pom.xml index a3d1db25139613a0b4d4af40293d3a1dce75b37f..36286b000bc6dccd262b3c7affcc96ce6ae6743e 100644 --- a/ad-connector/pom.xml +++ b/ad-connector/pom.xml @@ -72,6 +72,29 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <version>${maven.exec.version}</version> + <executions> + <execution> + <id>Generate Version File</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>python</executable> + <arguments> + <argument>../generate-versions.py</argument> + <argument>net.jami.jams.ad.connector.ADConnector</argument> + <argument>${revision}</argument> + <argument>libs/${project.artifactId}.jar</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/authentication-module/pom.xml b/authentication-module/pom.xml index 8488c45436066e57cc859ec63f013e58951961b2..bb75950477316f08c5cc77092a3d36db43150ddb 100644 --- a/authentication-module/pom.xml +++ b/authentication-module/pom.xml @@ -84,6 +84,29 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <version>${maven.exec.version}</version> + <executions> + <execution> + <id>Generate Version File</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>python</executable> + <arguments> + <argument>../generate-versions.py</argument> + <argument>net.jami.jams.authmodule.UserAuthenticationModule</argument> + <argument>${revision}</argument> + <argument>libs/${project.artifactId}.jar</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/generate-versions.py b/generate-versions.py new file mode 100644 index 0000000000000000000000000000000000000000..695366da41600642eed1b95b369b703d5fc2d6ad --- /dev/null +++ b/generate-versions.py @@ -0,0 +1,32 @@ +import json +import sys +import hashlib +import os + +os.chdir("..") + +className = sys.argv[1] +version = sys.argv[2] +try: + filename = sys.argv[3].split("/")[1] +except: + filename = sys.argv[3] + +try: + f = open("versions.json", "r") + map = json.loads(f.read()) +except: + map = {} +map[className] = {} +map[className]['version'] = version +map[className]['filename'] = filename +md5_hash = hashlib.md5() +a_file = open("jams/" + sys.argv[3], "rb") +content = a_file.read() +md5_hash.update(content) +digest = md5_hash.hexdigest() +map[className]['md5'] = digest +f = open("versions.json", "w") +f.write(json.dumps(map,indent=4)) +f.close() + diff --git a/jams-ca/pom.xml b/jams-ca/pom.xml index b8c66b9ac382301dffb1c26988d25a20fdaa444f..482c776327b8b4798d1da988e8300869e4cc287d 100644 --- a/jams-ca/pom.xml +++ b/jams-ca/pom.xml @@ -61,6 +61,29 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <version>${maven.exec.version}</version> + <executions> + <execution> + <id>Generate Version File</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>python</executable> + <arguments> + <argument>../generate-versions.py</argument> + <argument>net.jami.jams.ca.JamsCA</argument> + <argument>${revision}</argument> + <argument>libs/${project.artifactId}.jar</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/jams-launcher/pom.xml b/jams-launcher/pom.xml index 28447696307efbfb8d8cfb8887383f3262a406f4..80b71c7221482d20abcf7aba88a4f74108ddde85 100644 --- a/jams-launcher/pom.xml +++ b/jams-launcher/pom.xml @@ -62,7 +62,6 @@ </execution> </executions> </plugin> - </plugins> </build> diff --git a/jams-server/pom.xml b/jams-server/pom.xml index bf10b0d37ddef14fd08fe7b732c56173e2012e65..bc4202db0216e41c2ef3cf538dd72bfa58ec8c9d 100644 --- a/jams-server/pom.xml +++ b/jams-server/pom.xml @@ -189,6 +189,29 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <version>${maven.exec.version}</version> + <executions> + <execution> + <id>Generate Version File</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>python</executable> + <arguments> + <argument>../generate-versions.py</argument> + <argument>net.jami.jams.server.Server</argument> + <argument>${revision}</argument> + <argument>${project.artifactId}.jar</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/ldap-connector/pom.xml b/ldap-connector/pom.xml index 8fa16a8f32d097e6a55cc314f63b9698b69dab49..46acc9bbf8a64f65d64623e5eab26f98de4c618c 100644 --- a/ldap-connector/pom.xml +++ b/ldap-connector/pom.xml @@ -85,6 +85,29 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>exec-maven-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <version>${maven.exec.version}</version> + <executions> + <execution> + <id>Generate Version File</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>python</executable> + <arguments> + <argument>../generate-versions.py</argument> + <argument>net.jami.jams.ldap.connector.LDAPConnector</argument> + <argument>${revision}</argument> + <argument>libs/${project.artifactId}.jar</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/pom.xml b/pom.xml index 955ffde5d58d9bcaf3a30a33b656859cc7b96328..e52a5f69fe8014dc3b50229fe0bd992471579c97 100644 --- a/pom.xml +++ b/pom.xml @@ -134,6 +134,14 @@ <version>${maven.clean.version}</version> <configuration> <filesets> + <fileset> + <directory>.</directory> + <includes> + <include>**/*.tmp</include> + <include>**/*.log</include> + <include>**/versions.json</include> + </includes> + </fileset> <fileset> <directory>jams/</directory> <includes> diff --git a/versions.json b/versions.json new file mode 100644 index 0000000000000000000000000000000000000000..9916d14194aa5a84daab70a855a27b55e0be5f3e --- /dev/null +++ b/versions.json @@ -0,0 +1,27 @@ +{ + "net.jami.jams.ad.connector.ADConnector": { + "version": "2.0", + "filename": "ad-connector.jar", + "md5": "bd362666285da485a316e93f934b66a7" + }, + "net.jami.jams.authmodule.UserAuthenticationModule": { + "version": "2.0", + "filename": "authentication-module.jar", + "md5": "da9f724c4162593cf80f6c6e7260c1b2" + }, + "net.jami.jams.server.Server": { + "version": "2.0", + "md5": "ae811d245d4e10b45f4530a08fce3c8e", + "filename": "jams-server.jar" + }, + "net.jami.jams.ca.JamsCA": { + "version": "2.0", + "md5": "fbcb88fbe485c2803cc388b4a33da752", + "filename": "cryptoengine.jar" + }, + "net.jami.jams.ldap.connector.LDAPConnector": { + "version": "2.0", + "md5": "366361cb125966f86ea7b2192ee9c10c", + "filename": "ldap-connector.jar" + } +} \ No newline at end of file