Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@SteffenHankiewicz
SteffenHankiewicz committed Apr 5, 2022
2 parents b504a83 + a9c721c commit fa59c1f
Show file tree
Hide file tree
Showing 2,208 changed files with 3,912 additions and 3,369 deletions.
26 changes: 19 additions & 7 deletions Goobi/.classpath
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="main/resources/" including="**/*.java" kind="src" output="webapp/WEB-INF/classes" path="src">
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="test/src">
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JSF 2.0"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
Expand Down
2 changes: 1 addition & 1 deletion Goobi/.metadata/webapp/WEB-INF/faces-config.pageflow
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<pageflow:Pageflow xmlns:pageflow="http://www.sybase.com/suade/pageflow" id="pf15397847829610" configfile="/Goobi-maven/webapp/WEB-INF/faces-config.xml"/>
<pageflow:Pageflow xmlns:pageflow="http://www.sybase.com/suade/pageflow" id="pf15397847829610" configfile="/Goobi-maven/src/main/webapp/WEB-INF/faces-config.xml"/>
11 changes: 0 additions & 11 deletions Goobi/.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,6 @@
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1571062127480</id>
<name>webapp/node_modules</name>
<type>30</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-**/node_modules/**</arguments>
</matcher>
</filter>
</filteredResources>
<variableList>
<variable>
<name>GIT_DIR</name>
Expand Down
18 changes: 8 additions & 10 deletions Goobi/.settings/org.eclipse.wst.common.component
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,21 @@

<wb-module deploy-name="goobi-core-3.0">

<wb-resource deploy-path="/WEB-INF/web.xml" source-path="/webapp/WEB-INF/web.xml"/>
<wb-resource deploy-path="/WEB-INF/web.xml" source-path="/src/main/webapp/WEB-INF/web.xml"/>

<wb-resource deploy-path="/WEB-INF/beans.xml" source-path="/webapp/WEB-INF/beans.xml"/>
<wb-resource deploy-path="/WEB-INF/beans.xml" source-path="/src/main/webapp/WEB-INF/beans.xml"/>

<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>

<wb-resource deploy-path="/" source-path="/web" tag="defaultRootSource"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>

<wb-resource deploy-path="/" source-path="/webapp"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>

<wb-resource deploy-path="/" source-path="/src"/>

<wb-resource deploy-path="/" source-path="/test/src"/>

<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/test/src"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>

<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>

<property name="java-output-path" value="/Goobi/webapp/WEB-INF/classes"/>

<property name="context-root" value="goobi-core"/>
Expand Down
71 changes: 49 additions & 22 deletions Goobi/install/config/goobi_activemq.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,60 @@
<beans
xmlns="http://www.springframework.org/schema/beans"
xmlns:amq="http://activemq.apache.org/schema/core"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
<broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" schedulerSupport="true" schedulerDirectory="/opt/digiverso/goobi/activemq/scheduler">

<broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="/opt/digiverso/goobi/activemq" schedulerSupport="true">

<destinationPolicy>
<policyMap>
<policyEntries>
<policyEntry topic=">" >
<!-- The constantPendingMessageLimitStrategy is used to prevent
slow topic consumers to block producers and affect other consumers
by limiting the number of messages that are retained
For more information, see:
http://activemq.apache.org/slow-consumer-handling.html
-->
<pendingMessageLimitStrategy>
<constantPendingMessageLimitStrategy limit="1000"/>
</pendingMessageLimitStrategy>
</policyEntry>
</policyEntries>
</policyMap>
</destinationPolicy>

<managementContext>
<managementContext createConnector="false"/>
</managementContext>

<persistenceAdapter>
<kahaDB directory="/opt/digiverso/goobi/activemq/messages" journalMaxFileLength="32mb"/>
</persistenceAdapter>
<systemUsage>
<systemUsage>
<memoryUsage>
<memoryUsage limit="64 mb"/>
</memoryUsage>
<storeUsage>
<storeUsage limit="512 mb"/>
</storeUsage>
<tempUsage>
<tempUsage limit="128 mb"/>
</tempUsage>
</systemUsage>
</systemUsage>

<transportConnectors>
<transportConnector name="stomp" uri="stomp://localhost:61613" />
<transportConnector name="tcp" uri="tcp://localhost:61616" />
<!-- DOS protection, limit concurrent connections to 1000 and frame size to 100MB -->
<transportConnector name="openwire" uri="tcp://0.0.0.0:61616?maximumConnections=1000&amp;wireFormat.maxFrameSize=104857600"/>
<transportConnector name="stomp" uri="stomp://0.0.0.0:61613?maximumConnections=1000&amp;wireFormat.maxFrameSize=104857600"/>
</transportConnectors>

<plugins>

<redeliveryPlugin fallbackToDeadLetter="true"
sendToDlqIfMaxRetriesExceeded="true">
<redeliveryPolicyMap>
Expand All @@ -22,7 +67,6 @@
useExponentialBackOff="true"/>
</redeliveryPolicyEntries>
<defaultEntry>
<!-- the fallback policy for all other destinations -->
<redeliveryPolicy maximumRedeliveries="10"
initialRedeliveryDelay="300000"
backOffMultiplier="1.5"
Expand Down Expand Up @@ -53,22 +97,5 @@
</map>
</authorizationPlugin>
</plugins>
<persistenceAdapter>
<kahaDB directory="/opt/digiverso/goobi/activemq/messages"
journalMaxFileLength="32mb" />
</persistenceAdapter>
<systemUsage>
<systemUsage>
<memoryUsage>
<memoryUsage limit="64 mb"/>
</memoryUsage>
<storeUsage>
<storeUsage limit="512 mb"/>
</storeUsage>
<tempUsage>
<tempUsage limit="128 mb"/>
</tempUsage>
</systemUsage>
</systemUsage>
</broker>
</beans>
35 changes: 20 additions & 15 deletions Goobi/install/config/goobi_projects.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@ Sequence for determining the right <project> element:
<itemlist>
<item from="werk" multiselect="true">
Creator of digital edition
<select label="Verbundzentrale des GBV (VZG)">Common Library Network</select>
<select label="CHANGEME">CHANGEME</select>

</item>
<item from="werk" multiselect="false">
Font type
<select label="Antiqua">Antiqua </select>
<select label="Gothic"> Gothic </select>
<select label="Mixed">Mixed </select>
<item from="prozess" multiselect="false">
FontType
<select label="Antiqua"> Antiqua </select>
<select label="Fracture"> Fracture </select>
</item>

<!-- Title for Monograph and Periodical -->
Expand Down Expand Up @@ -91,23 +90,23 @@ Sequence for determining the right <project> element:
</item>
<item metadata="_electronicPublisher" multiselect="true" required="true" ughbinding="true">
Creator of digital edition
<select label="Goobi"> Goobi </select>
<select label="CHANGEME"> CHANGEME </select>
</item>
<item metadata="_placeOfElectronicOrigin" multiselect="true" required="true" ughbinding="true">
Place of digital edition
<select label="Göttingen"> Göttingen </select>
<select label="CHANGEME"> CHANGEME </select>
</item>
<item metadata="_digitalOrigin" multiselect="true" required="true" ughbinding="true">
Digital origin
<select label="reformatted digital"> reformatted digital </select>
</item>
<item docstruct="topstruct" isnotdoctype="periodical\|multivolume" from="vorlage" metadata="PhysicalLocation" multiselect="true" required="true" ughbinding="true">
Physical location
<select label="Goobi"> Goobi </select>
<select label="CHANGEME"> CHANGEME </select>
</item>
<item docstruct="firstchild" isdoctype="periodical\|multivolume" from="vorlage" metadata="PhysicalLocation" multiselect="true" required="true" ughbinding="true">
Physical location
<select label="Goobi"> Goobi </select>
<select label="CHANGEME"> CHANGEME </select>
</item>
<processtitle isdoctype="multivolume">ATS+TSL+'_'+Identifier digital (f)+'_'+Label number</processtitle>
<processtitle isdoctype="monograph">ATS+TSL+'_'+Identifier digital (a)</processtitle>
Expand All @@ -123,11 +122,17 @@ Sequence for determining the right <project> element:
<metadatageneration use="true" />

<fileupload use="true">
<folder>intern</folder>
<folder>export</folder>
<folder>master</folder>
<folder>media</folder>
</fileupload>
<!-- The regex strings must be enclosed in slashes. -->
<!-- Primefaces does not accept regex without slashes -->
<!-- and does not output an error otherwise -->
<!-- The messageKey parameter can be used to specify the text key of a customized error message -->
<!-- that is shown in the user interface if a file could not be uploaded because it did not match -->
<!-- to the regular expression. The messages can then be provided in the messages_xx.properties files for all languages. -->
<folder regex="/^.*\\.pdf$/" messageKey="uploadFileErrorIntern">intern</folder>
<folder regex="/^.*\\.pdf$/" messageKey="uploadFileErrorExport">export</folder>
<folder regex="/^.*\\.pdf$/" messageKey="uploadFileErrorMaster">master</folder>
<folder regex="/^.*\\.pdf$/" messageKey="uploadFileErrorMedia">media</folder>
</fileupload>
</createNewProcess>


Expand Down
Loading

0 comments on commit fa59c1f

Please sign in to comment.