Skip to content
Permalink
Browse files

- mise à jour du Webservices REST pour autoriser le header "Access-Co…

…ntrol-Allow-Origin"
  • Loading branch information...
miledrousset committed Mar 21, 2017
1 parent af1fa77 commit 25a5a7cc53543587292d46f190d6622941a63b34
Showing with 1,414 additions and 1,260 deletions.
  1. BIN lib/skos-api-onejar.jar
  2. BIN lib/skosapi-1.9.jar
  3. +8 −0 licenseheader.txt
  4. +0 −1 nb-configuration.xml
  5. +69 −182 pom.xml
  6. +2 −0 src/main/java/mom/trd/opentheso/SelectedBeans/GpsBeans.java
  7. +9 −0 src/main/java/mom/trd/opentheso/SelectedBeans/SelectedTerme.java
  8. +46 −25 src/main/java/mom/trd/opentheso/bdd/helper/BaseDeDoneesHelper.java
  9. +2 −4 src/main/java/mom/trd/opentheso/bdd/helper/CandidateHelper.java
  10. +3 −8 src/main/java/mom/trd/opentheso/bdd/helper/ConceptHelper.java
  11. +8 −63 src/main/java/mom/trd/opentheso/bdd/helper/ForgetPasswordHelper.java
  12. +246 −276 src/main/java/mom/trd/opentheso/bdd/helper/TermHelper.java
  13. +1 −3 src/main/java/mom/trd/opentheso/bdd/helper/ThesaurusHelper.java
  14. +302 −358 src/main/java/mom/trd/opentheso/core/exports/helper/ExportPrivatesDatas.java
  15. +420 −184 src/main/java/mom/trd/opentheso/ws/rest/Rest.java
  16. +0 −1 src/main/java/mom/trd/opentheso/ws/soap/Soap.java
  17. +1 −1 src/main/resources/install/maj_bdd_current.sql
  18. +1 −1 src/main/resources/install/opentheso_current.sql
  19. +11 −3 src/main/resources/language/site.properties
  20. +8 −0 src/main/resources/language/site_de.properties
  21. +8 −0 src/main/resources/language/site_en.properties
  22. +8 −0 src/main/resources/language/site_es.properties
  23. +8 −0 src/main/resources/language/site_it.properties
  24. +1 −1 src/main/webapp/WEB-INF/web.xml
  25. +2 −2 src/main/webapp/conf.xhtml
  26. +2 −2 src/main/webapp/contenuCentral/infoConcept/infoconcept.xhtml
  27. +101 −87 src/main/webapp/copyright.xhtml
  28. +8 −3 src/main/webapp/dialogs/Alignement/ajouterAutomatique_suiteEditDlg.xhtml
  29. +3 −3 src/main/webapp/dialogs/gps/gpsAutomatiqueEditDlg.xhtml
  30. +13 −3 src/main/webapp/dialogs/gps/gpsAutomatique_suiteEditDlg.xhtml
  31. +2 −2 src/main/webapp/dialogs/gps/gpsParLotEditDlg.xhtml
  32. +15 −1 src/main/webapp/metadata_et_commenteries.xhtml
  33. +38 −33 src/main/webapp/opentheso.xhtml
  34. +54 −0 src/test/java/mom/trd/opentheso/bdd/helper/GenerateUniqueIdTest.java
  35. +10 −9 src/test/java/mom/trd/opentheso/bdd/helper/ImportNotesTest.java
  36. +4 −4 src/test/java/mom/trd/test/opentheso/skosApiTest3.java
BIN -36 MB (12%) lib/skos-api-onejar.jar
Binary file not shown.
BIN +53.4 KB lib/skosapi-1.9.jar
Binary file not shown.
@@ -0,0 +1,8 @@
<#if licenseFirst??>
${licenseFirst}
</#if>
${licensePrefix}Here comes the text of your license
${licensePrefix}Each line should be prefixed with ${licensePrefix}
<#if licenseLast??>
${licenseLast}
</#if>
@@ -27,6 +27,5 @@ Any value defined here will override the pom.xml file value but is only applicab
<org-netbeans-modules-css-prep.sass_2e_mappings>/scss:/css</org-netbeans-modules-css-prep.sass_2e_mappings>
<org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder>javascript</org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder>
<org-netbeans-modules-javascript2-requirejs.enabled>true</org-netbeans-modules-javascript2-requirejs.enabled>
<netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
</properties>
</project-shared-configuration>
251 pom.xml
@@ -1,10 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>mom.trd</groupId>
<groupId>trd</groupId>
<artifactId>opentheso</artifactId>
<version>4.2.3</version>
<version>4.2.5</version>
<packaging>war</packaging>

<name>opentheso</name>
@@ -13,14 +13,63 @@
<endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<!-- old jzkit -->
<dependency>
<groupId>ki-jzkit-hss</groupId>
<artifactId>ki-jzkit-hss</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>ki-jzkit-iface</groupId>
<artifactId>ki-jzkit-iface</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>ki-jzkit-z3950</groupId>
<artifactId>ki-jzkit-z3950</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>ki-util</groupId>
<artifactId>ki-util</artifactId>
<version>1.2.3</version>
</dependency>

<dependency>
<groupId>a2jruntime</groupId>
<artifactId>a2jruntime</artifactId>
<version>1.2.3</version>
</dependency>





