LibreCCM
/
scientificcms
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Various fixes

pull/1/head
Jens Pelzetter 2020-01-26 16:32:10 +01:00
parent 8089df6395
commit 7f87385671
9 changed files with 4461 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sci-publications/pom.xml
View File

@ -48,6 +48,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -59,6 +60,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

2
sci-publications/src/main/java/org/scientificcms/publications/UnPublished.java
View File

@ -32,7 +32,7 @@ public class UnPublished extends Publication {
@Column(name = "PLACE", length = 2048) @Column(name = "PLACE", length = 2048)
private String place; private String place;
@Column(name = "PLACE", length = 512) @Column(name = "NUMBER", length = 512)
private String number; private String number;
@Column(name = "NUMBER_OF_PAGES") @Column(name = "NUMBER_OF_PAGES")

1
sci-publications/src/main/resources/META-INF/services/org.libreccm.modules.CcmModule 100644
View File

@ -0,0 +1 @@
org.scientificcms.publications.SciPublications

2
sci-types-project/pom.xml
View File

@ -48,6 +48,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -59,6 +60,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

2
sci-types-project/src/main/resources/META-INF/services/org.libreccm.modules.CcmModule
View File

@ -1 +1 @@
org.scientificcms.contenttypes.sci-types-project org.scientificcms.contenttypes.sciproject.SciProjectModule

4446
scicms-bundle-devel-wildfly/package-lock.json generated 100644
View File

File diff suppressed because it is too large Load Diff

4
scicms-bundle-devel-wildfly/pom.xml
View File

@ -61,7 +61,7 @@
</dependencies> </dependencies>
<build> <build>
<finalName>scientificcms-bundle-devel-wildfly</finalName> <finalName>scientificcms-bundle-devel-wildfly-${project.version}</finalName>
<resources> <resources>
<resource> <resource>
@ -164,7 +164,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<configuration> <configuration>
<webResources> <webResources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>

7
scicms-bundle-devel-wildfly/src/main/webapp/WEB-INF/classes/persistence.xml → scicms-bundle-devel-wildfly/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
View File

@ -21,10 +21,11 @@
<jta-data-source>java:/comp/env/jdbc/scientificcms/db</jta-data-source> <jta-data-source>java:/comp/env/jdbc/scientificcms/db</jta-data-source>
<!-- <jar-file>lib/ccm-core-7.0.0-SNAPSHOT.jar</jar-file> <jar-file>lib/ccm-core-7.0.0-SNAPSHOT.jar</jar-file>
<jar-file>lib/ccm-cms-7.0.0-SNAPSHOT.jar</jar-file> <jar-file>lib/ccm-cms-7.0.0-SNAPSHOT.jar</jar-file>
<jar-file>lib/ccm-shortcuts-7.0.0-SNAPSHOT.jar</jar-file>--> <jar-file>lib/ccm-shortcuts-7.0.0-SNAPSHOT.jar</jar-file>
<jar-file>lib/sci-publications-7.0.0-SNAPSHOT.jar</jar-file>
<jar-file>lib/sci-types-project-7.0.0-SNAPSHOT.jar</jar-file>
<properties> <properties>
<!-- Properties for Hibernate --> <!-- Properties for Hibernate -->

2
scientificcms/pom.xml
View File

@ -39,11 +39,13 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>