Skip to content

Commit

Permalink
feat: update migration guide guide & default config & geor datadir
Browse files Browse the repository at this point in the history
  • Loading branch information
f-necas committed Dec 18, 2023
1 parent 2dad0f8 commit 1353217
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 12 deletions.
2 changes: 2 additions & 0 deletions core/src/main/resources/config-spring-geonetwork.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@

<bean id="AccessManager" class="org.fao.geonet.kernel.AccessManager" lazy-init="true"/>
<bean id="DataManager" class="org.fao.geonet.kernel.DataManager" lazy-init="true"/>
<!-- will be defined into the web/ module
<bean id="GeonetworkDataDirectory" class="org.fao.geonet.kernel.GeonetworkDataDirectory"
lazy-init="true"/>
-->

<bean id="ThesaurusManager" class="org.fao.geonet.kernel.ThesaurusManager" lazy-init="true">
<property name="thesaurusCacheMaxSize" value="\${thesaurus.cache.maxsize}"/>
Expand Down
1 change: 1 addition & 0 deletions core/src/test/resources/config-spring-geonetwork.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<!-- DataManager need ThesaurusManager need SettingManager need a ServletContext-->
<bean id="servletContext" class="org.fao.geonet.GeonetMockServletContext"/>

<bean id="GeonetworkDataDirectory" class="org.fao.geonet.kernel.GeonetworkDataDirectory" lazy-init="true"/>
<bean id="language" class="org.fao.geonet.web.DefaultLanguage">
<property name="language" value="${language.default}"/>
<property name="forceDefault" value="${language.forceDefault}"/>
Expand Down
10 changes: 10 additions & 0 deletions georchestra-migration/MIGRATION_NOTES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Migration Notes

## 4.2.4 -> 4.2.7

### Havesters

- Update XSL transformations in Simple URL haverster to the ones named `schema:...`

**Simple URL Havester**
- Update `Element for the UUID of each record` with prefixing it with a slash, e.g. `datasetid` becomes `/datasetid`
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ All italic folder just have the `pom.xml` change.
- `JeevesContextLoaderListener.java` : remove java 8 runtime exception as we use java 11.
- `XslUtil.java`: Implement georchestra header specific code
- `config-spring-geonetwork.xml` : Implement `context:property-placeholder` for georchestra's datadir
- `src/test/resources/config-spring-geonetwork.xml`: Add GeonetworkDataDirectory bean
- `cleanoutdatabase.sql`: Delete from settings-ui at the end of the file
- *csw-server*
- **docker**
Expand Down Expand Up @@ -90,11 +91,13 @@ All italic folder just have the `pom.xml` change.
- Implement `context:property-placeholder` for georchestra's datadir
- Don't forget to import config resource and logging bean
- `spring-servlet.xml`: Implement `context:property-placeholder` for georchestra's datadir
- `pom.xml`: Update `dockerGnDatadirScmVersion` variable accordingly
- `postgres-postgis.xml` Keep `context:property-placeholder` for georchestra's datadir
- `pom.xml`: Update `dockerGnDatadirScmVersion` variable accordingly and remove `font-awesome/css/` from `packagingExclude`
- web-ui
- `pom.xml`: version to update **and to add to gn-web-ui**
- `RelatedResourcesService.js`: Add 3DTiles
- `CatController.js`: Menu bar accessible and 3DTiles
- `menu-signin.html`: remove the `authenticated` from the `ng-if` in firstul tag.
- `src/main/resources/catalog/locales/`
- Add OGC API - Features to i18n files
- Get `en-georchestra.json` and `fr-georchestra.json` from georchestra
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ul
data-ng-if="gnCfg.mods.authentication.enabled || authenticated"
data-ng-if="gnCfg.mods.authentication.enabled"
class="nav navbar-nav username-dropdown accessible-dropdown"
>
<!-- logged in -->
Expand Down
3 changes: 1 addition & 2 deletions web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1356,7 +1356,6 @@
catalog/lib/style/bootstrap/fonts/**,
catalog/lib/style/bootstrap/grunt/**,
catalog/lib/style/bootstrap/test-infra/**,
catalog/lib/style/font-awesome/css/**,
catalog/lib/style/font-awesome/src/**,
catalog/lib/style/font-awesome/scss/**
</packagingExcludes>
Expand Down Expand Up @@ -1399,7 +1398,7 @@
<checkoutDirectory>${project.build.directory}/deb/etc/georchestra</checkoutDirectory>
<connectionUrl>scm:git:https://github.com/georchestra/datadir.git</connectionUrl>
<pushChanges>false</pushChanges>
<scmVersion>22.0</scmVersion>
<scmVersion>23.0</scmVersion>
<scmVersionType>branch</scmVersionType>
</configuration>
<executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,18 @@
-->

<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
default-lazy-init="true"
xmlns="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<!-- allow loading properties from the tomcat conf directory. If not found the default jdbc.properties will be used. Uncomment to use. -->
<!-- context:property-placeholder location="file:${catalina.home}/conf/jdbc.properties" ignore-resource-not-found="true" file-encoding="UTF-8" ignore-unresolvable="true" order="0"/-->

<context:property-placeholder location="file:${georchestra.datadir}/geonetwork/geonetwork.properties"
ignore-resource-not-found="true" ignore-unresolvable="true" order="1"/>
<context:property-placeholder location="WEB-INF/config-geonetwork-georchestra.properties"
ignore-resource-not-found="true" ignore-unresolvable="true" order="2"/>

<import resource="defaultJdbcDataSource.xml"/>

<bean id="jpaVendorAdapterDatabaseParam" class="java.lang.String">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1381,13 +1381,6 @@ INSERT INTO settings_ui VALUES ('srv', '{
"enabled": false,
"includePortals": true
}
},
"signin": {
"appUrl": "../../{{node}}/{{lang}}/catalog.signin",
"enabled": false
},
"signout": {
"appUrl": "../../signout"
}
},
"nodeDetector": {
Expand Down

0 comments on commit 1353217

Please sign in to comment.