<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-runtime</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>skos-api-onejar</groupId>
<artifactId>skos-api-onejar</artifactId>
<version>4</version>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.faces</artifactId>
<version>2.2.14</version>
</dependency>
<dependency>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.2</version>
@@ -69,79 +118,13 @@
<artifactId>jdom2</artifactId>
<version>2.0.6</version>
</dependency>
<!-- new jzKit -->
<!--
<dependency>
<groupId>org.jzkit</groupId>
<artifactId>a2j</artifactId>
<version>2.0.4</version>
</dependency>
-->

<!-- old jzkit -->
<dependency>
<groupId>ki-jzkit-hss</groupId>
<artifactId>ki-jzkit-hss</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>ki-jzkit-iface</groupId>
<artifactId>ki-jzkit-iface</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>ki-jzkit-z3950</groupId>
<artifactId>ki-jzkit-z3950</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>ki-util</groupId>
<artifactId>ki-util</artifactId>
<version>1.2.3</version>
</dependency>

<dependency>
<groupId>a2jruntime</groupId>
<artifactId>a2jruntime</artifactId>
<version>1.2.3</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.18</version>
</dependency>

<!-- Ancienne version locale de skosapi-->
<!-- <dependency>
<groupId>owlapi-bin</groupId>
<artifactId>owlapi-bin</artifactId>
<version>1.0</version>
<scope>test</scope>
<type>jar</type>
</dependency>
-->

<dependency>
<groupId>skos-api-onejar</groupId>
<artifactId>skos-api-onejar</artifactId>
<version>4.0.2</version>
</dependency>

<!--
<dependency>
<groupId>net.sourceforge.owlapi</groupId>
<artifactId>owlapi-distribution</artifactId>
<version>5.0.0</version>
<scope>test</scope>
<type>jar</type>
</dependency>
-->
<dependency>
<groupId>skosapi_private</groupId>
<artifactId>skosapi_private</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
@@ -192,19 +175,19 @@
<version>3.4.4</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
<groupId>skosapi_private</groupId>
<artifactId>skosapi_private</artifactId>
<version>1.9</version>
</dependency>


<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.1-901-1.jdbc4</version>
</dependency>

<!-- Attention, la version 6.0 de PrimeFaces ne passe pas sur le serveur Debian avec java 1.7.0_85 -->
<dependency>
<groupId>org.primefaces</groupId>
@@ -219,40 +202,9 @@
<version>2.4.3</version>
<type>jar</type>
</dependency>
<!-- <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>2.4.3</version>
<scope>compile</scope>
</dependency>
-->
<!-- dépendance pour programmer un cron pour l'export régulier
<dependency>
<groupId>it.sauronsoftware.cron4j</groupId>
<artifactId>cron4j</artifactId>
<version>2.2.5</version>
</dependency>
-->
<!-- json-ld -->



<!-- <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3</version>
<scope>test</scope>
<type>jar</type>
</dependency>-->

<!--<dependency>
<groupId>nz.ac.waikato.cms.weka</groupId>
<artifactId>weka-stable</artifactId>
<version>3.6.6</version>
</dependency>-->


<dependency>
<dependency>
<groupId>net.coobird</groupId>
<artifactId>thumbnailator</artifactId>
<version>0.4.8</version>
@@ -287,65 +239,15 @@
<artifactId>qrgen</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>net.sf.barcode4j</groupId>
<artifactId>barcode4j-light</artifactId>
<version>2.1</version>
</dependency>


</dependencies>

<build>


<!-- décocher pour la version de distribution
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>hikari_dist.properties</include>
<include>preferences_dist.properties</include>
<include>ark_dist.properties</include>
</includes>
<excludes>
<exclude>sitemap.xml</exclude>
<exclude>hikari.properties</exclude>
<exclude>preferences.properties</exclude>
<exclude>ark.properties</exclude>
</excludes>
</resource>
</resources>
-->


<build>
<plugins>

<!-- code pour récupérer la version du logiciel -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifest>
<mainClass>mom.trd.opentheso.bdd.helper.Connexion</mainClass>
<addDefaultImplementationEntries>
true
</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</plugin>


<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
@@ -357,15 +259,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<version>2.3</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<version>2.6</version>
<executions>
<execution>
<phase>validate</phase>
@@ -387,22 +289,7 @@
</execution>
</executions>
</plugin>
</plugins>
</plugins>
</build>


<repositories>
<repository>
<url>http://repository.primefaces.org/</url>
<id>PrimeFaces-maven-lib</id>
<layout>default</layout>
<name>Repository for library PrimeFaces-maven-lib</name>
</repository>
<repository>
<id>prime-repo</id>
<name>PrimeFaces Maven Repository</name>
<url>http://repository.primefaces.org</url>
<layout>default</layout>
</repository>
</repositories>
</project>
@@ -246,6 +246,8 @@ private boolean integreTraduction(String idTerm) {
term.setId_term(idTerm);
term.setId_thesaurus(id_theso);
term.setLang(languesOfGps.getCode());
term.setSource("");
term.setStatus("");
if (reemplacerTraduction) {
status = reemplacerTraduction(term);
}
@@ -414,6 +414,15 @@ private void majNoticeZ3950() {
}

}

public String urlEncodeUtf_8(String value) {
try {
return URLEncoder.encode(value, "UTF-8");
} catch (UnsupportedEncodingException ex) {
Logger.getLogger(SelectedTerme.class.getName()).log(Level.SEVERE, null, ex);
}
return value;
}

private void majNoticeBdd() {
ResourceBundle bundlePref = getBundlePref();

0 comments on commit 25a5a7c

Please sign in to comment.
You can’t perform that action at this time.