LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

dependencies-update-2020-06 #3

Manually merged
jensp merged 814 commits from dependencies-update-2020-06 into master 2020-06-25 16:47:36 +02:00
Conversation 0 Commits 814 Files Changed 236
236 changed files with 8168 additions and 1990 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -1,4 +1,11 @@
nb-configuration.xml
node node
node_modules node_modules
runtime
target target
.classpath
.factorypath
.project
.settings
.tscache .tscache
*.vscode

85
INSTALL.md 100644
View File

@ -0,0 +1,85 @@
# LibreCCM/LibreCMS Installation
## WildFly
### Preparation (optional)
These steps are optional and can be skipped if you have already a WildFly server
up and running or if you already installed the PostgreSQL JDBC driver in your
WildFly instance.
#### WildFly installation
Download WildFly and extract the archive. For more informations about setting
wildfly please refer to the WildFly documentation
#### Install the PostgreSQL JDBC driver
1. Download the PostgreSQL JDBC driver from
https://jdbc.postgresql.org/download.html
2. Go to the home directory of your WildFly installation and to
`modules/system/layers/base`
3. Create a new directory `org/postgresql/main`
4. Create a `module.xml` file in the `org/postgresql/main` directory with the
following content:
```
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.1" name="org.postgresql">
<resources>
<resource-root path="postgresql-42.2.10.jar"/>
</resources>
<dependencies>
<module name="javax.api"/>
<module name="javax.transaction.api"/>
</dependencies>
</module>
```
Change the name of the JAR file to the correct name!
5. Start the JBOSS CLI tool: `bin/jboss-cli.sh` or `bin/jboss-cli.bat`. Enable
the new module:
```
[standalone@localhost:9990 /] /subsystem=datasources/jdbc-driver=postgresql:add(
driver-name=postgresql,
driver-module-name=org.postgresql,
driver-class-name=org.postgresql.Driver
)
```
Note: The above command can be in one line.
### Installing LibreCCM/LibreCMS
#### Database
1. Create a new database user
2. Create a new database in your PostgreSQL server owned by the user created
in the previous step.
#### Create a datasource
1. Start the JBOSS CLI tool: `bin/jboss-cli.sh` or `bin/jboss-cli.bat`.
2. Add new datasource:
```
[standalone@localhost:9990 /] data-source add --name=librecms --driver-name=postgresql --jndi-name=java:/comp/env/jdbc/libreccm/db --connection-url=jdbc:postgresql://localhost:5432/librecm --user-name=libreccm --password=libreccm
```
Replace the name of the datasource, the connection URL,
the user name and the password with the correct values for your environment.
#### Deploy LibreCCM/LibreCMS
Simpley copy the the WAR file from one of the bundle modules to to the
directory `standalone/deployments` of your WildFly installation.
## Thorntail
ToDo
## TomEE
ToDo

9
Jenkinsfile vendored
View File

@ -24,6 +24,15 @@ pipeline {
} }
} }
} }
stage("Deploy") {
steps {
dir('') {
configFileProvider([configFile(fileId: 'libreccm-packages-deploy', variable: 'MAVEN_SETTINGS')]) {
sh 'mvn -U -s "$MAVEN_SETTINGS" -e deploy'
}
}
}
}
} }
post { post {
success { success {

2
ccm-archetype-module/pom.xml
View File

@ -12,7 +12,7 @@
<artifactId>ccm-archetype-module</artifactId> <artifactId>ccm-archetype-module</artifactId>
<version>7.0.0-SNAPSHOT</version> <version>7.0.0-SNAPSHOT</version>
<name>LibreCCM Module archetype</name> <name>LibreCCM Module Archetype</name>
<url>http://www.libreccm.org/devel/modules</url> <url>http://www.libreccm.org/devel/modules</url>
</project> </project>

5
ccm-archetype-module/src/main/resources/archetype-resources/pom.xml
View File

@ -228,11 +228,6 @@
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.5.201505241946</version> <version>0.7.5.201505241946</version>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.1</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

9
ccm-bundle-devel-thorntail/pom.xml
View File

@ -3,12 +3,6 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<!--<parent>
<groupId>org.libreccm</groupId>
<artifactId>libreccm-parent</artifactId>
<version>7.0.0-SNAPSHOT</version>
</parent>-->
<parent> <parent>
<groupId>org.libreccm</groupId> <groupId>org.libreccm</groupId>
<artifactId>ccm-bundle-devel</artifactId> <artifactId>ccm-bundle-devel</artifactId>
@ -142,17 +136,14 @@
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId> <artifactId>font-awesome</artifactId>
<version>4.7.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>requirejs</artifactId> <artifactId>requirejs</artifactId>
<version>2.3.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>requirejs-domready</artifactId> <artifactId>requirejs-domready</artifactId>
<version>2.0.1-2</version>
</dependency> </dependency>
</dependencies> </dependencies>

1915
ccm-bundle-devel-wildfly-web/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
ccm-bundle-devel-wildfly-web/package.json
View File

@ -5,7 +5,7 @@
"build": "webpack" "build": "webpack"
}, },
"dependencies": { "dependencies": {
"ccm-cms-pagemodelseditor": "7.0.0", "@librecms/ccm-cms-pagemodelseditor": "7.0.0",
"tinymce": "^4.8.2" "tinymce": "^4.8.2"
}, },
"devDependencies": { "devDependencies": {

30
ccm-bundle-devel-wildfly-web/pom.xml
View File

@ -26,28 +26,19 @@
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId> <artifactId>font-awesome</artifactId>
<!--<version>4.7.0</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>requirejs</artifactId> <artifactId>requirejs</artifactId>
<!--<version>2.3.5</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>requirejs-domready</artifactId> <artifactId>requirejs-domready</artifactId>
<!--<version>2.0.1-2</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars.npm</groupId> <groupId>org.webjars.npm</groupId>
<artifactId>tinymce</artifactId> <artifactId>tinymce</artifactId>
<!--<version>4.8.2</version>-->
</dependency> </dependency>
<!-- <dependency>
<groupId>org.librecms</groupId>
<artifactId>ccm-cms-js</artifactId>
<version>7.0.0-SNAPSHOT</version>
</dependency> -->
<dependency> <dependency>
<groupId>org.librecms</groupId> <groupId>org.librecms</groupId>
<artifactId>ccm-cms-pagemodelseditor</artifactId> <artifactId>ccm-cms-pagemodelseditor</artifactId>
@ -103,40 +94,31 @@
<nodeVersion>v8.11.4</nodeVersion> <nodeVersion>v8.11.4</nodeVersion>
</configuration> </configuration>
</execution> </execution>
<!-- <execution>
<id>npm link ccm-pagemodelseditor</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>link ccm-pagemodelseditor</arguments>
</configuration>
</execution> -->
<execution> <execution>
<id>npm link ccm-cms-pagemodelseditor</id> <id>npm link @librecms/ccm-cms-pagemodelseditor</id>
<goals> <goals>
<goal>npm</goal> <goal>npm</goal>
</goals> </goals>
<configuration> <configuration>
<arguments>link ccm-cms-pagemodelseditor</arguments> <arguments>link @librecms/ccm-cms-pagemodelseditor</arguments>
</configuration> </configuration>
</execution> </execution>
<!-- <execution> <!-- <execution>
<id>npm link ccm-cms-tinymce</id> <id>npm link @librecms/ccm-cms-tinymce</id>
<goals> <goals>
<goal>npm</goal> <goal>npm</goal>
</goals> </goals>
<configuration> <configuration>
<arguments>link ccm-cms-tinymce</arguments> <arguments>link @librecms/ccm-cms-tinymce</arguments>
</configuration> </configuration>
</execution>--> </execution>-->
<!--<execution> <!--<execution>
<id>npm link ccm-cms-js</id> <id>npm link @librecms/ccm-cms-js</id>
<goals> <goals>
<goal>npm</goal> <goal>npm</goal>
</goals> </goals>
<configuration> <configuration>
<arguments>link ccm-cms-js</arguments> <arguments>link @librecms/ccm-cms-js</arguments>
</configuration> </configuration>
</execution>--> </execution>-->
<execution> <execution>

2
ccm-bundle-devel-wildfly-web/src/main/typescript/ccm-cms-pagemodelseditor.ts
View File

@ -1 +1 @@
import "ccm-cms-pagemodelseditor"; import "@librecms/ccm-cms-pagemodelseditor";

1
ccm-bundle-devel-wildfly/pom.xml
View File

@ -121,7 +121,6 @@
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<version>9.4.1208</version>
</dependency> </dependency>
</dependencies> </dependencies>

5
ccm-bundle-devel/pom.xml
View File

@ -38,6 +38,11 @@
<artifactId>ccm-theme-foundry</artifactId> <artifactId>ccm-theme-foundry</artifactId>
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.librecms</groupId>
<artifactId>ccm-theme-ftllibs-devel</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency> <dependency>
<groupId>net.sf.saxon</groupId> <groupId>net.sf.saxon</groupId>

5
ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml
View File

@ -236,11 +236,6 @@
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.5.201505241946</version> <version>0.7.5.201505241946</version>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.1</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

4
ccm-cms-js/package.json
View File

@ -1,5 +1,5 @@
{ {
"name": "ccm-cms-js", "name": "@librecms/ccm-cms-js",
"version": "7.0.0", "version": "7.0.0",
"description": "JavaScript for the ccm-cms-module", "description": "JavaScript for the ccm-cms-module",
"repository": { "repository": {
@ -15,7 +15,7 @@
"tslint": "tslint --project ." "tslint": "tslint --project ."
}, },
"dependencies": { "dependencies": {
"ccm-pagemodelseditor": "7.0.0", "@libreccm/ccm-pagemodelseditor": "7.0.0",
"react": "^16.4.2", "react": "^16.4.2",
"react-dom": "^16.4.2", "react-dom": "^16.4.2",
"react-redux": "^5.0.7", "react-redux": "^5.0.7",

4
ccm-cms-js/pom.xml
View File

@ -79,12 +79,12 @@
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>npm link ccm-pagemodelseditor</id> <id>npm link @libreccm/ccm-pagemodelseditor</id>
<goals> <goals>
<goal>npm</goal> <goal>npm</goal>
</goals> </goals>
<configuration> <configuration>
<arguments>link ccm-pagemodelseditor</arguments> <arguments>link @libreccm/ccm-pagemodelseditor</arguments>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>

234
ccm-cms-pagemodelseditor/package-lock.json generated
View File

@ -1,125 +1,10 @@
{ {
"name": "ccm-cms-pagemodelseditor", "name": "@librecms/ccm-cms-pagemodelseditor",
"version": "7.0.0", "version": "7.0.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@types/node": { "@libreccm/ccm-pagemodelseditor": {
"version": "10.7.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.7.1.tgz",
"integrity": "sha512-EGoI4ylB/lPOaqXqtzAyL8HcgOuCtH2hkEaLmkueOYufsTFWBn4VCvlCDC2HW8Q+9iF+QVC3sxjDKQYjHQeZ9w==",
"dev": true
},
"@types/prop-types": {
"version": "15.5.5",
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.5.5.tgz",
"integrity": "sha512-mOrlCEdwX3seT3n0AXNt4KNPAZZxcsABUHwBgFXOt+nvFUXkxCAO6UBJHPrDxWEa2KDMil86355fjo8jbZ+K0Q==",
"dev": true,
"requires": {
"@types/react": "16.4.11"
}
},
"@types/react": {
"version": "16.4.11",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.4.11.tgz",
"integrity": "sha512-1DQnmwO8u8N3ucvRX2ZLDEjQ2VctkAvL/rpbm2ev4uaZA0z4ysU+I0tk+K8ZLblC6p7MCgFyF+cQlSNIPUHzeQ==",
"dev": true,
"requires": {
"@types/prop-types": "15.5.5",
"csstype": "2.5.6"
}
},
"@types/react-dom": {
"version": "16.0.7",
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.0.7.tgz",
"integrity": "sha512-vaq4vMaJOaNgFff1t3LnHYr6vRa09vRspMkmLdXtFZmO1fwDI2snP+dpOkwrtlU8UC8qsqemCu4RmVM2OLq/fA==",
"dev": true,
"requires": {
"@types/node": "10.7.1",
"@types/react": "16.4.11"
}
},
"ansi-regex": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true
},
"ansi-styles": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
"dev": true
},
"argparse": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
"dev": true,
"requires": {
"sprintf-js": "1.0.3"
}
},
"asap": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
"integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
},
"babel-code-frame": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
"dev": true,
"requires": {
"chalk": "1.1.3",
"esutils": "2.0.2",
"js-tokens": "3.0.2"
},
"dependencies": {
"chalk": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
}
},
"js-tokens": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
"dev": true
}
}
},
"balanced-match": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
"dev": true
},
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"requires": {
"balanced-match": "1.0.0",
"concat-map": "0.0.1"
}
},
"builtin-modules": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
"dev": true
},
"ccm-pagemodelseditor": {
"version": "7.0.0", "version": "7.0.0",
"requires": { "requires": {
"react": "16.4.2", "react": "16.4.2",
@ -604,6 +489,121 @@
} }
} }
}, },
"@types/node": {
"version": "10.7.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.7.1.tgz",
"integrity": "sha512-EGoI4ylB/lPOaqXqtzAyL8HcgOuCtH2hkEaLmkueOYufsTFWBn4VCvlCDC2HW8Q+9iF+QVC3sxjDKQYjHQeZ9w==",
"dev": true
},
"@types/prop-types": {
"version": "15.5.5",
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.5.5.tgz",
"integrity": "sha512-mOrlCEdwX3seT3n0AXNt4KNPAZZxcsABUHwBgFXOt+nvFUXkxCAO6UBJHPrDxWEa2KDMil86355fjo8jbZ+K0Q==",
"dev": true,
"requires": {
"@types/react": "16.4.11"
}
},
"@types/react": {
"version": "16.4.11",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.4.11.tgz",
"integrity": "sha512-1DQnmwO8u8N3ucvRX2ZLDEjQ2VctkAvL/rpbm2ev4uaZA0z4ysU+I0tk+K8ZLblC6p7MCgFyF+cQlSNIPUHzeQ==",
"dev": true,
"requires": {
"@types/prop-types": "15.5.5",
"csstype": "2.5.6"
}
},
"@types/react-dom": {
"version": "16.0.7",
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.0.7.tgz",
"integrity": "sha512-vaq4vMaJOaNgFff1t3LnHYr6vRa09vRspMkmLdXtFZmO1fwDI2snP+dpOkwrtlU8UC8qsqemCu4RmVM2OLq/fA==",
"dev": true,
"requires": {
"@types/node": "10.7.1",
"@types/react": "16.4.11"
}
},
"ansi-regex": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true
},
"ansi-styles": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
"dev": true
},
"argparse": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
"dev": true,
"requires": {
"sprintf-js": "1.0.3"
}
},
"asap": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
"integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
},
"babel-code-frame": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
"dev": true,
"requires": {
"chalk": "1.1.3",
"esutils": "2.0.2",
"js-tokens": "3.0.2"
},
"dependencies": {
"chalk": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
}
},
"js-tokens": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
"dev": true
}
}
},
"balanced-match": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
"dev": true
},
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"requires": {
"balanced-match": "1.0.0",
"concat-map": "0.0.1"
}
},
"builtin-modules": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
"dev": true
},
"chalk": { "chalk": {
"version": "2.4.1", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",

4
ccm-cms-pagemodelseditor/package.json
View File

@ -1,5 +1,5 @@
{ {
"name": "ccm-cms-pagemodelseditor", "name": "@librecms/ccm-cms-pagemodelseditor",
"version": "7.0.0", "version": "7.0.0",
"description": "Adds editor components for PageModels components provided by ccm-cms", "description": "Adds editor components for PageModels components provided by ccm-cms",
"repository": { "repository": {
@ -15,7 +15,7 @@
"tslint": "tslint --project ." "tslint": "tslint --project ."
}, },
"dependencies": { "dependencies": {
"ccm-pagemodelseditor": "7.0.0", "@libreccm/ccm-pagemodelseditor": "7.0.0",
"react": "^16.4.2", "react": "^16.4.2",
"react-dom": "^16.4.2" "react-dom": "^16.4.2"
}, },

21
ccm-cms-pagemodelseditor/pom.xml
View File

@ -79,7 +79,7 @@
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>npm link ccm-pagemodelseditor</id> <id>npm link @libreccm/ccm-pagemodelseditor</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
@ -88,7 +88,7 @@
<executable>npm</executable> <executable>npm</executable>
<arguments> <arguments>
<argument>link</argument> <argument>link</argument>
<argument>ccm-pagemodelseditor</argument> <argument>@libreccm/ccm-pagemodelseditor</argument>
</arguments> </arguments>
</configuration> </configuration>
</execution> </execution>
@ -141,12 +141,12 @@
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>npm link ccm-pagemodelseditor</id> <id>npm link @libreccm/ccm-pagemodelseditor</id>
<goals> <goals>
<goal>npm</goal> <goal>npm</goal>
</goals> </goals>
<configuration> <configuration>
<arguments>link ccm-pagemodelseditor</arguments> <arguments>link @libreccm/ccm-pagemodelseditor</arguments>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@ -173,6 +173,19 @@
<arguments>link</arguments> <arguments>link</arguments>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>npm publish</id>
<goals>
<goal>npm</goal>
</goals>
<phase>deploy</phase>
<configuration>
<arguments>publish --userconfig ../libreccm.npmrc</arguments>
</configuration>
</execution>
</executions> </executions>
</plugin> </plugin>

2
ccm-cms-pagemodelseditor/src/main/typescript/ccm-cms/ccm-cms-pagemodelseditor.tsx
View File

@ -14,7 +14,7 @@ import {
ComponentModelEditorProps, ComponentModelEditorProps,
EditorComponents, EditorComponents,
PageModelEditor, PageModelEditor,
} from "ccm-pagemodelseditor"; } from "@libreccm/ccm-pagemodelseditor";
class CategoryTreeComponentPropertiesList class CategoryTreeComponentPropertiesList
extends React.Component< extends React.Component<

8
ccm-cms-profile/pom.xml
View File

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -255,10 +255,6 @@
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

2
ccm-cms-tinymce/package.json
View File

@ -1,5 +1,5 @@
{ {
"name": "ccm-cms-tinymce", "name": "@librecms/ccm-cms-tinymce",
"version": "7.0.0", "version": "7.0.0",
"description": "Extensions for TinyMCE specific for ccm-cms", "description": "Extensions for TinyMCE specific for ccm-cms",
"repository": { "repository": {

10
ccm-cms-types-agenda/pom.xml
View File

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -252,11 +252,7 @@
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>

8
ccm-cms-types-bookmark/pom.xml
View File

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -251,10 +251,6 @@
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

8
ccm-cms-types-decisiontree/pom.xml
View File

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -252,10 +252,6 @@
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

8
ccm-cms-types-externallink/pom.xml
View File

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -251,10 +251,6 @@
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

8
ccm-cms-types-faqitem/pom.xml
View File

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -251,10 +251,6 @@
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

10
ccm-cms-types-glossaryitem/pom.xml
View File

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -251,11 +251,7 @@
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>

8
ccm-cms-types-minutes/pom.xml
View File

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -252,10 +252,6 @@
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

11
ccm-cms/pom.xml
View File

@ -55,12 +55,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -294,16 +294,9 @@
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>com.github.spotbugs</groupId> <groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId> <artifactId>spotbugs-maven-plugin</artifactId>
<!--<configuration>
<excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
</configuration>-->
</plugin> </plugin>
<plugin> <plugin>

8
ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleEditForm.java
View File

@ -129,15 +129,15 @@ public class MultiPartArticleEditForm extends MultiPartArticleForm
.selectedLocale(state, selectedLanguageParam); .selectedLocale(state, selectedLanguageParam);
final String newName = (String) data.get(MultiPartArticleForm.NAME); final String newName = (String) data.get(MultiPartArticleForm.NAME);
final String oldName = article.getName().getValue(selectedLocale); final MultiPartArticleFormController controller = CdiUtil
.createCdiUtil()
.findBean(MultiPartArticleFormController.class);
final String oldName = controller.getName(article, selectedLocale);
final boolean valid; final boolean valid;
if (newName.equalsIgnoreCase(oldName)) { if (newName.equalsIgnoreCase(oldName)) {
valid = true; valid = true;
} else { } else {
final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
final MultiPartArticleFormController controller = cdiUtil
.findBean(MultiPartArticleFormController.class);
final Optional<Folder> folder = controller.getArticleFolder(article); final Optional<Folder> folder = controller.getArticleFolder(article);
if (folder.isPresent()) { if (folder.isPresent()) {
valid = validateNameUniqueness(folder.get(), event); valid = validateNameUniqueness(folder.get(), event);

9
ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleForm.java
View File

@ -233,14 +233,17 @@ public abstract class MultiPartArticleForm
final Locale selectedLocale = SelectedLanguageUtil final Locale selectedLocale = SelectedLanguageUtil
.selectedLocale(state, selectedLanguageParam); .selectedLocale(state, selectedLanguageParam);
final MultiPartArticleFormController controller = CdiUtil
.createCdiUtil()
.findBean(MultiPartArticleFormController.class);
if (article != null) { if (article != null) {
data.put(NAME, article.getName().getValue(selectedLocale)); data.put(NAME, controller.getName(article, selectedLocale));
data.put(TITLE, article.getTitle().getValue(selectedLocale)); data.put(TITLE, controller.getTitle(article, selectedLocale));
if (!CMSConfig.getConfig().isHideLaunchDate()) { if (!CMSConfig.getConfig().isHideLaunchDate()) {
data.put(LAUNCH_DATE, article.getLaunchDate()); data.put(LAUNCH_DATE, article.getLaunchDate());
} }
data.put(SUMMARY, article.getSummary().getValue(selectedLocale)); data.put(SUMMARY, controller.getSummary(article, selectedLocale));
} }
return article; return article;

65
ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleFormController.java
View File

@ -24,6 +24,8 @@ import org.librecms.contentsection.ContentItemRepository;
import org.librecms.contentsection.Folder; import org.librecms.contentsection.Folder;
import org.librecms.contenttypes.MultiPartArticle; import org.librecms.contenttypes.MultiPartArticle;
import java.util.Locale;
import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
@ -46,8 +48,9 @@ public class MultiPartArticleFormController {
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
protected Optional<Folder> getArticleFolder(final MultiPartArticle article) { protected Optional<Folder> getArticleFolder(final MultiPartArticle article) {
final Optional<ContentItem> mpa = itemRepo final Optional<ContentItem> mpa = itemRepo.findById(
.findById(article.getObjectId()); article.getObjectId()
);
if (mpa.isPresent()) { if (mpa.isPresent()) {
return itemManager.getItemFolder(mpa.get()); return itemManager.getItemFolder(mpa.get());
@ -56,4 +59,62 @@ public class MultiPartArticleFormController {
} }
} }
@Transactional(Transactional.TxType.REQUIRED)
public String getName(
final MultiPartArticle fromMpa, final Locale forLocale
) {
Objects.requireNonNull(fromMpa);
Objects.requireNonNull(forLocale);
final MultiPartArticle mpa = itemRepo
.findById(fromMpa.getObjectId(), MultiPartArticle.class)
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No MultiPartArticle with ID %d available",
fromMpa.getObjectId()
)
)
);
return mpa.getName().getValue(forLocale);
}
@Transactional(Transactional.TxType.REQUIRED)
public String getTitle(
final MultiPartArticle fromMpa, final Locale forLocale
) {
Objects.requireNonNull(fromMpa);
Objects.requireNonNull(forLocale);
final MultiPartArticle mpa = itemRepo
.findById(fromMpa.getObjectId(), MultiPartArticle.class)
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No MultiPartArticle with ID %d available",
fromMpa.getObjectId()
)
)
);
return mpa.getTitle().getValue(forLocale);
}
@Transactional(Transactional.TxType.REQUIRED)
public String getSummary(
final MultiPartArticle fromMpa, final Locale forLocale
) {
Objects.requireNonNull(fromMpa);
Objects.requireNonNull(forLocale);
final MultiPartArticle mpa = itemRepo
.findById(fromMpa.getObjectId(), MultiPartArticle.class)
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No MultiPartArticle with ID %d available",
fromMpa.getObjectId()
)
)
);
return mpa.getSummary().getValue(forLocale);
}
} }

74
ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleSectionStepController.java
View File

@ -25,6 +25,8 @@ import org.librecms.contenttypes.MultiPartArticleSectionManager;
import org.librecms.contenttypes.MultiPartArticleSectionRepository; import org.librecms.contenttypes.MultiPartArticleSectionRepository;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
@ -127,15 +129,81 @@ class MultiPartArticleSectionStepController {
protected void moveAfter(final MultiPartArticle article, protected void moveAfter(final MultiPartArticle article,
final MultiPartArticleSection section, final MultiPartArticleSection section,
final MultiPartArticleSection after) { final MultiPartArticleSection after) {
final MultiPartArticle theArticle = itemRepo final MultiPartArticle theArticle = itemRepo
.findById(article.getObjectId(), .findById(article.getObjectId(),
MultiPartArticle.class) MultiPartArticle.class)
.orElseThrow(() -> new IllegalArgumentException(String.format( .orElseThrow(() -> new IllegalArgumentException(String.format(
"No MultiPartArticle with ID %d in the database.", "No MultiPartArticle with ID %d in the database.",
article.getObjectId()))); article.getObjectId())));
sectionManager.moveSectionAfter(theArticle, section, after); sectionManager.moveSectionAfter(theArticle, section, after);
} }
@Transactional(Transactional.TxType.REQUIRED)
public String getSectionTitle(
final MultiPartArticleSection ofSection, final Locale forLocale
) {
Objects.requireNonNull(ofSection);
Objects.requireNonNull(forLocale);
final MultiPartArticleSection section = sectionRepo
.findById(ofSection.getSectionId())
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No section with ID %d available.", ofSection
.getSectionId()
)
)
);
return section.getTitle().getValue(forLocale);
}
@Transactional(Transactional.TxType.REQUIRED)
public String getSectionText(
final MultiPartArticleSection ofSection, final Locale forLocale
) {
Objects.requireNonNull(ofSection);
Objects.requireNonNull(forLocale);
final MultiPartArticleSection section = sectionRepo
.findById(ofSection.getSectionId())
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No section with ID %d available.", ofSection
.getSectionId()
)
)
);
return section.getText().getValue(forLocale);
}
@Transactional(Transactional.TxType.REQUIRED)
public void updateSection(
final MultiPartArticleSection section,
final String title,
final String text,
final boolean pageBreak,
final Locale locale
) {
Objects.requireNonNull(section);
Objects.requireNonNull(locale);
final MultiPartArticleSection update = sectionRepo
.findById(section.getSectionId())
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No section with ID %d available.",
section.getSectionId()
)
)
);
update.getTitle().addValue(locale, title);
update.getText().addValue(locale, title);
update.setPageBreak(pageBreak);
}
} }

11
ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleSectionsStep.java
View File

@ -158,11 +158,16 @@ public class MultiPartArticleSectionsStep extends ResettableContainer {
final Locale selectedLocale = SelectedLanguageUtil final Locale selectedLocale = SelectedLanguageUtil
.selectedLocale(state, selectedLanguageParam); .selectedLocale(state, selectedLanguageParam);
final MultiPartArticleSectionStepController controller = CdiUtil
.createCdiUtil()
.findBean(MultiPartArticleSectionStepController.class);
final Object[] parameterObj = { final Object[] parameterObj = {
controller.getSectionTitle(
moveSectionModel moveSectionModel
.getSelectedSection(state) .getSelectedSection(state),
.getTitle() selectedLocale
.getValue(selectedLocale) )
}; };
target.setLabel(new GlobalizedMessage( target.setLabel(new GlobalizedMessage(

10
ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionDeleteForm.java
View File

@ -35,7 +35,6 @@ import com.arsdigita.globalization.GlobalizedMessage;
import org.librecms.contenttypes.MultiPartArticle; import org.librecms.contenttypes.MultiPartArticle;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.cdi.utils.CdiUtil;
@ -110,9 +109,14 @@ public class SectionDeleteForm extends Form
final Locale selectedLocale = SelectedLanguageUtil final Locale selectedLocale = SelectedLanguageUtil
.selectedLocale(state, selectedLanguageParam); .selectedLocale(state, selectedLanguageParam);
final MultiPartArticleSectionStepController controller = CdiUtil
.createCdiUtil()
.findBean(MultiPartArticleSectionStepController.class);
sectionNameLabel.setLabel( sectionNameLabel.setLabel(
section.getTitle().getValue(selectedLocale), controller.getSectionTitle(section, selectedLocale),
state); state
);
} }
} }

36
ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionEditForm.java
View File

@ -198,12 +198,19 @@ public class SectionEditForm extends Form {
final Locale selectedLocale = SelectedLanguageUtil final Locale selectedLocale = SelectedLanguageUtil
.selectedLocale(state, selectedLanguageParam); .selectedLocale(state, selectedLanguageParam);
final MultiPartArticleSectionStepController controller = CdiUtil
.createCdiUtil()
.findBean(MultiPartArticleSectionStepController.class);
final MultiPartArticleSection section = selectedSectionModel final MultiPartArticleSection section = selectedSectionModel
.getSelectedSection(state); .getSelectedSection(state);
data.put(TITLE, section.getTitle().getValue(selectedLocale)); data.put(
data.put(TEXT, section.getText().getValue(selectedLocale)); TITLE, controller.getSectionTitle(section, selectedLocale)
);
data.put(
TEXT, controller.getSectionText(section, selectedLocale)
);
if (section.isPageBreak()) { if (section.isPageBreak()) {
data.put(PAGE_BREAK, new Object[]{"true"}); data.put(PAGE_BREAK, new Object[]{"true"});
@ -281,9 +288,8 @@ public class SectionEditForm extends Form {
section = selectedSectionModel.getSelectedSection(state); section = selectedSectionModel.getSelectedSection(state);
} }
section.getTitle().addValue(selectedLocale, // section.getTitle().addValue(selectedLocale,
(String) data.get(TITLE)); // (String) data.get(TITLE));
final Object[] pageBreakVal = (Object[]) data.get(PAGE_BREAK); final Object[] pageBreakVal = (Object[]) data.get(PAGE_BREAK);
final boolean pageBreak; final boolean pageBreak;
if (pageBreakVal == null if (pageBreakVal == null
@ -293,7 +299,7 @@ public class SectionEditForm extends Form {
} else { } else {
pageBreak = true; pageBreak = true;
} }
section.setPageBreak(pageBreak); // section.setPageBreak(pageBreak);
final String text; final String text;
if (data.get(TEXT) == null) { if (data.get(TEXT) == null) {
@ -301,12 +307,24 @@ public class SectionEditForm extends Form {
} else { } else {
text = (String) data.get(TEXT); text = (String) data.get(TEXT);
} }
section.getText().addValue(selectedLocale, text); // section.getText().addValue(selectedLocale, text);
sectionRepo.save(section);
// sectionRepo.save(section);
if (selectedSectionModel.getSelectedKey(state) == null) { if (selectedSectionModel.getSelectedKey(state) == null) {
section.getTitle().addValue(selectedLocale,
(String) data.get(TITLE));
section.setPageBreak(pageBreak);
section.getText().addValue(selectedLocale, text);
controller.addSection(article, section); controller.addSection(article, section);
} else {
controller.updateSection(
section,
(String) data.get(TITLE),
text,
pageBreak,
selectedLocale
);
} }
if (sectionsStep != null) { if (sectionsStep != null) {

16
ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionTableModel.java
View File

@ -34,6 +34,7 @@ import org.librecms.contenttypes.MultiPartArticleSection;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale;
class SectionTableModel implements TableModel { class SectionTableModel implements TableModel {
@ -109,13 +110,20 @@ class SectionTableModel implements TableModel {
if (columnModel == null) { if (columnModel == null) {
return null; return null;
} }
final MultiPartArticleSectionStepController controller = CdiUtil
.createCdiUtil()
.findBean(MultiPartArticleSectionStepController.class);
switch (columnIndex) { switch (columnIndex) {
case SectionTable.COL_INDEX_TITLE: case SectionTable.COL_INDEX_TITLE:
return currentSection return controller.getSectionTitle(
.getTitle() currentSection,
.getValue(SelectedLanguageUtil SelectedLanguageUtil.selectedLocale(
.selectedLocale(pageState, selectedLanguageParam)); pageState, selectedLanguageParam
)
)
;
case SectionTable.COL_PAGE_BREAK: case SectionTable.COL_PAGE_BREAK:
if (currentSection.isPageBreak()) { if (currentSection.isPageBreak()) {
return new Label( return new Label(

40
ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/news/NewItemFormController.java
View File

@ -18,8 +18,11 @@
*/ */
package com.arsdigita.cms.ui.authoring.news; package com.arsdigita.cms.ui.authoring.news;
import org.libreccm.l10n.GlobalizationHelper;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.librecms.contentsection.ContentSection; import org.librecms.contentsection.ContentSection;
import org.librecms.contentsection.ContentSectionRepository; import org.librecms.contentsection.ContentSectionRepository;
@ -32,13 +35,18 @@ import javax.inject.Inject;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.TypedQuery; import javax.persistence.TypedQuery;
import javax.transaction.Transactional; import javax.transaction.Transactional;
import org.libreccm.security.PermissionChecker; import org.libreccm.security.PermissionChecker;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.security.RoleRepository; import org.libreccm.security.RoleRepository;
import org.libreccm.security.Shiro; import org.libreccm.security.Shiro;
import org.libreccm.security.User; import org.libreccm.security.User;
import org.librecms.contentsection.ContentItemRepository;
import org.librecms.contentsection.ContentType; import org.librecms.contentsection.ContentType;
import org.librecms.contentsection.ContentTypeRepository; import org.librecms.contentsection.ContentTypeRepository;
import org.librecms.contenttypes.News;
import java.util.Locale;
/** /**
* Controller class for the {@link NewItemForm}. * Controller class for the {@link NewItemForm}.
@ -53,7 +61,7 @@ class NewItemFormController {
@Inject @Inject
private Shiro shiro; private Shiro shiro;
@Inject @Inject
private PermissionChecker permissionChecker; private PermissionChecker permissionChecker;
@ -62,7 +70,7 @@ class NewItemFormController {
@Inject @Inject
private ContentSectionRepository sectionRepo; private ContentSectionRepository sectionRepo;
@Inject @Inject
private ContentTypeRepository typeRepo; private ContentTypeRepository typeRepo;
@ -76,39 +84,41 @@ class NewItemFormController {
} }
final List<Role> roles = user.get().getRoleMemberships().stream() final List<Role> roles = user.get().getRoleMemberships().stream()
.map(membership -> membership.getRole()) .map(membership -> membership.getRole())
.collect(Collectors.toList()); .collect(Collectors.toList());
final TypedQuery<Boolean> query = entityManager.createNamedQuery( final TypedQuery<Boolean> query = entityManager.createNamedQuery(
"ContentSection.hasUsableContentTypes", Boolean.class); "ContentSection.hasUsableContentTypes", Boolean.class);
query.setParameter("section", section); query.setParameter("section", section);
query.setParameter("roles", roles); query.setParameter("roles", roles);
query.setParameter("isSysAdmin", permissionChecker.isPermitted("*")); query.setParameter("isSysAdmin", permissionChecker.isPermitted("*"));
return query.getSingleResult(); return query.getSingleResult();
} }
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
protected List<ContentType> getContentTypes(final ContentSection section) { protected List<ContentType> getContentTypes(final ContentSection section) {
Objects.requireNonNull(section); Objects.requireNonNull(section);
final Optional<User> user = shiro.getUser(); final Optional<User> user = shiro.getUser();
if (!user.isPresent()) { if (!user.isPresent()) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
final List<Role> roles = user.get().getRoleMemberships().stream() final List<Role> roles = user.get().getRoleMemberships().stream()
.map(membership -> membership.getRole()) .map(membership -> membership.getRole())
.collect(Collectors.toList()); .collect(Collectors.toList());
final TypedQuery<ContentType> query = entityManager.createNamedQuery( final TypedQuery<ContentType> query = entityManager.createNamedQuery(
"ContentSection.findUsableContentTypes", "ContentSection.findUsableContentTypes",
ContentType.class); ContentType.class);
query.setParameter("section", section); query.setParameter("section", section);
query.setParameter("roles", roles); query.setParameter("roles", roles);
query.setParameter("isSysAdmin", permissionChecker.isPermitted("*")); query.setParameter("isSysAdmin", permissionChecker.isPermitted("*"));
return query.getResultList(); return query.getResultList();
} }
} }

108
ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/news/NewsController.java 100644
View File

@ -0,0 +1,108 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package com.arsdigita.cms.ui.authoring.news;
import org.librecms.contentsection.ContentItemRepository;
import org.librecms.contenttypes.News;
import java.util.Date;
import java.util.Locale;
import java.util.Objects;
import javax.inject.Inject;
import javax.transaction.Transactional;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
public class NewsController {
@Inject
private ContentItemRepository itemRepo;
@Transactional
protected String getDescription(
final News fromNews, final Locale forLocale
) {
Objects.requireNonNull(fromNews);
final News news = itemRepo
.findById(fromNews.getObjectId(), News.class)
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No News with ID %d available.", fromNews.getObjectId()
)
)
);
return news.getDescription().getValue(forLocale);
}
@Transactional
protected String getText(final News fromNews, final Locale forLocale) {
Objects.requireNonNull(fromNews);
final News news = itemRepo
.findById(fromNews.getObjectId(), News.class)
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No News with ID %d available",
fromNews.getObjectId()
)
)
);
return news.getText().getValue(forLocale);
}
@Transactional
protected void updateText(
final News ofNews,
final Locale forLocale,
final String text
) {
Objects.requireNonNull(ofNews);
final News news = itemRepo
.findById(ofNews.getObjectId(), News.class)
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No News with ID %d available",
ofNews.getObjectId()
)
)
);
news.getText().addValue(forLocale, text);
itemRepo.save(news);
}
@Transactional
protected void update(
final News news,
final Date releaseDate,
final Locale locale,
final String description
) {
Objects.requireNonNull(news);
final News update = itemRepo
.findById(news.getObjectId(), News.class)
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No News with ID %d available",
news.getObjectId()
)
)
);
update.setReleaseDate(releaseDate);
update.getDescription().addValue(locale, description);
itemRepo.save(update);
}
}

27
ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/news/NewsPropertyForm.java
View File

@ -36,7 +36,6 @@ import org.librecms.contenttypes.News;
import com.arsdigita.cms.ui.authoring.BasicPageForm; import com.arsdigita.cms.ui.authoring.BasicPageForm;
import com.arsdigita.cms.ui.authoring.SelectedLanguageUtil; import com.arsdigita.cms.ui.authoring.SelectedLanguageUtil;
import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.kernel.KernelConfig;
import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.cdi.utils.CdiUtil;
import org.libreccm.configuration.ConfigurationManager; import org.libreccm.configuration.ConfigurationManager;
@ -45,6 +44,7 @@ import org.librecms.contentsection.ContentItemRepository;
import org.librecms.contenttypes.NewsConfig; import org.librecms.contenttypes.NewsConfig;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.Locale; import java.util.Locale;
import java.util.Objects; import java.util.Objects;
@ -181,7 +181,10 @@ public class NewsPropertyForm extends BasicPageForm
releaseDateSelector.addYear(releaseDate); releaseDateSelector.addYear(releaseDate);
data.put(NEWS_DATE, releaseDate); data.put(NEWS_DATE, releaseDate);
data.put(LEAD, item.getDescription().getValue(selectedLocale)); final NewsController controller = CdiUtil
.createCdiUtil()
.findBean(NewsController.class);
data.put(LEAD, controller.getDescription(item, selectedLocale));
} }
/** /**
@ -218,21 +221,15 @@ public class NewsPropertyForm extends BasicPageForm
.getSaveButton() .getSaveButton()
.isSelected(event.getPageState())) { .isSelected(event.getPageState())) {
final NewsController controller = CdiUtil
.createCdiUtil()
.findBean(NewsController.class);
final Date releaseDate = (java.util.Date) data.get(NEWS_DATE);
final String description = (String) data.get(LEAD);
final Locale selectedLocale = SelectedLanguageUtil final Locale selectedLocale = SelectedLanguageUtil
.selectedLocale(state, selectedLanguageParam); .selectedLocale(state, selectedLanguageParam);
controller.update(item, releaseDate, selectedLocale, description);
item.setReleaseDate((java.util.Date) data.get(NEWS_DATE));
item
.getDescription()
.addValue(
selectedLocale,
(String) data.get(LEAD));
final ContentItemRepository itemRepo = CdiUtil
.createCdiUtil()
.findBean(ContentItemRepository.class);
itemRepo.save(item);
} }
if (propertiesStep != null) { if (propertiesStep != null) {
propertiesStep.maybeForwardToNextStep(event.getPageState()); propertiesStep.maybeForwardToNextStep(event.getPageState());

18
ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/news/NewsTextBody.java
View File

@ -83,10 +83,13 @@ public class NewsTextBody extends TextBody {
final News news = getSelectedNews(state); final News news = getSelectedNews(state);
return news final NewsController controller = CdiUtil
.getText() .createCdiUtil()
.getValue(SelectedLanguageUtil .findBean(NewsController.class);
.selectedLocale(state, selectedLanguageParam)); return controller.getText(
news,
SelectedLanguageUtil.selectedLocale(state, selectedLanguageParam)
);
} }
@Override @Override
@ -97,11 +100,10 @@ public class NewsTextBody extends TextBody {
final Locale selectedLocale = SelectedLanguageUtil final Locale selectedLocale = SelectedLanguageUtil
.selectedLocale(state, selectedLanguageParam); .selectedLocale(state, selectedLanguageParam);
news.getText().addValue(selectedLocale, text); final NewsController controller = CdiUtil
final ContentItemRepository itemRepo = CdiUtil
.createCdiUtil() .createCdiUtil()
.findBean(ContentItemRepository.class); .findBean(NewsController.class);
itemRepo.save(news); controller.updateText(news, selectedLocale, text);
} }
} }

8
ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderEditForm.java
View File

@ -35,12 +35,12 @@ class FolderEditForm extends FolderBaseForm {
private static Logger LOGGER = LogManager.getLogger(FolderEditForm.class); private static Logger LOGGER = LogManager.getLogger(FolderEditForm.class);
private final FolderRequestLocal m_folder; private final FolderRequestLocal folderRequestLocal;
public FolderEditForm(final FolderRequestLocal folder) { public FolderEditForm(final FolderRequestLocal folder) {
super("folder-edit"); super("folder-edit");
m_folder = folder; folderRequestLocal = folder;
// XXX need to do name uniqueness valdation on m_fragment here // XXX need to do name uniqueness valdation on m_fragment here
// as well. // as well.
@ -68,7 +68,7 @@ class FolderEditForm extends FolderBaseForm {
public final void init(final FormSectionEvent e) { public final void init(final FormSectionEvent e) {
final PageState state = e.getPageState(); final PageState state = e.getPageState();
final Category folder = m_folder.getFolder(state); final Category folder = folderRequestLocal.getFolder(state);
m_title.setValue(state, folder.getDisplayName()); m_title.setValue(state, folder.getDisplayName());
m_fragment.setValue(state, folder.getName()); m_fragment.setValue(state, folder.getName());
@ -80,7 +80,7 @@ class FolderEditForm extends FolderBaseForm {
throws FormProcessException { throws FormProcessException {
final PageState state = e.getPageState(); final PageState state = e.getPageState();
final Category folder = m_folder.getFolder(state); final Category folder = folderRequestLocal.getFolder(state);
folder.setDisplayName((String) m_title.getValue(state)); folder.setDisplayName((String) m_title.getValue(state));
folder.setName((String) m_fragment.getValue(state)); folder.setName((String) m_fragment.getValue(state));

10
ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderEditorForm.java
View File

@ -63,12 +63,10 @@ public class FolderEditorForm extends FolderForm {
final Folder folder = getCurrentFolder(state); final Folder folder = getCurrentFolder(state);
data.put(NAME, folder.getName()); data.put(NAME, folder.getName());
final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
final ConfigurationManager confManager = cdiUtil.findBean( final FolderEditorFormController controller = cdiUtil.findBean(
ConfigurationManager.class); FolderEditorFormController.class
final KernelConfig kernelConfig = confManager.findConfiguration( );
KernelConfig.class); data.put(TITLE, controller.getFolderTitle(folder));
data.put(TITLE,
folder.getTitle().getValue(kernelConfig.getDefaultLocale()));
} }
/** /**

50
ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderEditorFormController.java 100644
View File

@ -0,0 +1,50 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package com.arsdigita.cms.ui.folder;
import com.arsdigita.kernel.KernelConfig;
import org.libreccm.configuration.ConfigurationManager;
import org.librecms.contentsection.Folder;
import org.librecms.contentsection.FolderRepository;
import java.util.Objects;
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
import javax.transaction.Transactional;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
@RequestScoped
public class FolderEditorFormController {
@Inject
private ConfigurationManager confManager;
@Inject
private FolderRepository folderRepository;
@Transactional(Transactional.TxType.REQUIRED)
public String getFolderTitle(final Folder ofFolder) {
final Folder folder = folderRepository
.findById(Objects.requireNonNull(ofFolder).getObjectId())
.orElseThrow(
() -> new IllegalArgumentException(
String.format("No folder with ID %d available.",
ofFolder.getObjectId())
)
);
final KernelConfig kernelConfig = confManager.findConfiguration(
KernelConfig.class
);
return folder.getTitle().getValue(kernelConfig.getDefaultLocale());
}
}

2
ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleAdminPane.java
View File

@ -47,7 +47,7 @@ import org.librecms.lifecycle.LifecycleDefinitionRepository;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class LifecycleAdminPane extends BaseAdminPane { public class LifecycleAdminPane extends BaseAdminPane {
private final SingleSelectionModel selectionModel; private final SingleSelectionModel selectionModel;
private final LifecycleDefinitionRequestLocal selectionLifecycleDefinition; private final LifecycleDefinitionRequestLocal selectionLifecycleDefinition;

113
ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleAdminPaneController.java
View File

@ -18,9 +18,12 @@
*/ */
package com.arsdigita.cms.ui.lifecycle; package com.arsdigita.cms.ui.lifecycle;
import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.kernel.KernelConfig; import com.arsdigita.kernel.KernelConfig;
import com.arsdigita.toolbox.ui.Property;
import org.libreccm.configuration.ConfigurationManager; import org.libreccm.configuration.ConfigurationManager;
import org.librecms.CmsConstants;
import org.librecms.contentsection.ContentSection; import org.librecms.contentsection.ContentSection;
import org.librecms.contentsection.ContentSectionManager; import org.librecms.contentsection.ContentSectionManager;
import org.librecms.contentsection.ContentSectionRepository; import org.librecms.contentsection.ContentSectionRepository;
@ -30,9 +33,12 @@ import org.librecms.lifecycle.PhaseDefinition;
import org.librecms.lifecycle.PhaseDefinititionRepository; import org.librecms.lifecycle.PhaseDefinititionRepository;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.inject.Inject; import javax.inject.Inject;
@ -72,7 +78,73 @@ class LifecycleAdminPaneController {
section.getObjectId()))); section.getObjectId())));
return new ArrayList<>(contentSection.getLifecycleDefinitions()); return new ArrayList<>(contentSection.getLifecycleDefinitions());
}
@Transactional
public List<Map<String, String>> listLifecyclesForContentSection(
final ContentSection section
) {
return getLifecyclesForContentSection(section)
.stream()
.map(this::buildLifecycleListItem)
.collect(Collectors.toList());
}
private Map<String, String> buildLifecycleListItem(
final LifecycleDefinition lifecycleDefinition) {
final Map<String, String> item = new HashMap<>();
item.put(
LifecycleListModelBuilder.LIFECYCLE_DEF_ID,
Long.toString(lifecycleDefinition.getDefinitionId())
);
item.put(
LifecycleListModelBuilder.LIFECYCLE_DEF_LABEL,
lifecycleDefinition
.getLabel()
.getValue(KernelConfig.getConfig().getDefaultLocale())
);
return item;
}
@Transactional(Transactional.TxType.REQUIRED)
public List<Property> getLifecycleProperties(
final LifecycleDefinition ofLifecycleDefinition
) {
final LifecycleDefinition definition = lifecycleDefRepo
.findById(ofLifecycleDefinition.getDefinitionId())
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No LifecycleDefinition with ID %d found.",
ofLifecycleDefinition.getDefinitionId()
)
)
);
final KernelConfig kernelConfig = confManager
.findConfiguration(KernelConfig.class);
final Locale defaultLocale = kernelConfig.getDefaultLocale();
final List<Property> properties = new ArrayList<>();
properties.add(
new Property(
new GlobalizedMessage(
"cms.ui.lifecycle.name",
CmsConstants.CMS_BUNDLE
),
definition.getLabel().getValue(defaultLocale)
)
);
properties.add(
new Property(
new GlobalizedMessage(
"cms.ui.lifecycle.description",
CmsConstants.CMS_BUNDLE
),
definition.getDescription().getValue(defaultLocale)
)
);
return properties;
} }
/** /**
@ -178,7 +250,7 @@ class LifecycleAdminPaneController {
.orElseThrow(() -> new IllegalArgumentException(String.format( .orElseThrow(() -> new IllegalArgumentException(String.format(
"No ContentSection with ID %d in the database. " "No ContentSection with ID %d in the database. "
+ "Where did that ID come from?", + "Where did that ID come from?",
section.getObjectId()))); section.getObjectId())));
sectionManager.removeLifecycleDefinitionFromContentSection( sectionManager.removeLifecycleDefinitionFromContentSection(
lifecycleDefinition, lifecycleDefinition,
@ -290,7 +362,46 @@ class LifecycleAdminPaneController {
phaseDefinition.setDefaultDuration(duration); phaseDefinition.setDefaultDuration(duration);
phaseDefRepo.save(phaseDefinition); phaseDefRepo.save(phaseDefinition);
}
@Transactional(Transactional.TxType.REQUIRED)
public String getLifecycleDefinitionName(
final LifecycleDefinition ofCycle
) {
final LifecycleDefinition cycle = lifecycleDefRepo.findById(
Objects.requireNonNull(ofCycle).getDefinitionId()
).orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No LifecycleDefinition with ID %d available",
ofCycle.getDefinitionId()
)
)
);
final KernelConfig kernelConfig = confManager.findConfiguration(
KernelConfig.class
);
return cycle.getLabel().getValue(kernelConfig.getDefaultLocale());
}
@Transactional(Transactional.TxType.REQUIRED)
public String getLifecycleDefinitionDescription(
final LifecycleDefinition ofCycle
) {
final LifecycleDefinition cycle = lifecycleDefRepo.findById(
Objects.requireNonNull(ofCycle).getDefinitionId()
).orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No LifecycleDefinition with ID %d available",
ofCycle.getDefinitionId()
)
)
);
final KernelConfig kernelConfig = confManager.findConfiguration(
KernelConfig.class
);
return cycle.getDescription().getValue(kernelConfig.getDefaultLocale());
} }
} }

13
ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleEditForm.java
View File

@ -59,8 +59,17 @@ class LifecycleEditForm extends BaseLifecycleForm {
final LifecycleDefinition cycle = selectedDefinition final LifecycleDefinition cycle = selectedDefinition
.getLifecycleDefinition(state); .getLifecycleDefinition(state);
getLifecycleName().setValue(state, cycle.getLabel()); final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
getLifecycleDescription().setValue(state, cycle.getDescription()); final LifecycleAdminPaneController controller = cdiUtil.findBean(
LifecycleAdminPaneController.class
);
getLifecycleName().setValue(
state, controller.getLifecycleDefinitionName(cycle)
);
getLifecycleDescription().setValue(
state, controller.getLifecycleDefinitionDescription(cycle)
);
} }
} }

28
ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleItemPane.java
View File

@ -61,9 +61,11 @@ import java.util.Locale;
class LifecycleItemPane extends BaseItemPane { class LifecycleItemPane extends BaseItemPane {
private final LifecycleDefinitionRequestLocal selectedLifecycle; private final LifecycleDefinitionRequestLocal selectedLifecycle;
private final PhaseRequestLocal selectedPhase; private final PhaseRequestLocal selectedPhase;
private final Container detailPane; private final Container detailPane;
private final Table phasesTable; private final Table phasesTable;
public LifecycleItemPane( public LifecycleItemPane(
@ -144,23 +146,27 @@ class LifecycleItemPane extends BaseItemPane {
final PageState state) { final PageState state) {
final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
final ConfigurationManager confManager = cdiUtil.findBean( // final ConfigurationManager confManager = cdiUtil.findBean(
ConfigurationManager.class); // ConfigurationManager.class);
final KernelConfig kernelConfig = confManager.findConfiguration( // final KernelConfig kernelConfig = confManager.findConfiguration(
KernelConfig.class); // KernelConfig.class);
final Locale defaultLocale = kernelConfig.getDefaultLocale(); // final Locale defaultLocale = kernelConfig.getDefaultLocale();
final LifecycleAdminPaneController controller = cdiUtil
.findBean(LifecycleAdminPaneController.class);
final java.util.List<Property> props = super.properties(state); final java.util.List<Property> props = super.properties(state);
final LifecycleDefinition cycle = selectedLifecycle final LifecycleDefinition cycle = selectedLifecycle
.getLifecycleDefinition(state); .getLifecycleDefinition(state);
props.add(new Property( props.addAll(controller.getLifecycleProperties(cycle));
gz("cms.ui.lifecycle.name"),
cycle.getLabel().getValue(defaultLocale)));
props.add(new Property(
gz("cms.ui.lifecycle.description"),
cycle.getDescription().getValue(defaultLocale)));
// props.add(new Property(
// gz("cms.ui.lifecycle.name"),
// cycle.getLabel().getValue(defaultLocale)));
// props.add(new Property(
// gz("cms.ui.lifecycle.description"),
// cycle.getDescription().getValue(defaultLocale)));
return props; return props;
} }

23
ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleListModelBuilder.java
View File

@ -38,6 +38,7 @@ import org.librecms.lifecycle.LifecycleDefinition;
import java.util.Iterator; import java.util.Iterator;
import java.util.Locale; import java.util.Locale;
import java.util.Map;
/** /**
* Loads all the current lifecycles from the database so that they may be * Loads all the current lifecycles from the database so that they may be
@ -50,6 +51,10 @@ import java.util.Locale;
public final class LifecycleListModelBuilder extends LockableImpl public final class LifecycleListModelBuilder extends LockableImpl
implements ListModelBuilder { implements ListModelBuilder {
protected static final String LIFECYCLE_DEF_ID = "lifecycleDefId";
protected static final String LIFECYCLE_DEF_LABEL = "lifecycleDefLabel";
@Override @Override
public final ListModel makeModel(final com.arsdigita.bebop.List list, public final ListModel makeModel(final com.arsdigita.bebop.List list,
final PageState state) { final PageState state) {
@ -57,20 +62,20 @@ public final class LifecycleListModelBuilder extends LockableImpl
final LifecycleAdminPaneController controller = cdiUtil final LifecycleAdminPaneController controller = cdiUtil
.findBean(LifecycleAdminPaneController.class); .findBean(LifecycleAdminPaneController.class);
final ContentSection section = CMS.getContext().getContentSection(); final ContentSection section = CMS.getContext().getContentSection();
return new Model(controller.getLifecyclesForContentSection(section)); return new Model(controller.listLifecyclesForContentSection(section));
} }
private class Model implements ListModel { private class Model implements ListModel {
private final Iterator<LifecycleDefinition> iterator; private final Iterator<Map<String, String>> iterator;
private LifecycleDefinition currentLifecycleDef;
private final Locale defaultLocale;
public Model(final List<LifecycleDefinition> lifecycles) { private Map<String, String> currentLifecycleDef;
public Model(final List<Map<String, String>> lifecycles) {
iterator = lifecycles.iterator(); iterator = lifecycles.iterator();
defaultLocale = KernelConfig.getConfig().getDefaultLocale();
} }
@Override
@Override
public boolean next() throws NoSuchElementException { public boolean next() throws NoSuchElementException {
if (iterator.hasNext()) { if (iterator.hasNext()) {
currentLifecycleDef = iterator.next(); currentLifecycleDef = iterator.next();
@ -82,12 +87,12 @@ public final class LifecycleListModelBuilder extends LockableImpl
@Override @Override
public Object getElement() { public Object getElement() {
return currentLifecycleDef.getLabel().getValue(defaultLocale); return currentLifecycleDef.get(LIFECYCLE_DEF_LABEL);
} }
@Override @Override
public String getKey() { public String getKey() {
return Long.toString(currentLifecycleDef.getDefinitionId()); return currentLifecycleDef.get(LIFECYCLE_DEF_ID);
} }
} }

54
ccm-cms/src/main/java/com/arsdigita/cms/ui/pages/PageModelAdminPageController.java 100644
View File

@ -0,0 +1,54 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package com.arsdigita.cms.ui.pages;
import org.libreccm.l10n.GlobalizationHelper;
import org.libreccm.pagemodel.PageModel;
import org.libreccm.pagemodel.PageModelRepository;
import org.librecms.pages.Pages;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
import javax.transaction.Transactional;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
@RequestScoped
class PageModelAdminPageController {
@Inject
private GlobalizationHelper globalizationHelper;
@Inject
private PageModelRepository pageModelRepository;
@Transactional(Transactional.TxType.REQUIRED)
protected List<PageModelData> findDraftPageModelsByApplication(
final Pages pages
) {
final List<PageModel> pageModels = pageModelRepository
.findDraftByApplication(pages);
return pageModels.stream().map(this::buildPageModelData).collect(
Collectors.toList()
);
}
private PageModelData buildPageModelData(final PageModel fromPageModel) {
final PageModelData result = new PageModelData();
result.setPageModelId(fromPageModel.getPageModelId());
result.setTitle(globalizationHelper.getValueFromLocalizedString(
fromPageModel.getTitle()));
return result;
}
}

34
ccm-cms/src/main/java/com/arsdigita/cms/ui/pages/PageModelData.java 100644
View File

@ -0,0 +1,34 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package com.arsdigita.cms.ui.pages;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
class PageModelData {
private long pageModelId;
private String title;
public long getPageModelId() {
return pageModelId;
}
public void setPageModelId(long pageModelId) {
this.pageModelId = pageModelId;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
}

58
ccm-cms/src/main/java/com/arsdigita/cms/ui/pages/PagesAdminPage.java
View File

@ -50,7 +50,6 @@ import org.libreccm.categorization.Category;
import org.libreccm.categorization.CategoryRepository; import org.libreccm.categorization.CategoryRepository;
import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.cdi.utils.CdiUtil;
import org.libreccm.core.UnexpectedErrorException; import org.libreccm.core.UnexpectedErrorException;
import org.libreccm.l10n.GlobalizationHelper;
import org.libreccm.pagemodel.PageModel; import org.libreccm.pagemodel.PageModel;
import org.libreccm.pagemodel.PageModelRepository; import org.libreccm.pagemodel.PageModelRepository;
import org.librecms.CmsConstants; import org.librecms.CmsConstants;
@ -62,6 +61,7 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.TooManyListenersException; import java.util.TooManyListenersException;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
@ -69,19 +69,27 @@ import java.util.TooManyListenersException;
public class PagesAdminPage extends CMSApplicationPage { public class PagesAdminPage extends CMSApplicationPage {
private static final String INDEX_PAGE_MODEL_SELECT = "indexPageModelSelect"; private static final String INDEX_PAGE_MODEL_SELECT = "indexPageModelSelect";
private static final String ITEM_PAGE_MODEL_SELECT = "itemPageModelSelect"; private static final String ITEM_PAGE_MODEL_SELECT = "itemPageModelSelect";
private static final String INHERIT_PAGEMODEL = "--inherit--"; private static final String INHERIT_PAGEMODEL = "--inherit--";
private final ParameterSingleSelectionModel<String> selectedCategory; private final ParameterSingleSelectionModel<String> selectedCategory;
private final Tree categoryTree; private final Tree categoryTree;
private final Label nothingSelectedLabel; private final Label nothingSelectedLabel;
private final Form pageModelForm; private final Form pageModelForm;
private final SingleSelect indexPageModelSelect; private final SingleSelect indexPageModelSelect;
private final SingleSelect itemPageModelSelect; private final SingleSelect itemPageModelSelect;
private final SaveCancelSection saveCancelSection; private final SaveCancelSection saveCancelSection;
private Pages pagesInstance; private Pages pagesInstance;
private PagesContextBar pagesContextBar; private PagesContextBar pagesContextBar;
public PagesAdminPage() { public PagesAdminPage() {
@ -163,7 +171,7 @@ public class PagesAdminPage extends CMSApplicationPage {
pagesContextBar = new PagesContextBar(); pagesContextBar = new PagesContextBar();
super.add(pagesContextBar); super.add(pagesContextBar);
final TabbedPane tabbedPane = new TabbedPane(); final TabbedPane tabbedPane = new TabbedPane();
tabbedPane.addTab(new Label(new GlobalizedMessage( tabbedPane.addTab(new Label(new GlobalizedMessage(
"cms.ui.pages.tab.pages", CmsConstants.CMS_BUNDLE)), "cms.ui.pages.tab.pages", CmsConstants.CMS_BUNDLE)),
@ -261,22 +269,38 @@ public class PagesAdminPage extends CMSApplicationPage {
"cms.ui.pages.assigned_page_model.inherit", "cms.ui.pages.assigned_page_model.inherit",
CmsConstants.CMS_BUNDLE)))); CmsConstants.CMS_BUNDLE))));
final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); // final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
final PageModelRepository pageModelRepo = cdiUtil // final PageModelRepository pageModelRepo = cdiUtil.findBean(
.findBean(PageModelRepository.class); // PageModelRepository.class
final List<PageModel> pageModels = pageModelRepo // );
.findDraftByApplication(pagesInstance); // final List<PageModel> pageModels = pageModelRepo
final GlobalizationHelper globalizationHelper = cdiUtil // .findDraftByApplication(pagesInstance);
.findBean(GlobalizationHelper.class); // final GlobalizationHelper globalizationHelper = cdiUtil
// .findBean(GlobalizationHelper.class);
for (final PageModel pageModel : pageModels) { // for (final PageModel pageModel : pageModels) {
target.addOption(new Option( // target.addOption(
Long.toString(pageModel.getPageModelId()), // new Option(
new Text(globalizationHelper.getValueFromLocalizedString( // Long.toString(pageModel.getPageModelId()),
pageModel // new Text(
.getTitle())))); // globalizationHelper.getValueFromLocalizedString(
// pageModel.getTitle()
// )
// )
// )
// );
// }
final PageModelAdminPageController controller = CdiUtil.createCdiUtil()
.findBean(PageModelAdminPageController.class);
final List<PageModelData> pageModels = controller
.findDraftPageModelsByApplication(pagesInstance);
for (final PageModelData pageModel : pageModels) {
target.addOption(
new Option(
Long.toString(pageModel.getPageModelId()),
new Text(pageModel.getTitle())
)
);
} }
} }
private void categoryTreeStateChanged(final ChangeEvent event) { private void categoryTreeStateChanged(final ChangeEvent event) {

59
ccm-cms/src/main/java/com/arsdigita/cms/ui/role/BaseRoleItemPane.java
View File

@ -35,16 +35,12 @@ import com.arsdigita.cms.ui.BaseItemPane;
import com.arsdigita.cms.ui.PartySearchForm; import com.arsdigita.cms.ui.PartySearchForm;
import com.arsdigita.cms.ui.VisibilityComponent; import com.arsdigita.cms.ui.VisibilityComponent;
import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.kernel.KernelConfig;
import com.arsdigita.toolbox.ui.ActionGroup; import com.arsdigita.toolbox.ui.ActionGroup;
import com.arsdigita.toolbox.ui.Property; import com.arsdigita.toolbox.ui.Property;
import com.arsdigita.toolbox.ui.PropertyList; import com.arsdigita.toolbox.ui.PropertyList;
import com.arsdigita.toolbox.ui.Section; import com.arsdigita.toolbox.ui.Section;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.cdi.utils.CdiUtil;
import org.libreccm.configuration.ConfigurationManager;
import org.libreccm.security.Party; import org.libreccm.security.Party;
import org.libreccm.security.PartyRepository; import org.libreccm.security.PartyRepository;
import org.libreccm.security.PermissionChecker; import org.libreccm.security.PermissionChecker;
@ -129,40 +125,53 @@ class BaseRoleItemPane extends BaseItemPane {
@Override @Override
protected final java.util.List<Property> properties( protected final java.util.List<Property> properties(
final PageState state) { final PageState state
) {
final java.util.List<Property> properties = super.properties( final java.util.List<Property> properties = super.properties(
state); state
);
final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
final ConfigurationManager manager = cdiUtil.findBean( final RoleAdminPaneController controller = cdiUtil
ConfigurationManager.class); .findBean(RoleAdminPaneController.class);
final KernelConfig config = manager.findConfiguration(
KernelConfig.class);
final Role role = roleRequestLocal.getRole(state); final Role role = roleRequestLocal.getRole(state);
properties.add(new Property(lz("cms.ui.role.name"), properties.add(
role.getName())); new Property(lz("cms.ui.role.name"), role.getName())
// Right now just loads the default locale description. );
properties.add(new Property(
lz("cms.ui.role.description"),
role.getDescription().getValue(config.getDefaultLocale())));
// Since Permissions don't seem to have a "pretty" form, the granted privilege is used. // Right now just loads the default locale description.
final RoleAdminPaneController controller = cdiUtil.findBean( properties.add(
RoleAdminPaneController.class); new Property(
lz("cms.ui.role.description"),
controller.getRoleDescription(role)
)
);
// Since Permissions don't seem to have a "pretty" form, the
// granted privilege is used.
final String permissions = controller final String permissions = controller
.generateGrantedPermissionsString( .generateGrantedPermissionsString(
role, role,
CMS.getContext().getContentSection()); CMS.getContext().getContentSection()
);
if (permissions.length() > 0) { if (permissions.length() > 0) {
properties.add(new Property(lz("cms.ui.role.privileges"), properties.add(
permissions)); new Property(
lz("cms.ui.role.privileges"),
permissions
)
);
} else { } else {
properties.add(new Property(lz("cms.ui.role.privileges"), properties.add(
lz("cms.ui.role.privilege.none"))); new Property(
lz("cms.ui.role.privileges"),
lz("cms.ui.role.privilege.none")
)
);
} }
return properties; return properties;
@ -192,7 +201,9 @@ class BaseRoleItemPane extends BaseItemPane {
private class MemberTable extends Table { private class MemberTable extends Table {
private static final int COL_NAME = 0; private static final int COL_NAME = 0;
private static final int COL_EMAIL = 1; private static final int COL_EMAIL = 1;
private static final int COL_REMOVE = 2; private static final int COL_REMOVE = 2;
MemberTable() { MemberTable() {

42
ccm-cms/src/main/java/com/arsdigita/cms/ui/role/RoleAdminPaneController.java
View File

@ -66,7 +66,7 @@ class RoleAdminPaneController {
@Inject @Inject
private RoleManager roleManager; private RoleManager roleManager;
@Inject @Inject
private RoleRepository roleRepo; private RoleRepository roleRepo;
@ -88,6 +88,22 @@ class RoleAdminPaneController {
return new ArrayList<>(contentSection.getRoles()); return new ArrayList<>(contentSection.getRoles());
} }
@Transactional
public String getRoleDescription(final Role ofRole) {
final Role role = roleRepo
.findById(ofRole.getRoleId())
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No role with ID %d found.", ofRole.getRoleId()
)
)
);
final KernelConfig config = confManager
.findConfiguration(KernelConfig.class);
return role.getDescription().getValue(config.getDefaultLocale());
}
public String[] getGrantedPrivileges(final Role role, public String[] getGrantedPrivileges(final Role role,
final ContentSection section) { final ContentSection section) {
final List<Permission> sectionPermissions = permissionManager final List<Permission> sectionPermissions = permissionManager
@ -217,10 +233,10 @@ class RoleAdminPaneController {
KernelConfig.class); KernelConfig.class);
final Locale defaultLocale = kernelConfig.getDefaultLocale(); final Locale defaultLocale = kernelConfig.getDefaultLocale();
role.setName(roleName); roleToSave.setName(roleName);
role.getDescription().addValue(defaultLocale, roleDescription); roleToSave.getDescription().addValue(defaultLocale, roleDescription);
roleRepo.save(role); roleRepo.save(roleToSave);
final ContentSection contentSection = sectionRepo.findById( final ContentSection contentSection = sectionRepo.findById(
CMS.getContext().getContentSection().getObjectId()) CMS.getContext().getContentSection().getObjectId())
@ -241,28 +257,28 @@ class RoleAdminPaneController {
final Folder rootAssetsFolder = contentSection.getRootAssetsFolder(); final Folder rootAssetsFolder = contentSection.getRootAssetsFolder();
final List<Permission> currentPermissionsSection = permissionManager final List<Permission> currentPermissionsSection = permissionManager
.findPermissionsForRoleAndObject(role, contentSection); .findPermissionsForRoleAndObject(roleToSave, contentSection);
final List<Permission> currentPermissionsDocuments = permissionManager final List<Permission> currentPermissionsDocuments = permissionManager
.findPermissionsForRoleAndObject(role, rootDocumentsFolder); .findPermissionsForRoleAndObject(roleToSave, rootDocumentsFolder);
final List<Permission> currentPermissionsAssets = permissionManager final List<Permission> currentPermissionsAssets = permissionManager
.findPermissionsForRoleAndObject(role, rootAssetsFolder); .findPermissionsForRoleAndObject(roleToSave, rootAssetsFolder);
//Revoke permissions not in selectedPermissions //Revoke permissions not in selectedPermissions
revokeNotSelectedPrivileges(selectedPermissions, revokeNotSelectedPrivileges(selectedPermissions,
role, roleToSave,
currentPermissionsSection); currentPermissionsSection);
revokeNotSelectedPrivileges(selectedPermissions, revokeNotSelectedPrivileges(selectedPermissions,
role, roleToSave,
currentPermissionsDocuments); currentPermissionsDocuments);
revokeNotSelectedPrivileges(selectedPermissions, revokeNotSelectedPrivileges(selectedPermissions,
role, roleToSave,
currentPermissionsAssets); currentPermissionsAssets);
// Grant selected privileges // Grant selected privileges
for (final String privilege : adminPrivileges) { for (final String privilege : adminPrivileges) {
if (isPrivilegeSelected(selectedPermissions, privilege)) { if (isPrivilegeSelected(selectedPermissions, privilege)) {
permissionManager.grantPrivilege(privilege, permissionManager.grantPrivilege(privilege,
role, roleToSave,
contentSection); contentSection);
} }
} }
@ -270,7 +286,7 @@ class RoleAdminPaneController {
for (final String privilege : itemPrivileges) { for (final String privilege : itemPrivileges) {
if (isPrivilegeSelected(selectedPermissions, privilege)) { if (isPrivilegeSelected(selectedPermissions, privilege)) {
permissionManager.grantPrivilege(privilege, permissionManager.grantPrivilege(privilege,
role, roleToSave,
rootDocumentsFolder); rootDocumentsFolder);
} }
} }
@ -278,7 +294,7 @@ class RoleAdminPaneController {
for (final String privilege : assetPrivileges) { for (final String privilege : assetPrivileges) {
if (isPrivilegeSelected(selectedPermissions, privilege)) { if (isPrivilegeSelected(selectedPermissions, privilege)) {
permissionManager.grantPrivilege(privilege, permissionManager.grantPrivilege(privilege,
role, roleToSave,
rootAssetsFolder); rootAssetsFolder);
} }
} }

22
ccm-cms/src/main/java/com/arsdigita/cms/ui/role/RoleEditForm.java
View File

@ -24,20 +24,10 @@ import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.cms.CMS; import com.arsdigita.cms.CMS;
import com.arsdigita.kernel.KernelConfig;
import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.cdi.utils.CdiUtil;
import org.libreccm.configuration.ConfigurationManager;
import org.libreccm.l10n.LocalizedString;
import org.libreccm.security.Permission;
import org.libreccm.security.PermissionManager; import org.libreccm.security.PermissionManager;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.security.RoleRepository;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
/** /**
* Represents a {@link com.arsdigita.bebop.Form Form} to edit * Represents a {@link com.arsdigita.bebop.Form Form} to edit
@ -76,17 +66,15 @@ final class RoleEditForm extends BaseRoleForm {
final PageState state = event.getPageState(); final PageState state = event.getPageState();
final Role role = roleRequestLocal.getRole(state); final Role role = roleRequestLocal.getRole(state);
final KernelConfig kernelConfig = KernelConfig.getConfig(); final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
final Locale defaultLocale = kernelConfig.getDefaultLocale(); final RoleAdminPaneController controller = cdiUtil.findBean(
RoleAdminPaneController.class);
getRoleName().setValue(state, role.getName()); getRoleName().setValue(state, role.getName());
getRoleDescription().setValue( getRoleDescription().setValue(
state, state,
role.getDescription().getValue(defaultLocale)); controller.getRoleDescription(role)
);
final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
final RoleAdminPaneController controller = cdiUtil.findBean(
RoleAdminPaneController.class);
final String[] permissions = controller.getGrantedPrivileges( final String[] permissions = controller.getGrantedPrivileges(
role, CMS.getContext().getContentSection()); role, CMS.getContext().getContentSection());

67
ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeAdminPaneController.java
View File

@ -20,8 +20,10 @@ package com.arsdigita.cms.ui.type;
import org.libreccm.workflow.Workflow; import org.libreccm.workflow.Workflow;
import org.librecms.contentsection.ContentSection; import org.librecms.contentsection.ContentSection;
import org.librecms.contentsection.ContentSectionManager;
import org.librecms.contentsection.ContentSectionRepository; import org.librecms.contentsection.ContentSectionRepository;
import org.librecms.contentsection.ContentType; import org.librecms.contentsection.ContentType;
import org.librecms.contentsection.ContentTypeManager;
import org.librecms.contentsection.ContentTypeRepository; import org.librecms.contentsection.ContentTypeRepository;
import org.librecms.contenttypes.ContentTypeInfo; import org.librecms.contenttypes.ContentTypeInfo;
import org.librecms.contenttypes.ContentTypesManager; import org.librecms.contenttypes.ContentTypesManager;
@ -39,11 +41,6 @@ import java.util.stream.Collectors;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.inject.Inject; import javax.inject.Inject;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Root;
import javax.transaction.Transactional; import javax.transaction.Transactional;
/** /**
@ -63,9 +60,15 @@ class ContentTypeAdminPaneController {
@Inject @Inject
private ContentSectionRepository sectionRepo; private ContentSectionRepository sectionRepo;
@Inject
private ContentSectionManager sectionManager;
@Inject @Inject
private ContentTypeRepository typeRepo; private ContentTypeRepository typeRepo;
@Inject
private ContentTypeManager typeManager;
@Inject @Inject
private ContentTypesManager typesManager; private ContentTypesManager typesManager;
@ -78,6 +81,27 @@ class ContentTypeAdminPaneController {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@Transactional
protected List<String> getContentItemClassesList(
final ContentSection ofSection
) {
final ContentSection section = sectionRepo.findById(
ofSection.getObjectId()
)
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No ContentSection with ID %d found.",
ofSection.getObjectId()
)
)
);
return section.getContentTypes()
.stream()
.map(type -> type.getContentItemClass())
.collect(Collectors.toList());
}
private String[] generateListEntry(final ContentType type) { private String[] generateListEntry(final ContentType type) {
final String[] entry = new String[2]; final String[] entry = new String[2];
@ -126,8 +150,9 @@ class ContentTypeAdminPaneController {
} }
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
protected Optional<String> getLifecycleDefinitionLabel(final ContentType type, protected Optional<String> getLifecycleDefinitionLabel(
final Locale locale) { final ContentType type,
final Locale locale) {
final LifecycleDefinition lifecycleDefinition = getLifecycleDefinition( final LifecycleDefinition lifecycleDefinition = getLifecycleDefinition(
type); type);
@ -154,7 +179,7 @@ class ContentTypeAdminPaneController {
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
protected Optional<String> getWorkflowTemplateName(final ContentType type, protected Optional<String> getWorkflowTemplateName(final ContentType type,
final Locale locale) { final Locale locale) {
final Workflow workflowTemplate = getWorkflowTemplate(type); final Workflow workflowTemplate = getWorkflowTemplate(type);
@ -193,4 +218,30 @@ class ContentTypeAdminPaneController {
return new ArrayList<>(contentSection.getWorkflowTemplates()); return new ArrayList<>(contentSection.getWorkflowTemplates());
} }
@Transactional(Transactional.TxType.REQUIRED)
protected void addContentTypeToContentSection(
final String type, final ContentSection toSection
) {
Objects.requireNonNull(type);
Objects.requireNonNull(toSection);
final ContentSection section = sectionRepo
.findById(toSection.getObjectId())
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No ContentSection identified by ID %d found.",
toSection.getObjectId()
)
)
);
sectionManager.addContentTypeToSection(
typeManager.classNameToClass(type),
section,
section.getLifecycleDefinitions().get(0),
section.getWorkflowTemplates().get(0)
);
}
} }

36
ccm-cms/src/main/java/com/arsdigita/cms/ui/type/SelectType.java
View File

@ -101,6 +101,7 @@ public class SelectType extends CMSForm implements PrintListener,
/** /**
* Generate a checkbox list of all content type not associated with the * Generate a checkbox list of all content type not associated with the
* current content section * current content section
* @param event
*/ */
@Override @Override
public void prepare(final PrintEvent event) { public void prepare(final PrintEvent event) {
@ -111,18 +112,22 @@ public class SelectType extends CMSForm implements PrintListener,
final ContentSection section = CMS.getContext().getContentSection(); final ContentSection section = CMS.getContext().getContentSection();
final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
final ContentTypeAdminPaneController controller = cdiUtil
.findBean(ContentTypeAdminPaneController.class);
final ContentTypesManager typesManager = cdiUtil.findBean( final ContentTypesManager typesManager = cdiUtil.findBean(
ContentTypesManager.class); ContentTypesManager.class);
final List<ContentTypeInfo> availableTypes = typesManager final List<ContentTypeInfo> availableTypes = typesManager
.getAvailableContentTypes(); .getAvailableContentTypes();
final List<String> assignedTypes = section.getContentTypes() final List<String> assignedTypes = controller
.stream() .getContentItemClassesList(section);
.map(contentType -> contentType.getContentItemClass()) // = section.getContentTypes()
.collect(Collectors.toList()); // .stream()
// .map(contentType -> contentType.getContentItemClass())
// .collect(Collectors.toList());
final List<ContentTypeInfo> notAssignedTypes = availableTypes.stream() final List<ContentTypeInfo> notAssignedTypes = availableTypes.stream()
.filter(type -> assignedTypes.contains(type.getContentItemClass() .filter(type -> !assignedTypes.contains(type.getContentItemClass()
.getName())) .getName()))
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -184,18 +189,21 @@ public class SelectType extends CMSForm implements PrintListener,
final String[] types = (String[]) data.get(TYPES); final String[] types = (String[]) data.get(TYPES);
final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
final ContentTypeManager typeManager = cdiUtil.findBean( // final ContentTypeManager typeManager = cdiUtil.findBean(
ContentTypeManager.class); // ContentTypeManager.class);
final ContentSectionManager sectionManager = cdiUtil.findBean( // final ContentSectionManager sectionManager = cdiUtil.findBean(
ContentSectionManager.class); // ContentSectionManager.class);
final ContentTypeAdminPaneController controller = cdiUtil
.findBean(ContentTypeAdminPaneController.class);
if (types != null) { if (types != null) {
for (String type : types) { for (String type : types) {
sectionManager.addContentTypeToSection( // sectionManager.addContentTypeToSection(
typeManager.classNameToClass(type), // typeManager.classNameToClass(type),
section, // section,
section.getLifecycleDefinitions().get(0), // section.getLifecycleDefinitions().get(0),
section.getWorkflowTemplates().get(0)); // section.getWorkflowTemplates().get(0));
controller.addContentTypeToContentSection(type, section);
} }
} }
} }

36
ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java
View File

@ -255,22 +255,28 @@ abstract class BaseWorkflowItemPane extends BaseItemPane {
= ((Optional<Workflow>) workflowRequestLocal = ((Optional<Workflow>) workflowRequestLocal
.get(state)).get(); .get(state)).get();
final KernelConfig kernelConfig = KernelConfig.getConfig(); // final KernelConfig kernelConfig = KernelConfig.getConfig();
final Locale defaultLocale = kernelConfig.getDefaultLocale(); // final Locale defaultLocale = kernelConfig.getDefaultLocale();
props.add(new Property(gz("cms.ui.workflow.name"), final WorkflowAdminPaneController controller = CdiUtil
workflow.getName() .createCdiUtil()
.getValue(defaultLocale))); .findBean(WorkflowAdminPaneController.class);
props.add(new Property(
gz("cms.ui.workflow.description"), props.addAll(controller.getWorkflowProperties(workflow));
workflow.getDescription().getValue(defaultLocale))); // props.add(new Property(gz("cms.ui.workflow.name"),
if (workflow.getState() == null) { // workflow.getName()
props.add(new Property(gz("cms.ui.workflow.current_state"), // .getValue(defaultLocale)));
gz("cms.ui.workflow.current_state.none"))); // props.add(new Property(
} else { // gz("cms.ui.workflow.description"),
props.add(new Property(gz("cms.ui.workflow.current_state"), // workflow.getDescription().getValue(defaultLocale)));
workflow.getState().toString())); // if (workflow.getState() == null) {
} // props.add(new Property(gz("cms.ui.workflow.current_state"),
// gz("cms.ui.workflow.current_state.none")));
// } else {
// props.add(new Property(gz("cms.ui.workflow.current_state"),
// workflow.getState().toString()));
// }
return props; return props;
} }

94
ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowAdminPaneController.java
View File

@ -18,7 +18,9 @@
*/ */
package com.arsdigita.cms.ui.workflow; package com.arsdigita.cms.ui.workflow;
import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.kernel.KernelConfig; import com.arsdigita.kernel.KernelConfig;
import com.arsdigita.toolbox.ui.Property;
import com.arsdigita.util.GraphSet; import com.arsdigita.util.GraphSet;
import com.arsdigita.util.Graphs; import com.arsdigita.util.Graphs;
import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.UncheckedWrapperException;
@ -36,6 +38,7 @@ import org.libreccm.workflow.TaskManager;
import org.libreccm.workflow.TaskRepository; import org.libreccm.workflow.TaskRepository;
import org.libreccm.workflow.Workflow; import org.libreccm.workflow.Workflow;
import org.libreccm.workflow.WorkflowRepository; import org.libreccm.workflow.WorkflowRepository;
import org.librecms.CmsConstants;
import org.librecms.contentsection.ContentSection; import org.librecms.contentsection.ContentSection;
import org.librecms.contentsection.ContentSectionManager; import org.librecms.contentsection.ContentSectionManager;
import org.librecms.contentsection.ContentSectionRepository; import org.librecms.contentsection.ContentSectionRepository;
@ -102,6 +105,97 @@ public class WorkflowAdminPaneController {
return new ArrayList<>(contentSection.getWorkflowTemplates()); return new ArrayList<>(contentSection.getWorkflowTemplates());
} }
@Transactional
public List<Map<String, String>> listWorkflowTemplates(
final ContentSection section
) {
final List<Workflow> templates = retrieveWorkflows(section);
return templates
.stream()
.map(this::buildWorkflowTemplateListItem)
.collect(Collectors.toList());
}
private Map<String, String> buildWorkflowTemplateListItem(
final Workflow workflow
) {
final Map<String, String> item = new HashMap<>();
item.put(
WorkflowListModelBuilder.WORKFLOW_TEMPLATE_ID,
Long.toString(workflow.getWorkflowId())
);
item.put(
WorkflowListModelBuilder.WORKFLOW_TEMPLATE_NAME,
workflow
.getName()
.getValue(KernelConfig.getConfig().getDefaultLocale()
)
);
return item;
}
@Transactional(Transactional.TxType.REQUIRED)
public List<Property> getWorkflowProperties(final Workflow ofWorkflow) {
final Workflow workflow = workflowRepo
.findById(ofWorkflow.getWorkflowId())
.orElseThrow(
() -> new IllegalArgumentException(
String.format(
"No Workflow with ID %d available.",
ofWorkflow.getWorkflowId()
)
)
);
final KernelConfig kernelConfig = confManager
.findConfiguration(KernelConfig.class);
final Locale defaultLocale = kernelConfig.getDefaultLocale();
final List<Property> properties = new ArrayList<>();
properties.add(
new Property(
new GlobalizedMessage(
"cms.ui.workflow.name", CmsConstants.CMS_BUNDLE
),
workflow.getName().getValue(defaultLocale)
)
);
properties.add(
new Property(
new GlobalizedMessage(
"cms.ui.workflow.description",
CmsConstants.CMS_BUNDLE
),
workflow.getDescription().getValue(defaultLocale)
)
);
if (workflow.getState() == null) {
properties.add(
new Property(
new GlobalizedMessage(
"cms.ui.workflow.current_state",
CmsConstants.CMS_BUNDLE
),
new GlobalizedMessage(
"cms.ui.workflow.current_state.none",
CmsConstants.CMS_BUNDLE
)
)
);
} else {
properties.add(
new Property(
new GlobalizedMessage(
"cms.ui.workflow.current_state",
CmsConstants.CMS_BUNDLE
),
workflow.getState().toString()
)
);
}
return properties;
}
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public Workflow createWorkflow(final ContentSection section, public Workflow createWorkflow(final ContentSection section,
final String name, final String name,

19
ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowListModelBuilder.java
View File

@ -30,6 +30,7 @@ import org.libreccm.workflow.Workflow;
import java.util.Iterator; import java.util.Iterator;
import java.util.Locale; import java.util.Locale;
import java.util.Map;
/** /**
* Builds a list of workflow templates registered to the current content * Builds a list of workflow templates registered to the current content
@ -41,6 +42,11 @@ import java.util.Locale;
*/ */
class WorkflowListModelBuilder extends AbstractListModelBuilder { class WorkflowListModelBuilder extends AbstractListModelBuilder {
protected static final String WORKFLOW_TEMPLATE_ID = "workflowTemplateId";
protected static final String WORKFLOW_TEMPLATE_NAME
= "workflowTemplateName";
@Override @Override
public final ListModel makeModel(final List list, final PageState state) { public final ListModel makeModel(final List list, final PageState state) {
return new Model(); return new Model();
@ -48,8 +54,9 @@ class WorkflowListModelBuilder extends AbstractListModelBuilder {
private class Model implements ListModel { private class Model implements ListModel {
private final Iterator<Workflow> templates; private final Iterator<Map<String, String>> templates;
private Workflow currentTemplate;
private Map<String, String> currentTemplate;
public Model() { public Model() {
final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
@ -57,7 +64,7 @@ class WorkflowListModelBuilder extends AbstractListModelBuilder {
WorkflowAdminPaneController.class); WorkflowAdminPaneController.class);
templates = controller templates = controller
.retrieveWorkflows(CMS.getContext().getContentSection()) .listWorkflowTemplates(CMS.getContext().getContentSection())
.iterator(); .iterator();
} }
@ -73,14 +80,12 @@ class WorkflowListModelBuilder extends AbstractListModelBuilder {
@Override @Override
public Object getElement() { public Object getElement() {
final KernelConfig kernelConfig = KernelConfig.getConfig(); return currentTemplate.get(WORKFLOW_TEMPLATE_NAME);
final Locale defaultLocale = kernelConfig.getDefaultLocale();
return currentTemplate.getName().getValue(defaultLocale);
} }
@Override @Override
public String getKey() { public String getKey() {
return Long.toString(currentTemplate.getWorkflowId()); return currentTemplate.get(WORKFLOW_TEMPLATE_ID);
} }
} }

150
ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java 100644
View File

@ -0,0 +1,150 @@
package db.migrations.org.librecms.ccm_cms;
import org.flywaydb.core.api.migration.BaseJavaMigration;
import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
public class V7_0_0_24__add_lifecycle_uuid extends BaseJavaMigration {
@Override
public void migrate(final Context context) throws Exception {
final Connection connection = context.getConnection();
final List<Long> lifecycleIds = retrieveLifecycleIds(connection);
final List<Long> definitionIds = retrieveDefinitionIds(
connection
);
addLifecycleUuidCol(connection);
addDefinitionLifecycleCol(connection);
setLifecycleUuid(connection, lifecycleIds);
setDefinitionUuid(connection, definitionIds);
addLifecycleUniqueConstraint(connection);
addDefinitionUniqueConstraint(connection);
}
private List<Long> retrieveLifecycleIds(final Connection connection)
throws Exception {
final List<Long> result = new ArrayList<>();
try (PreparedStatement stmt = connection
.prepareStatement("select LIFECYCLE_ID from LIFECYCLES");
ResultSet resultSet = stmt.executeQuery()) {
while (resultSet.next()) {
result.add(resultSet.getLong("LIFECYCLE_ID"));
}
}
return result;
}
private List<Long> retrieveDefinitionIds(final Connection connection)
throws Exception {
final List<Long> result = new ArrayList<>();
try (PreparedStatement stmt = connection
.prepareStatement(
"select LIFECYCLE_DEFINITION_ID "
+ "from LIFECYLE_DEFINITIONS"
);
ResultSet resultSet = stmt.executeQuery()) {
while (resultSet.next()) {
result.add(resultSet.getLong("LIFECYCLE_ID"));
}
}
return result;
}
private void addLifecycleUuidCol(final Connection connection)
throws Exception {
try (PreparedStatement stmt = connection.prepareStatement(
"alter table LIFECYCLES add column UUID varchar(255)"
)) {
stmt.execute();
}
}
private void addDefinitionLifecycleCol(final Connection connection)
throws Exception {
try (PreparedStatement stmt = connection.prepareStatement(
"alter table lifecyle_definitions "
+ "add column UUID varchar(255)"
)) {
stmt.execute();
}
}
private void setLifecycleUuid(
final Connection connection, final List<Long> lifecycleIds
) throws Exception {
try (PreparedStatement stmt = connection.prepareStatement(
"update LIFECYCLES set UUID = ? where LIFECYCLE_ID = ?"
)) {
for (final Long lifecycleId : lifecycleIds) {
stmt.setString(1, UUID.randomUUID().toString());
stmt.setLong(2, lifecycleId);
stmt.executeUpdate();
stmt.clearParameters();
}
}
}
private void setDefinitionUuid(
final Connection connection, final List<Long> definitionIds
) throws Exception {
try (PreparedStatement stmt = connection.prepareStatement(
"update LIFECYLE_DEFINITIONS set UUID = ? "
+ "where LIFECYCLE_DEFINITION_ID = ?"
)) {
for (final Long lifecycleId : definitionIds) {
stmt.setString(1, UUID.randomUUID().toString());
stmt.setLong(2, lifecycleId);
stmt.executeUpdate();
stmt.clearParameters();
}
}
}
private void addLifecycleUniqueConstraint(
final Connection connection
) throws Exception {
try (PreparedStatement stmt = connection.prepareStatement(
"alter table LIFECYCLES "
+ "add constraint UK_40o4njo54m8c4xlwq6ctnsimd "
+ "unique (UUID)"
)) {
stmt.execute();
}
}
private void addDefinitionUniqueConstraint(
final Connection connection
) throws Exception {
try (PreparedStatement stmt = connection.prepareStatement(
"alter table LIFECYLE_DEFINITIONS "
+ "add constraint UK_n6ki3s5im2k2nccpocuctqqe3 "
+ "unique (UUID)"
)) {
stmt.execute();
}
}
}

22
ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_24__add_lifecycle_uuid.java 100644
View File

@ -0,0 +1,22 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package db.migrations.org.librecms.ccm_cms.h2;
import org.flywaydb.core.api.migration.Context;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
public class V7_0_0_24__add_lifecycle_uuid
extends db.migrations.org.librecms.ccm_cms.V7_0_0_24__add_lifecycle_uuid {
@Override
public void migrate(final Context context) throws Exception {
super.migrate(context);
}
}

22
ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_24__add_lifecycle_uuid.java 100644
View File

@ -0,0 +1,22 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package db.migrations.org.librecms.ccm_cms.pgsql;
import org.flywaydb.core.api.migration.Context;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
public class V7_0_0_24__add_lifecycle_uuid
extends db.migrations.org.librecms.ccm_cms.V7_0_0_24__add_lifecycle_uuid {
@Override
public void migrate(final Context context) throws Exception {
super.migrate(context);
}
}

45
ccm-cms/src/main/java/org/librecms/contentsection/AbstractContentItemImExporter.java 100644
View File

@ -0,0 +1,45 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.librecms.contentsection;
import org.libreccm.categorization.Category;
import org.libreccm.imexport.AbstractEntityImExporter;
import org.libreccm.imexport.Exportable;
import java.util.HashSet;
import java.util.Set;
import javax.inject.Inject;
import javax.transaction.Transactional;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
* @param <T>
*/
public abstract class AbstractContentItemImExporter<T extends ContentItem>
extends AbstractEntityImExporter<T> {
@Inject
private ContentItemRepository itemRepository;
@Override
protected Set<Class<? extends Exportable>> getRequiredEntities() {
final Set<Class<? extends Exportable>> entities = new HashSet<>();
entities.add(Category.class);
entities.add(ContentSection.class);
return entities;
}
@Override
@Transactional(Transactional.TxType.REQUIRED)
public void saveImportedEntity(final T entity) {
itemRepository.save(entity);
}
}

22
ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java
View File

@ -18,6 +18,8 @@
*/ */
package org.librecms.contentsection; package org.librecms.contentsection;
import com.fasterxml.jackson.annotation.JsonIgnore;
import static org.librecms.CmsConstants.*; import static org.librecms.CmsConstants.*;
import org.hibernate.envers.Audited; import org.hibernate.envers.Audited;
@ -56,9 +58,12 @@ import org.hibernate.search.annotations.IndexedEmbedded;
import javax.persistence.FetchType; import javax.persistence.FetchType;
import org.hibernate.envers.NotAudited; import org.hibernate.envers.NotAudited;
import org.libreccm.imexport.Exportable;
import org.librecms.contentsection.privileges.ItemPrivileges; import org.librecms.contentsection.privileges.ItemPrivileges;
import javax.persistence.OrderBy; import javax.persistence.OrderBy;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
/** /**
@ -594,12 +599,13 @@ import javax.persistence.OrderBy;
+ " )" + " )"
) )
}) })
public class ContentItem extends CcmObject implements Serializable { public class ContentItem extends CcmObject implements Serializable, Exportable {
private static final long serialVersionUID = 5897287630227129653L; private static final long serialVersionUID = 5897287630227129653L;
@Column(name = "ITEM_UUID", nullable = false) @Column(name = "ITEM_UUID", nullable = false)
@Field @Field
@XmlElement(name = "item-uuid", namespace = CMS_XML_NS)
private String itemUuid; private String itemUuid;
/** /**
@ -619,6 +625,7 @@ public class ContentItem extends CcmObject implements Serializable {
) )
) )
// @Field // @Field
@XmlElement(name = "name", namespace = CMS_XML_NS)
private LocalizedString name; private LocalizedString name;
/** /**
@ -628,6 +635,7 @@ public class ContentItem extends CcmObject implements Serializable {
@JoinColumn(name = "CONTENT_TYPE_ID") @JoinColumn(name = "CONTENT_TYPE_ID")
@Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED) @Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
// @Field // @Field
@XmlElement(name = "content-type", namespace = CMS_XML_NS)
private ContentType contentType; private ContentType contentType;
/** /**
@ -644,6 +652,7 @@ public class ContentItem extends CcmObject implements Serializable {
) )
) )
@IndexedEmbedded @IndexedEmbedded
@XmlElement(name = "title", namespace = CMS_XML_NS)
private LocalizedString title; private LocalizedString title;
/** /**
@ -658,6 +667,7 @@ public class ContentItem extends CcmObject implements Serializable {
@JoinColumn(name = "OBJECT_ID")} @JoinColumn(name = "OBJECT_ID")}
)) ))
@IndexedEmbedded @IndexedEmbedded
@XmlElement(name = "description", namespace = CMS_XML_NS)
private LocalizedString description; private LocalizedString description;
/** /**
@ -666,6 +676,7 @@ public class ContentItem extends CcmObject implements Serializable {
@Column(name = "VERSION") @Column(name = "VERSION")
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
@Field @Field
@XmlElement(name = "version", namespace = CMS_XML_NS)
private ContentItemVersion version; private ContentItemVersion version;
/** /**
@ -673,6 +684,7 @@ public class ContentItem extends CcmObject implements Serializable {
*/ */
@Column(name = "LAUNCH_DATE") @Column(name = "LAUNCH_DATE")
@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
@XmlElement(name = "launch-date", namespace = CMS_XML_NS)
private Date launchDate; private Date launchDate;
/** /**
@ -684,16 +696,20 @@ public class ContentItem extends CcmObject implements Serializable {
@OneToMany(mappedBy = "item", fetch = FetchType.LAZY) @OneToMany(mappedBy = "item", fetch = FetchType.LAZY)
@OrderBy("order ASC") @OrderBy("order ASC")
@XmlElementWrapper(name = "attachments", namespace = CMS_XML_NS)
@JsonIgnore
private List<AttachmentList> attachments; private List<AttachmentList> attachments;
@OneToOne() @OneToOne()
@JoinColumn(name = "LIFECYCLE_ID") @JoinColumn(name = "LIFECYCLE_ID")
@Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED) @Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
@XmlElement(name = "lifecycle", namespace = CMS_XML_NS)
private Lifecycle lifecycle; private Lifecycle lifecycle;
@OneToOne(fetch = FetchType.LAZY) @OneToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "WORKFLOW_ID") @JoinColumn(name = "WORKFLOW_ID")
@Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED) @Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
@XmlElement(name = "workflow", namespace = CMS_XML_NS)
private Workflow workflow; private Workflow workflow;
/** /**
@ -706,6 +722,7 @@ public class ContentItem extends CcmObject implements Serializable {
@Column(name = "CREATION_DATE") @Column(name = "CREATION_DATE")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@NotAudited @NotAudited
@XmlElement(name = "creation-date", namespace = CMS_XML_NS)
private Date creationDate; private Date creationDate;
/** /**
@ -718,6 +735,7 @@ public class ContentItem extends CcmObject implements Serializable {
@Column(name = "LAST_MODIFIED") @Column(name = "LAST_MODIFIED")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@NotAudited @NotAudited
@XmlElement(name = "last-modified", namespace = CMS_XML_NS)
private Date lastModified; private Date lastModified;
/** /**
@ -732,6 +750,7 @@ public class ContentItem extends CcmObject implements Serializable {
*/ */
@Column(name = "CREATION_USER_NAME") @Column(name = "CREATION_USER_NAME")
@NotAudited @NotAudited
@XmlElement(name = "creation-username", namespace = CMS_XML_NS)
private String creationUserName; private String creationUserName;
/** /**
@ -746,6 +765,7 @@ public class ContentItem extends CcmObject implements Serializable {
*/ */
@Column(name = "LAST_MODIFYING_USER_NAME") @Column(name = "LAST_MODIFYING_USER_NAME")
@NotAudited @NotAudited
@XmlElement(name = "last-modifying-username", namespace = CMS_XML_NS)
private String lastModifyingUserName; private String lastModifyingUserName;
public ContentItem() { public ContentItem() {

5
ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java
View File

@ -18,6 +18,7 @@
*/ */
package org.librecms.contentsection; package org.librecms.contentsection;
import org.libreccm.imexport.Exportable;
import org.libreccm.security.RecursivePermissions; import org.libreccm.security.RecursivePermissions;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.web.CcmApplication; import org.libreccm.web.CcmApplication;
@ -116,7 +117,9 @@ import static org.librecms.CmsConstants.*;
// creator = ContentSectionCreator.class, // creator = ContentSectionCreator.class,
// servlet = ContentSectionServlet.class, // servlet = ContentSectionServlet.class,
// instanceForm = ApplicationInstanceForm.class) // instanceForm = ApplicationInstanceForm.class)
public class ContentSection extends CcmApplication implements Serializable { public class ContentSection
extends CcmApplication
implements Serializable, Exportable {
private static final long serialVersionUID = -671718122153931727L; private static final long serialVersionUID = -671718122153931727L;

22
ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java
View File

@ -18,7 +18,6 @@
*/ */
package org.librecms.contentsection; package org.librecms.contentsection;
import com.arsdigita.kernel.KernelConfig;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -26,6 +25,7 @@ import org.libreccm.core.UnexpectedErrorException;
import org.libreccm.modules.InstallEvent; import org.libreccm.modules.InstallEvent;
import org.libreccm.security.Role; import org.libreccm.security.Role;
import org.libreccm.web.AbstractCcmApplicationSetup; import org.libreccm.web.AbstractCcmApplicationSetup;
import org.libreccm.workflow.Workflow;
import org.librecms.CmsConstants; import org.librecms.CmsConstants;
import java.util.UUID; import java.util.UUID;
@ -44,7 +44,7 @@ import org.librecms.dispatcher.MultilingualItemResolver;
import java.util.Arrays; import java.util.Arrays;
import org.librecms.contentsection.privileges.TypePrivileges; import org.librecms.contentsection.privileges.TypePrivileges;
import org.librecms.contenttypes.ContentTypeDescription; import org.librecms.lifecycle.LifecycleDefinition;
import java.util.Locale; import java.util.Locale;
@ -266,6 +266,22 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup {
section.addRole(manager); section.addRole(manager);
section.addRole(publisher); section.addRole(publisher);
section.addRole(contentReader); section.addRole(contentReader);
final LifecycleDefinition lifecycleDefinition = new LifecycleDefinition();
lifecycleDefinition.setUuid(UUID.randomUUID().toString());
lifecycleDefinition.getLabel().addValue(Locale.ENGLISH, "Standard");
final Workflow workflow = new Workflow();
workflow.setUuid(UUID.randomUUID().toString());
workflow.setAbstractWorkflow(true);
workflow.getName().addValue(Locale.ENGLISH, "Standard");
section.addLifecycleDefinition(lifecycleDefinition);
section.addWorkflowTemplate(workflow);
getEntityManager().persist(lifecycleDefinition);
getEntityManager().persist(workflow);
LOGGER.debug("Setting ItemResolver for content section '{}'...", LOGGER.debug("Setting ItemResolver for content section '{}'...",
sectionName); sectionName);
@ -345,7 +361,7 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup {
} }
if (ContentItem.class.isAssignableFrom(clazz)) { if (ContentItem.class.isAssignableFrom(clazz)) {
LOGGER.warn("'{}' is not is assignable from '{}'!", LOGGER.warn("'{}' is assignable from '{}'!",
ContentItem.class.getName(), ContentItem.class.getName(),
clazz.getName()); clazz.getName());
final ContentType type = new ContentType(); final ContentType type = new ContentType();

3
ccm-cms/src/main/java/org/librecms/contenttypes/Article.java
View File

@ -40,6 +40,8 @@ import static org.librecms.CmsConstants.*;
import org.librecms.contentsection.ContentItem; import org.librecms.contentsection.ContentItem;
import javax.xml.bind.annotation.XmlRootElement;
/** /**
* @author <a href="mailto:konerman@tzi.de">Alexander Konermann</a> * @author <a href="mailto:konerman@tzi.de">Alexander Konermann</a>
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
@ -69,6 +71,7 @@ import org.librecms.contentsection.ContentItem;
order = 2 order = 2
) )
}) })
@XmlRootElement(name = "article", namespace = CMS_XML_NS)
public class Article extends ContentItem implements Serializable { public class Article extends ContentItem implements Serializable {
private static final long serialVersionUID = 3832010184748095822L; private static final long serialVersionUID = 3832010184748095822L;

26
ccm-cms/src/main/java/org/librecms/contenttypes/ArticleImExporter.java 100644
View File

@ -0,0 +1,26 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.librecms.contenttypes;
import org.libreccm.imexport.Processes;
import org.librecms.contentsection.AbstractContentItemImExporter;
import javax.enterprise.context.RequestScoped;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
@RequestScoped
@Processes(Article.class)
public class ArticleImExporter extends AbstractContentItemImExporter<Article> {
@Override
protected Class<Article> getEntityClass() {
return Article.class;
}
}

26
ccm-cms/src/main/java/org/librecms/contenttypes/EventImExporter.java 100644
View File

@ -0,0 +1,26 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.librecms.contenttypes;
import org.libreccm.imexport.Processes;
import org.librecms.contentsection.AbstractContentItemImExporter;
import javax.enterprise.context.RequestScoped;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
@RequestScoped
@Processes(Event.class)
public class EventImExporter extends AbstractContentItemImExporter<Event> {
@Override
protected Class<Event> getEntityClass() {
return Event.class;
}
}

29
ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleImExporter.java 100644
View File

@ -0,0 +1,29 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.librecms.contenttypes;
import org.libreccm.imexport.Processes;
import org.librecms.contentsection.AbstractContentItemImExporter;
import javax.enterprise.context.RequestScoped;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
@RequestScoped
@Processes(MultiPartArticle.class)
public class MultiPartArticleImExporter
extends AbstractContentItemImExporter<MultiPartArticle> {
@Override
protected Class<MultiPartArticle> getEntityClass() {
return MultiPartArticle.class;
}
}

26
ccm-cms/src/main/java/org/librecms/contenttypes/NewsImExporter.java 100644
View File

@ -0,0 +1,26 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.librecms.contenttypes;
import org.libreccm.imexport.Processes;
import org.librecms.contentsection.AbstractContentItemImExporter;
import javax.enterprise.context.RequestScoped;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
@RequestScoped
@Processes(News.class)
public class NewsImExporter extends AbstractContentItemImExporter<News> {
@Override
protected Class<News> getEntityClass() {
return News.class;
}
}

70
ccm-cms/src/main/java/org/librecms/lifecycle/Lifecycle.java
View File

@ -18,6 +18,9 @@
*/ */
package org.librecms.lifecycle; package org.librecms.lifecycle;
import org.hibernate.search.annotations.Field;
import org.libreccm.core.Identifiable;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -36,6 +39,8 @@ import javax.persistence.OneToOne;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import javax.validation.constraints.NotNull;
import javax.xml.bind.annotation.XmlElement;
import static org.librecms.CmsConstants.*; import static org.librecms.CmsConstants.*;
@ -45,43 +50,52 @@ import static org.librecms.CmsConstants.*;
*/ */
@Entity @Entity
@Table(name = "LIFECYCLES", schema = DB_SCHEMA) @Table(name = "LIFECYCLES", schema = DB_SCHEMA)
public class Lifecycle implements Serializable { public class Lifecycle implements Identifiable, Serializable {
private static final long serialVersionUID = 184357562249530038L; private static final long serialVersionUID = 184357562249530038L;
@Id @Id
@GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "LIFECYCLE_ID") @Column(name = "LIFECYCLE_ID")
private long lifecycleId; private long lifecycleId;
/**
*
*/
@Column(name = "UUID", unique = true)
@NotNull
@Field
@XmlElement(name = "uuid")
private String uuid;
@Column(name = "START_DATE_TIME") @Column(name = "START_DATE_TIME")
@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
private Date startDateTime; private Date startDateTime;
@Column(name = "END_DATE_TIME") @Column(name = "END_DATE_TIME")
@Temporal(TemporalType.DATE) @Temporal(TemporalType.DATE)
private Date endDateTime; private Date endDateTime;
@Column(name = "LISTENER", length = 1024) @Column(name = "LISTENER", length = 1024)
private String listener; private String listener;
@Column(name = "STARTED") @Column(name = "STARTED")
private boolean started; private boolean started;
@Column(name = "FINISHED") @Column(name = "FINISHED")
private boolean finished; private boolean finished;
@OneToOne @OneToOne
@JoinColumn(name = "DEFINITION_ID") @JoinColumn(name = "DEFINITION_ID")
private LifecycleDefinition definition; private LifecycleDefinition definition;
@OneToMany(mappedBy = "lifecycle") @OneToMany(mappedBy = "lifecycle")
private List<Phase> phases; private List<Phase> phases;
public Lifecycle() { public Lifecycle() {
phases = new ArrayList<>(); phases = new ArrayList<>();
} }
public long getLifecycleId() { public long getLifecycleId() {
return lifecycleId; return lifecycleId;
} }
@ -90,6 +104,15 @@ public class Lifecycle implements Serializable {
this.lifecycleId = lifecycleId; this.lifecycleId = lifecycleId;
} }
@Override
public String getUuid() {
return uuid;
}
public void setUuid(final String uuid) {
this.uuid = uuid;
}
public Date getStartDateTime() { public Date getStartDateTime() {
return new Date(startDateTime.getTime()); return new Date(startDateTime.getTime());
} }
@ -145,11 +168,11 @@ public class Lifecycle implements Serializable {
protected void setPhases(final List<Phase> phases) { protected void setPhases(final List<Phase> phases) {
this.phases = new ArrayList<>(phases); this.phases = new ArrayList<>(phases);
} }
public void addPhase(final Phase phase) { public void addPhase(final Phase phase) {
phases.add(phase); phases.add(phase);
} }
public void removePhase(final Phase phase) { public void removePhase(final Phase phase) {
phases.remove(phase); phases.remove(phase);
} }
@ -202,26 +225,26 @@ public class Lifecycle implements Serializable {
} }
return Objects.equals(definition, other.getDefinition()); return Objects.equals(definition, other.getDefinition());
} }
public boolean canEqual(final Object obj) { public boolean canEqual(final Object obj) {
return obj instanceof Lifecycle; return obj instanceof Lifecycle;
} }
@Override @Override
public final String toString() { public final String toString() {
return toString(""); return toString("");
} }
public String toString(final String data) { public String toString(final String data) {
return String.format("%s{ " return String.format("%s{ "
+ "lifecycleId = %d, " + "lifecycleId = %d, "
+ "startDateTime = %tF %<tT, " + "startDateTime = %tF %<tT, "
+ "endDateTime = %tF %<tT, " + "endDateTime = %tF %<tT, "
+ "listener = \"%s\", " + "listener = \"%s\", "
+ "started = %b, " + "started = %b, "
+ "finished = %b, " + "finished = %b, "
+ "definition = %s%s" + "definition = %s%s"
+ " }", + " }",
super.toString(), super.toString(),
lifecycleId, lifecycleId,
startDateTime, startDateTime,
@ -232,4 +255,5 @@ public class Lifecycle implements Serializable {
Objects.toString(definition), Objects.toString(definition),
data); data);
} }
} }

23
ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleDefinition.java
View File

@ -18,6 +18,8 @@
*/ */
package org.librecms.lifecycle; package org.librecms.lifecycle;
import org.hibernate.search.annotations.Field;
import org.libreccm.core.Identifiable;
import org.libreccm.l10n.LocalizedString; import org.libreccm.l10n.LocalizedString;
import java.io.Serializable; import java.io.Serializable;
@ -37,6 +39,8 @@ import javax.persistence.JoinColumn;
import javax.persistence.JoinTable; import javax.persistence.JoinTable;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import javax.xml.bind.annotation.XmlElement;
import static org.librecms.CmsConstants.*; import static org.librecms.CmsConstants.*;
@ -46,7 +50,7 @@ import static org.librecms.CmsConstants.*;
*/ */
@Entity @Entity
@Table(name = "LIFECYLE_DEFINITIONS", schema = DB_SCHEMA) @Table(name = "LIFECYLE_DEFINITIONS", schema = DB_SCHEMA)
public class LifecycleDefinition implements Serializable { public class LifecycleDefinition implements Identifiable, Serializable {
private static final long serialVersionUID = 1291162870555527717L; private static final long serialVersionUID = 1291162870555527717L;
@ -55,6 +59,12 @@ public class LifecycleDefinition implements Serializable {
@Column(name = "LIFECYCLE_DEFINITION_ID") @Column(name = "LIFECYCLE_DEFINITION_ID")
private long definitionId; private long definitionId;
@Column(name = "UUID", unique = true)
@NotNull
@Field
@XmlElement(name = "uuid")
private String uuid;
@Embedded @Embedded
@AssociationOverride( @AssociationOverride(
name = "values", name = "values",
@ -96,6 +106,15 @@ public class LifecycleDefinition implements Serializable {
this.definitionId = definitionId; this.definitionId = definitionId;
} }
@Override
public String getUuid() {
return uuid;
}
public void setUuid(final String uuid) {
this.uuid = uuid;
}
public LocalizedString getLabel() { public LocalizedString getLabel() {
return label; return label;
} }
@ -191,7 +210,7 @@ public class LifecycleDefinition implements Serializable {
public final String toString() { public final String toString() {
return toString(""); return toString("");
} }
public String toString(final String data) { public String toString(final String data) {
return String.format("%s{ " return String.format("%s{ "
+ "definitionId = %d, " + "definitionId = %d, "

10
ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleDefinitionRepository.java
View File

@ -20,6 +20,8 @@ package org.librecms.lifecycle;
import org.libreccm.core.AbstractEntityRepository; import org.libreccm.core.AbstractEntityRepository;
import java.util.UUID;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
/** /**
@ -52,4 +54,12 @@ public class LifecycleDefinitionRepository
return lifecycleDefinition.getDefinitionId() == 0; return lifecycleDefinition.getDefinitionId() == 0;
} }
@Override
protected void initNewEntity(final LifecycleDefinition entity) {
super.initNewEntity(entity);
entity.setUuid(UUID.randomUUID().toString());
}
} }

10
ccm-cms/src/main/java/org/librecms/lifecycle/LifecycleRepository.java
View File

@ -20,6 +20,8 @@ package org.librecms.lifecycle;
import org.libreccm.core.AbstractEntityRepository; import org.libreccm.core.AbstractEntityRepository;
import java.util.UUID;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
/** /**
@ -30,6 +32,8 @@ import javax.enterprise.context.RequestScoped;
public class LifecycleRepository public class LifecycleRepository
extends AbstractEntityRepository<Long, Lifecycle> { extends AbstractEntityRepository<Long, Lifecycle> {
private static final long serialVersionUID = 1L;
@Override @Override
public Class<Lifecycle> getEntityClass() { public Class<Lifecycle> getEntityClass() {
return Lifecycle.class; return Lifecycle.class;
@ -50,4 +54,10 @@ public class LifecycleRepository
return lifecycle.getLifecycleId() == 0; return lifecycle.getLifecycleId() == 0;
} }
@Override
protected void initNewEntity(final Lifecycle entity) {
super.initNewEntity(entity);
entity.setUuid(UUID.randomUUID().toString());
}
} }

12
ccm-cms/src/main/java/org/librecms/pagemodel/CategoryTreeComponentRenderer.java
View File

@ -44,7 +44,7 @@ import org.libreccm.pagemodel.RendersComponent;
/** /**
* Renderer for the {@link CategoryTreeComponent}. * Renderer for the {@link CategoryTreeComponent}.
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RequestScoped @RequestScoped
@ -72,13 +72,13 @@ public class CategoryTreeComponentRenderer
if (!parameters.containsKey(PARAMETER_CATEGORY)) { if (!parameters.containsKey(PARAMETER_CATEGORY)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"The parameters map passed to this GreetingItem component does " "The parameters map passed to this CategoryTree component does "
+ "not include the parameter \"category\""); + "not include the parameter \"category\"");
} }
if (!(parameters.get(PARAMETER_CATEGORY) instanceof Category)) { if (!(parameters.get(PARAMETER_CATEGORY) instanceof Category)) {
throw new IllegalArgumentException(String throw new IllegalArgumentException(String
.format("The parameters map passed to this GreetingItem " .format("The parameters map passed to this CategoryTree "
+ "component contains the parameter \"category\", but the " + "component contains the parameter \"category\", but the "
+ "parameter is not of type \"%s\" but of type \"%s\".", + "parameter is not of type \"%s\" but of type \"%s\".",
Category.class.getName(), Category.class.getName(),
@ -106,6 +106,8 @@ public class CategoryTreeComponentRenderer
final Category rootCategory = findRootCategory(category); final Category rootCategory = findRootCategory(category);
result.put("categoryId", Long.toString(rootCategory.getObjectId()));
result.put("uuid", rootCategory.getUuid());
result.put("categoryName", rootCategory.getName()); result.put("categoryName", rootCategory.getName());
result.put("categoryPath", result.put("categoryPath",
categoryManager.getCategoryPath(rootCategory)); categoryManager.getCategoryPath(rootCategory));
@ -141,6 +143,8 @@ public class CategoryTreeComponentRenderer
final Locale language) { final Locale language) {
final Map<String, Object> result = new HashMap<>(); final Map<String, Object> result = new HashMap<>();
result.put("categoryId", Long.toString(category.getObjectId()));
result.put("uuid", category.getUuid());
result.put("categoryName", category.getName()); result.put("categoryName", category.getName());
result.put("categoryPath", categoryManager.getCategoryPath(category)); result.put("categoryPath", categoryManager.getCategoryPath(category));
result.put("categoryTitle", category.getTitle().getValue(language)); result.put("categoryTitle", category.getTitle().getValue(language));
@ -153,6 +157,8 @@ public class CategoryTreeComponentRenderer
final Locale language) { final Locale language) {
final Map<String, Object> result = new HashMap<>(); final Map<String, Object> result = new HashMap<>();
result.put("categoryId", Long.toString(category.getObjectId()));
result.put("uuid", category.getUuid());
result.put("categoryName", category.getName()); result.put("categoryName", category.getName());
result.put("categoryPath", categoryManager.getCategoryPath(category)); result.put("categoryPath", categoryManager.getCategoryPath(category));
result.put("categoryTitle", category.getTitle().getValue(language)); result.put("categoryTitle", category.getTitle().getValue(language));

24
ccm-cms/src/main/java/org/librecms/pagemodel/GreetingItemComponentRenderer.java
View File

@ -80,12 +80,24 @@ public class GreetingItemComponentRenderer
parameters.get(PARAMETER_CATEGORY).getClass().getName())); parameters.get(PARAMETER_CATEGORY).getClass().getName()));
} }
final Category category = categoryRepo final Optional<Category> catResult = categoryRepo.findById(
.findById(((CcmObject) parameters.get(PARAMETER_CATEGORY)) ((CcmObject) parameters.get(PARAMETER_CATEGORY)).getObjectId()
.getObjectId()) );
.orElseThrow(() -> new IllegalArgumentException(String.format( final Category category = catResult.orElseThrow(
"No category with ID %d in the database.", () -> new IllegalArgumentException(
((CcmObject) parameters.get(PARAMETER_CATEGORY)).getObjectId()))); String.format(
"No category with ID %d in the database.",
((CcmObject) parameters.get(PARAMETER_CATEGORY))
.getObjectId()
)
)
);
// final Category category = categoryRepo
// .findById(((CcmObject) parameters.get(PARAMETER_CATEGORY))
// .getObjectId())
// .orElseThrow(() -> new IllegalArgumentException(String.format(
// "No category with ID %d in the database.",
// ((CcmObject) parameters.get(PARAMETER_CATEGORY)).getObjectId())));
final Optional<CcmObject> indexObj = categoryManager final Optional<CcmObject> indexObj = categoryManager
.getIndexObject(category) .getIndexObject(category)

22
ccm-cms/src/main/java/org/librecms/pages/CmsPageRenderer.java
View File

@ -18,6 +18,7 @@
*/ */
package org.librecms.pages; package org.librecms.pages;
import org.libreccm.categorization.Category;
import org.libreccm.pagemodel.AbstractPageRenderer; import org.libreccm.pagemodel.AbstractPageRenderer;
import org.libreccm.pagemodel.PageRenderer; import org.libreccm.pagemodel.PageRenderer;
@ -28,7 +29,7 @@ import javax.enterprise.context.RequestScoped;
/** /**
* Implementation of {@link PageRenderer} for CMS pages. * Implementation of {@link PageRenderer} for CMS pages.
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RequestScoped @RequestScoped
@ -36,13 +37,22 @@ public class CmsPageRenderer extends AbstractPageRenderer {
@Override @Override
public Map<String, Object> renderPage(final Map<String, Object> parameters) { public Map<String, Object> renderPage(final Map<String, Object> parameters) {
final Map<String, Object> result = new HashMap<>(); final Map<String, Object> result = new HashMap<>();
result.put("application", Pages.class.getName());
if (parameters.containsKey(PagesRouter.SITE_INFO)) {
result.put(
PagesRouter.SITE_INFO, parameters.get(PagesRouter.SITE_INFO)
);
}
if (parameters.containsKey(PagesRouter.PAGE_PATH)) {
result.put(
PagesRouter.PAGE_PATH, parameters.get(PagesRouter.PAGE_PATH)
);
}
return result; return result;
} }
} }

81
ccm-cms/src/main/java/org/librecms/pages/PagesRouter.java
View File

@ -26,6 +26,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule; import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import org.libreccm.categorization.Category; import org.libreccm.categorization.Category;
import org.libreccm.categorization.CategoryManager;
import org.libreccm.categorization.CategoryRepository; import org.libreccm.categorization.CategoryRepository;
import org.libreccm.configuration.ConfigurationManager; import org.libreccm.configuration.ConfigurationManager;
import org.libreccm.l10n.GlobalizationHelper; import org.libreccm.l10n.GlobalizationHelper;
@ -43,10 +44,12 @@ import java.net.URI;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
@ -75,6 +78,29 @@ import static org.librecms.pages.PagesConstants.*;
@Path("/") @Path("/")
public class PagesRouter { public class PagesRouter {
protected static final String PAGE_PATH = "pagePath";
protected static final String PAGE_PATH_CATEGORY_ID = "categoryId";
protected static final String PAGE_PATH_CATEGORY_NAME = "categoryName";
protected static final String PAGE_PATH_CATEGORY_TITLE = "categoryTitle";
protected static final String PAGE_PATH_CATEGORY_UUID = "uuid";
protected static final String SITE_INFO = "siteInfo";
protected static final String SITE_INFO_NAME = "name";
protected static final String SITE_INFO_DOMAIN = "domain";
protected static final String SITE_INFO_HOST = "host";
protected static final String SITE_INFO_LANGS = "supportedLanguages";
@Inject
private CategoryManager categoryManager;
@Inject @Inject
private CategoryRepository categoryRepo; private CategoryRepository categoryRepo;
@ -306,7 +332,7 @@ public class PagesRouter {
* @return * @return
*/ */
@GET @GET
@Path("/{page:[\\w/]+}/{name:[\\w\\-]+}") @Path("/{page:[\\w\\-/]+}/{name:[\\w\\-]+}")
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public Response getPage( public Response getPage(
@Context final UriInfo uriInfo, @Context final UriInfo uriInfo,
@ -346,7 +372,7 @@ public class PagesRouter {
* @return * @return
*/ */
@GET @GET
@Path("/{page:[\\w/]+}/{name:[\\w\\-]+}.html") @Path("/{page:[\\w\\-/]+}/{name:[\\w\\-]+}.html")
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public Response getPageAsHtml( public Response getPageAsHtml(
@Context final UriInfo uriInfo, @Context final UriInfo uriInfo,
@ -388,7 +414,7 @@ public class PagesRouter {
* @return * @return
*/ */
@GET @GET
@Path("/{page:[\\w/]+}/{name:[\\w\\-]+}.{lang:\\w+}.html") @Path("/{page:[\\w\\-/]+}/{name:[\\w\\-]+}.{lang:\\w+}.html")
@Produces("text/html") @Produces("text/html")
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public String getPageAsHtml( public String getPageAsHtml(
@ -443,7 +469,7 @@ public class PagesRouter {
* @return * @return
*/ */
@GET @GET
@Path("/{page:[\\w/]+}/{name:[\\w\\-]+}.{lang:\\w+}.json") @Path("/{page:[\\w\\-/]+}/{name:[\\w\\-]+}.{lang:\\w+}.json")
@Produces("application/json") @Produces("application/json")
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public String getPageAsJson( public String getPageAsJson(
@ -498,7 +524,7 @@ public class PagesRouter {
* @return * @return
*/ */
@GET @GET
@Path("/{page:[\\w/]+}/{name:[\\w\\-]+}.{lang:\\w+}.xml") @Path("/{page:[\\w\\-/]+}/{name:[\\w\\-]+}.{lang:\\w+}.xml")
@Produces("text/xml") @Produces("text/xml")
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public String getPageAsXml( public String getPageAsXml(
@ -634,8 +660,22 @@ public class PagesRouter {
Objects.requireNonNull(pagePath); Objects.requireNonNull(pagePath);
Objects.requireNonNull(parameters); Objects.requireNonNull(parameters);
final KernelConfig kernelConfig = confManager
.findConfiguration(KernelConfig.class);
final String domain = uriInfo.getBaseUri().getHost(); final String domain = uriInfo.getBaseUri().getHost();
final Pages pages = getPages(domain); final Pages pages = getPages(domain);
final Map<String, Object> siteInfo = new HashMap<>();
siteInfo.put(SITE_INFO_HOST, uriInfo.getBaseUri().getHost());
siteInfo.put(SITE_INFO_DOMAIN, pages.getSite().getDomainOfSite());
siteInfo.put(SITE_INFO_NAME, pages.getSite().getDisplayName());
siteInfo.put(
SITE_INFO_LANGS,
kernelConfig.getSupportedLanguages().stream().sorted().collect(
Collectors.toList()
)
);
parameters.put(SITE_INFO, siteInfo);
final Category category = getCategory(domain, pages, pagePath); final Category category = getCategory(domain, pages, pagePath);
final Locale locale = new Locale(language); final Locale locale = new Locale(language);
@ -648,6 +688,7 @@ public class PagesRouter {
globalizationHelper.setSelectedLocale(locale); globalizationHelper.setSelectedLocale(locale);
parameters.put(PAGE_PATH, buildPageCategoriesPath(category, locale));
parameters.put(PARAMETER_CATEGORY, category); parameters.put(PARAMETER_CATEGORY, category);
return pageManager.findPageForCategory(category); return pageManager.findPageForCategory(category);
} }
@ -680,7 +721,7 @@ public class PagesRouter {
pagePath, pagePath,
language, language,
parameters); parameters);
final PageModel pageModel; final PageModel pageModel;
if (pageModelVersion == PageModelVersion.DRAFT) { if (pageModelVersion == PageModelVersion.DRAFT) {
pageModel = pageModelManager pageModel = pageModelManager
@ -729,6 +770,32 @@ public class PagesRouter {
return buildPage(pageModel, parameters); return buildPage(pageModel, parameters);
} }
private List<Map<String, Object>> buildPageCategoriesPath(
final Category category, Locale language
) {
final List<Category> categoriesInPath = categoryManager
.getCategoriesInPath(category);
return categoriesInPath
.stream()
.map(cat -> buildPathCategoriesPathEntry(category, language))
.collect(Collectors.toList());
}
private Map<String, Object> buildPathCategoriesPathEntry(
final Category category, Locale language
) {
final Map<String, Object> result = new HashMap<>();
result.put(PAGE_PATH_CATEGORY_ID, Long.toString(category.getObjectId()));
result.put(PAGE_PATH_CATEGORY_UUID, category.getUuid());
result.put(PAGE_PATH_CATEGORY_NAME, category.getName());
result.put(
PAGE_PATH_CATEGORY_TITLE, category.getTitle().getValue(language)
);
return result;
}
/** /**
* Parse the value of the {@code preview} query parameter. * Parse the value of the {@code preview} query parameter.
* *
@ -794,10 +861,12 @@ public class PagesRouter {
* Version of content to use * Version of content to use
*/ */
private ContentItemVersion contentVersion; private ContentItemVersion contentVersion;
/** /**
* Version of {@link PageModel} to use. * Version of {@link PageModel} to use.
*/ */
private PageModelVersion pageModelVersion; private PageModelVersion pageModelVersion;
/** /**
* Version of theme to use. * Version of theme to use.
*/ */

1
ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_16__create_pages.sql
View File

@ -39,7 +39,6 @@ alter table CCM_CMS.PAGES
add constraint FKmgmth087tmxwieujn2vs5opbo add constraint FKmgmth087tmxwieujn2vs5opbo
foreign key (OBJECT_ID) foreign key (OBJECT_ID)
references CCM_CORE.CCM_OBJECTS; references CCM_CORE.CCM_OBJECTS;
);
alter table CCM_CMS.PAGES_APP alter table CCM_CMS.PAGES_APP
add constraint FK5swx0e8pj0mm5t1es0lj4nwlx add constraint FK5swx0e8pj0mm5t1es0lj4nwlx

29
ccm-cms/src/main/resources/themes/ccm-cms-types-file-attachments.ftl 100644
View File

@ -0,0 +1,29 @@
<#--filedoc
Functions for processing file attachments.
@depcrecated Use ccm-cms/file-attachments.ftl
-->
<#import "/ccm-cms/file-attachments" as FileAttachments>
<#--doc
Gets the file attachements of an content item.
@param item The content item providing the file attachments.
@return A sequence of the file attachments
-->
<#function getFileAttachments item>
<#return FileAttachments.getFileAttachments(item)>
</#function>
<#--doc
*Internal* function for determing the type of a file attachment.
@param file The file attachment.
@return The type the file. Either `caption` or `file`.
-->
<#function _getFileType file>
<#return FileAttachments._getFileType(file)>
</#function>

20
ccm-cms/src/main/resources/themes/freemarker/ccm-cms-assets-imagestep.ftl 100644
View File

@ -0,0 +1,20 @@
<#--filedoc
Provides functions for processing the image attachemnts of a content item.
@depcrecated Use ccm-cms/image-attachments.ftl instead
-->
<#import "/ccm-cms/image-attachments.ftl" as ImageAttachments>
<#--doc
Creates a sorted sequence of hashes (see Freemarker docuementation) for the
image attachments of a content item.
@param item The model of the content item to use.
@return The images attached to the item.
-->
<#function getImageAttachments item>
<#return ImageAttachments.getImageAttachments(item)>
</#function>

21
ccm-cms/src/main/resources/themes/freemarker/ccm-cms-assets-notes.ftl 100644
View File

@ -0,0 +1,21 @@
<#--filedoc
Functions for processing note attachments.
@depcrecated Use ccm-cms/sidenote-attachments instead
-->
<#import "/ccm-cms/sidenote-attachments" as SideNotes>
<#--doc
Generates a sorted sequence of hashes (see Freemarker documentation) for
the note attachments of a content item.
@param item The model of the content item to use.
@return The side notes attached to the item.
-->
<#function getNotes item>
<#return item.sideNotes>
</#function>

40
ccm-cms/src/main/resources/themes/freemarker/ccm-cms-types-article.ftl 100644
View File

@ -0,0 +1,40 @@
<#--filedoc
Functions for processing article items.
@depcrecated Use ccm-cms/article-item.ftl instea
-->
<#import "/ccm-cms/article-item.ftl" as Article>
<#--doc
Gets the lead text of the provided article.
@param item The article item to use.
@return The lead text of the article.
-->
<#function getLead item>
<#return Article.getLead(item)>
</#function>
<#--doc
Checks if the provided item has a lead property.
@param item The article item to use.
@return `true` If the provided article has a lead text, `false` otherwise.
-->
<#function hasLead item>
<#return Article.hasLead(item)>
</#function>
<#--doc
Gets the main text the the provided article.
@param item The article item to use.
@return The main text of the article.
-->
<#function getMainText item>
<#return Article.getMainText(item)>
</#function>

342
ccm-cms/src/main/resources/themes/freemarker/ccm-cms-types-event.ftl 100644
View File

@ -0,0 +1,342 @@
<#--filedoc
Functions for processing Event items.
@depcrecated Use ccm-cms/event-item.ftl
-->
<#import "/ccm-cms/event-item.ftl" as Event>
<#--doc
Gets the lead text of an event item
@param item The event item to use.
@return The lead text of the event item.
-->
<#function getLead item>
<#return Event.getLead(item)>
</#function>
<#--doc
Gets the main text of an event item
@param item The event item to use.
@return The main of the event item.
-->
<#function getMainText item>
<#return Event.getMainText(item)>
</#function>
<#--doc
Gets the end date of an event item
@param item The news event to use.
@return The date of the event item.
-->
<#function getEndDate item>
<#return Event.getEndDate(item)>
</#function>
<#--doc
Gets the year of the end date of the event.
@param item The event item to use.
@return The year of the end date of the event.
-->
<#function getEndDateYear item>
<#return Event.getEndDateYear(item)>
</#function>
<#--doc
Gets the month of the end date of the event.
@param item The event item to use.
@return The month of the end date of the event.
-->
<#function getEndDateMonth item>
<#return Event.getEndDateMonth(item)>
</#function>
<#--doc
Gets the day of the end date of the event.
@param item The event item to use.
@return The day of the end date of the event.
-->
<#function getEndDateDay item>
<#return Event.getEndDateDay(item)>
</#function>
<#--doc
Gets the short name of the day of the end date of the event.
@param item The event item to use.
@return The short name of the day of the end date of the event.
-->
<#function getEndDateDayNameShort item>
<#return Event.getEndDateDayNameShort(item)>
</#function>
<#--doc
Gets the end time of the event.
@param item The event item to use.
@return The end time of the event.
-->
<#function getEndTime item>
<#return Event.getEndTime(item)>
</#function>
<#--doc
Gets the hour of the end time of the event.
@param item The event item to use.
@return The hour of the end time of the event.
-->
<#function getEndTimeHour item>
<#return Event.getEndTimeHour(item)>
</#function>
<#--doc
Gets the minute of the end time of the event.
@param item The event item to use.
@return The minute of the end time of the event.
-->
<#function getEndTimeMinute item>
<#return Event.getEndTimeMinute(item)>
</#function>
<#--doc
Gets the second of the end time of the event.
@param item The event item to use.
@return The second of the end time of the event.
-->
<#function getEndTimeSecond item>
<#return Event.getEndTimeSecond(item)>
</#function>
<#--doc
Gets the start date of an event item
@param item The news event to use.
@return The start of the event item.
-->
<#function getStartDate item>
<#return Event.getStartDate(item)>
</#function>
<#--doc
Gets the year of the start date of the event.
@param item The event item to use.
@return The year of the start date of the event.
-->
<#function getStartDateYear item>
<#return Event.getStartDateYear(item)>
</#function>
<#--doc
Gets the month of the start date of the event.
@param item The event item to use.
@return The month of the start date of the event.
-->
<#function getStartDateMonth item>
<#return Event.getStartDateMonth(item)>
</#function>
<#--doc
Gets the day of the start date of the event.
@param item The event item to use.
@return The day of the start date of the event.
-->
<#function getStartDateDay item>
<#return Event.getStartDateDay(item)>
</#function>
<#--doc
Gets the short name of the day of the start date of the event.
@param item The event item to use.
@return The short name of the day of the start date of the event.
-->
<#function getStartDateDayNameShort item>
<#return Event.getStartDateDayNameShort(item)>
</#function>
<#--doc
Gets the start time of the event.
@param item The event item to use.
@return The start time of the event.
-->
<#function getStartTime item>
<#return Event.getStartTime(item)>
</#function>
<#--doc
Determines if the provided event item has a start time
@param item The event item to use.
@return `true` if the provided event item has a start time, `false` otherwise.
-->
<#function hasStartTime item>
<#return Event.hasStartTime(item)>
</#function>
<#--doc
Determines if the provided event item has a end time
@param item The event item to use.
@return `true` if the provided event item has a end time, `false` otherwise.
-->
<#function hasEndTime item>
<#return Event.getEndTime(item)>
</#function>
<#--doc
Determines if the provided event item has a start date.
@param item The event item to use.
@return `true` if the provided event item has a start date, `false` otherwise.
-->
<#function hasStartDate item>
<#return Event.hasStartDate(item)>
</#function>
<#--doc
Determines if the provided event item has a end date.
@param item The event item to use.
@return `true` if the provided event item has a end date, `false` otherwise.
-->
<#function hasEndDate item>
<#return Event.getEndDate(item)>
</#function>
<#--doc
Gets the hour of the start time of the event.
@param item The event item to use.
@return The hour of the start time of the event.
-->
<#function getstartTimeHour item>
<#return Event.getstartTimeHour(item)>
</#function>
<#--doc
Gets the minute of the start time of the event.
@param item The event item to use.
@return The minute of the start time of the event.
-->
<#function getstartTimeMinute item>
<#return Event.getstartTimeMinute(item)>
</#function>
<#--doc
Gets the second of the start time of the event.
@param item The event item to use.
@return The second of the start time of the event.
-->
<#function getstartTimeSecond item>
<#return Event.getstartTimeSecond(item)>
</#function>
<#--doc
Gets the location of the event.
@param item The event item to use.
@return The value of the `location` property of the event.
-->
<#function getLocation(item)>
<#return Event.getLocation(item)>
</#function>
<#--doc
Gets the main contributor of the event.
@param item The event item to use.
@return The value of the `mainContributor` property of the event.
-->
<#function getMainContributor item>
<#return Event.getMainContributor(item)>
</#function>
<#--doc
Gets the type of the event.
@param item The event item to use.
@return The value of the `eventType` property of the event.
-->
<#function getEventType item>
<#return Event.getEventType(item)>
</#function>
<#--doc
Gets the cost of the event.
@param item The event item to use.
@return The value of the `cost` property of the event.
-->
<#function getCost item>
<#return Event.getCost(item)>
</#function>
<#--doc
Gets the map link for the event.
@param item The event item to use.
@return The value of the `mapLink` property of the event.
-->
<#function getMapLink item>
<#return Event.getMapLink(item)>
</#function>
<#--doc
Gets the addendium of the event.
@param item The event item to use.
@return The value of the `eventDate` property of the event.
-->
<#function getEventDateAddendum item>
<#return Event.getEventDateAddendum(item)>
</#function>

53
ccm-cms/src/main/resources/themes/freemarker/ccm-cms-types-multiparticle-toc.ftl 100644
View File

@ -0,0 +1,53 @@
<#--filedoc
Functions for creating the table of contents of a multi part article.
@depcrecated Use ccm-cms/multiparticle-item-toc.ftl
-->
<#import "/ccm-cms/multiparticle-item-toc.ftl" as Toc>
<#--doc
Gets the sections of a multi part article.
@param item The model of the multi part article to use.
@return The sections of the multi part article.
-->
<#function getSections item>
<#return Toc.getSections(item)>
</#function>
<#--doc
Gets the title of a section.
@param section The model of the section as returned by `getSections`.
@return The title of the section.
-->
<#function getSectionTitle section>
<#return Toc.getSectionTitle(section)>
</#function>
<#--doc
Gets the link for the section.
@param section The model of the section as returned by `getSections`.
@return The link for the section.
-->
<#function getSectionLink section>
<#return Toc.getSectionLink(section)>
</#function>
<#--doc
Determines of the provided section is the active section.
@param item The model of the multi part article to use.
@param section The model of the section as returned by `getSections`.
@return `true` if the provided section is the active section, `false` otherwise.
-->
<#function isActiveSection item section>
<#return Toc.getActiveSection(item, section)>
</#function>

151
ccm-cms/src/main/resources/themes/freemarker/ccm-cms-types-multiparticle.ftl 100644
View File

@ -0,0 +1,151 @@
<#--filedoc
Functions for processing MultiPartArticles.
@depcrecated Use ccm-cms/multiparticle-item.ftl
-->
<#import "/ccm-cms/multiparticle-item.ftl" as Mpa>
<#--doc
Get the summary of a multi part article.
@param item The model of the multi part article to use.
@return The summary of the multi part article.
-->
<#function getSummary item>
<#return Map.getSummary(item)>
</#function>
<#--doc
Get the visible sections of a multi part article.
@param item The model of the multi part article to use.
@return The visible sections of the multi part article.
-->
<#function getSections item>
<#return Map.getSections(item)>
</#function>
<#--doc
Gets the title of a section.
@param section The model of the section to use, as returned by `getSections`.
@return The title of the section.
-->
<#function getSectionTitle section>
<#return Map.getSectionTitle(section)>
</#function>
<#--doc
Gets the content of a section.
@param section The model of the section to use, as returned by `getSections`.
@return The content of the section.
-->
<#function getSectionContent section>
<#return Map.getSectionContent(section)>
</#function>
<#--doc
Gets the rank (sort key) of a section.
@param section The model of the section to use, as returned by `getSections`.
@return The rank of the section.
-->
<#function getSectionRank section>
<#return Map.getSectionRank(section)>
</#function>
<#--doc
Gets the number of the current page.
@param item The model of the multi part article to use.
@return The number of the current page.
-->
<#function getPageNumber item>
<#return Map.getPageNumber(item)>
</#function>
<#--doc
Gets the number of the pages.
@param item The model of the multi part article to use.
@return The number of the pages.
-->
<#function getNumberOfPages item>
<#return Map.getNumberOfPages(item)>
</#function>
<#--doc
Determines if a link to the previous page is available.
@param item The model of the multi part article to use.
@return `true` if the link is available, `false` otherwise.
-->
<#function hasPreviousPage item>
<#return Mpa.hasPreviousPage(item)>
</#function>
<#--doc
Determines if a link to the next page is available.
@param item The model of the multi part article to use.
@return `true` if the link is available, `false` otherwise.
-->
<#function hasNextPage item>
<#return Map.hasNextPage(item)>
</#function>
<#--doc
Determines of the multi part article has multiple pages.
@param item The model of the multi part article to use.
@return `true` if the article has multiple pages, `false` otherwise.
-->
<#function hasMultiplePages item>
<#return Map.hasMultiplePages(item)>
</#function>
<#--doc
Gets the link to the previous page.
@param item The model of the multi part article to use.
@return The link to the previous page.
-->
<#function getLinkToPreviousPage item>
<#return Map.getLinkToPreviousPage(item)>
</#function>
<#--doc
Gets the link to the next page.
@param item The model of the multi part article to use.
@return The link to the next page.
-->
<#function getLinkToNextPage item>
<#return Map.getLinkToNextPage(item)>
</#function>
<#--doc
Gets the link for showing all sections on one page..
@param item The model of the multi part article to use.
@return The link for showing all sections on one page.
-->
<#function getAllSectionsLink item>
<#return Map.getAllSectionsLink(item)>
</#function>

36
ccm-cms/src/main/resources/themes/freemarker/ccm-cms/article-item.ftl 100644
View File

@ -0,0 +1,36 @@
<#--filedoc
Functions for processing article items.
-->
<#--doc
Gets the lead text of the provided article.
@param item The article item to use.
@return The lead text of the article.
-->
<#function getLead item>
<#return item.lead>
</#function>
<#--doc
Checks if the provided item has a lead property.
@param item The article item to use.
@return `true` If the provided article has a lead text, `false` otherwise.
-->
<#function hasLead item>
<#return (getLead(item)?length > 0)>
</#function>
<#--doc
Gets the main text the the provided article.
@param item The article item to use.
@return The main text of the article.
-->
<#function getMainText item>
<#return item.text>
</#function>

26
ccm-cms/src/main/resources/themes/freemarker/ccm-cms/bookmark-item.ftl 100644
View File

@ -0,0 +1,26 @@
<#--filedoc
Functions for Bookmark items.
-->
<#--doc
Gets the description of a bookmark.
@param item The bookmark item to use.
@return The description of the provided bookmark.
-->
<#function getDescription item>
<#return item.description>
</#function>
<#--doc
Gets the link of a bookmark.
@param item The bookmark item to use.
@return The link of the provided bookmark.
-->
<#function getLink item>
<#return item.link>
</#function>

58
ccm-cms/src/main/resources/themes/freemarker/ccm-cms/ccm-cms-assets-relatedlink.ftl 100644
View File

@ -0,0 +1,58 @@
<#--filedoc
Functions for processing related links.
@depcrecated Use ccm-cms/relatedlink-attachments.ftl instead
-->
<#import "/ccm-cms/relatedlink-attachments.ftl" as RelatedLinks>
<#--doc
Generates a sorted sequence of hashes (see Freemarker documentation)
from the related links of a content item.
@param item The model of the content item to use.
@param linkListName: The name of the link list to use.
@return The links attached to the provided item.
-->
<#function getRelatedLinks item linkListName="NONE">
<#return RelatedLinks.getRelatedLinks(item linkListName)>
<#-- <#return item["./links[./linkListName='${linkListName}']"]?sort_by("linkOrder")> -->
</#function>
<#--doc
*Internal* function for determing the type a related link.
@param link The link
@return The type of the link. Either `externalLink`, `internalLink` or `caption`.
-->
<#function _getLinkType link>
<#return RelatedLinks.:_getLinkType(link)>
</#function>
<#--doc
*Internal* function for getting parameters for the link.
@param link The link
@return Parameters for an internal link.
-->
<#function _getInternalLinkParameters link>
<#return RelatedLinks._getInternalLinkParameters(link)>
</#function>
<#--doc
*Internal* function for constructing the target URI of a related link.
@param link The link model to use.
@return The URL for the target of the link.
-->
<#function _getTargetUri link>
<#return RelatedLinks._getTargetUri(link)>
</#function>

35
ccm-cms/src/main/resources/themes/freemarker/ccm-cms/ccm-cms-types-bookmark.ftl 100644
View File

@ -0,0 +1,35 @@
<#--filedoc
Functions for Bookmark items.
-->
<#--filedoc
Functions for Bookmark items.
@depcrecated Use ccm-cms/bookmark-item.ftl
-->
<#import "ccm-cms/bookmark-item.ftl" as Bookmark>
<#--doc
Gets the description of a bookmark.
@param item The bookmark item to use.
@return The description of the provided bookmark.
-->
<#function getDescription item>
<#return Bookmark.getDescription(item)>
</#function>
<#--doc
Gets the link of a bookmark.
@param item The bookmark item to use.
@return The link of the provided bookmark.
-->
<#function getLink item>
<#return Bookmark.getLink(item)>
</#function>

166
ccm-cms/src/main/resources/themes/freemarker/ccm-cms/content-item.ftl 100644
View File

@ -0,0 +1,166 @@
<#--filedoc
This library provides functions and macros for processing the data of
content items.
-->
<#--doc
Gets the current content item, or more exactly the model of the current
content item from the model. This function only works on cms pages and
not on navigation pages. For navigation pages use the functions
provided by ccm-navigation for extracting the index item.
@return The model of the current content item.
-->
<#function getContentItem container="">
<#if container == "">
<#return contentItem>
<#else>
<#return [container].contentItem>
</#if>
</#function>
<#--doc
Includes the template for the type of the provided content item
for the provided view and style. The paramters view and style are
optional. If not provided the default value "detail" is used for
the view parameter.
@param item The data model of the content item itself. There are
several functions for extracting this provided by other modules.
@param view View type to use. Either `detail` or `list`. Default
value is `detail`.
@param style Style to use. Styles allow it to use different
templates for `detail` or `list` views depending on the context were the
content item is displayed.
-->
<#macro contentItem item view="detail" style="">
<#--<pre>
item["/objectType"]: ${item["./objectType"]?size}
item["/nav:attribute[@name='objectType']"]: ${item["./nav:attribute[@name='objectType']"]?size}
</pre>-->
<#if (item.contentType.name?length > 0)>
<#include getContentItemTemplate(item.contentType.name, view, style)>
<#else>
<#include getContentItemTemplate("org.librecms.contentsection.ContentItem", view, style)>
</#if>
</#macro>
<#--doc
Retrieve the title of a content item.
@param item The content item.
@return The title of the content item.
-->
<#function getItemTitle item>
<#return item.title>
</#function>
<#--doc
Get the title of the current page. This function tries several possible
sources for the title of the current page and uses to first source found.
The possible sources are:
* The title of the primary content item. For items of the types
Glossary Item and FAQ Item special titles are used.
* If the title `AtoZ` is provided by Bebop the localized text
`layout.page.title.atoz` used.
* If the title `Search` is provided by Bebop
@param useCategoryMenu The name of the category menu to use for retrieving
the page title.
@param useRootIndexItemTitle Wether to use the title of the index item of
the root category as page title.
@return The title of the current page.
-->
<#function getPageTitle useCategoryMenu='categoryMenu' useRootIndexItemTitle=false>
<#if contentItem??>
<#return contentItem.title>
<#elseif (application == 'login')>
<#return getLocalizedText('layout.page.title.login')>
<#elseif (application == 'sitemap'))>
<#return getLocalizedText('layout.page.title.sitemap')>
<#elseif (application == 'PublicPersonalProfile')>
<#return model["/bebop:page/nav:greetingItem/cms:item/title"].@@text>
<#else>
<#return pageTitle>
</#if>
</#function>
<#--doc
Retrieves the summary/lead text of an content item. The function
will check several possible sources.
@param item The item from which the the summary is read.
@return The value of the `summary` or `lead` property or the provided
content item. If the content item does not have a such a property an
empty string is returned.
-->
<#function getItemSummary item>
<#if (item.lead??)>
<#return item.lead>
<#elseif (item.summary??)>
<#return item.summary>
<#else>
<#return "">
</#if>
</#function>
<#--doc
Retrieve the value the `pageDescription` property of a conten item.
If the provided content item does not have a `pageDescription` property
an empty string is returned.
@param item The content item from which the description is read.
@return The value of the `pageDescription` property of the provided content
item. If the provided content item does not have such a property an
empty string is returned.
-->
<#function getPageDescription item>
<#if (item.pageDescription??)>
<#return item.pageDescription>
<#else>
<#return "">
</#if>
</#function>
<#--doc
Generated a link to a content using the OID of the content item.
@param oid The OID of the content.
@return A link to the content item identified by the provided OID.
-->
<#function generateContentItemLink oid>
<#return "./${oid}">
</#function>
<#--doc
Generates the the edit link for the provided content item. The link
is generated using the `editLink` property which is only present in the
model if the current user is permitted to edit the item.
@param item The item for which the edit link is generated.
@return An edit link for the item. If the provided item does not have an
`editLink` property an empty string is returned.
-->
<#function getEditLink item>
<#if (item.editLink??)>
<#return item.editLink>
<#else>
<#return "">
</#if>
</#function>

340
ccm-cms/src/main/resources/themes/freemarker/ccm-cms/event-item.ftl 100644
View File

@ -0,0 +1,340 @@
<#import "./article-item.ftl" as Article>
<#--filedoc
Functions for processing Event items.
-->
<#--doc
Gets the lead text of an event item
@param item The event item to use.
@return The lead text of the event item.
-->
<#function getLead item>
<#return Article.getLead(item)>
</#function>
<#--doc
Gets the main text of an event item
@param item The event item to use.
@return The main of the event item.
-->
<#function getMainText item>
<#return Article.getMainText(item)>
</#function>
<#--doc
Gets the end date of an event item
@param item The news event to use.
@return The date of the event item.
-->
<#function getEndDate item format="yyyy-MM-dd hh:mm">
<#return item.endDate?string(format)>
</#function>
<#--doc
Gets the year of the end date of the event.
@param item The event item to use.
@return The year of the end date of the event.
-->
<#function getEndDateYear item>
<#return item.endDate?("YYYY")>
</#function>
<#--doc
Gets the month of the end date of the event.
@param item The event item to use.
@return The month of the end date of the event.
-->
<#function getEndDateMonth item>
<#return item.endDate?string("MM")>
</#function>
<#--doc
Gets the day of the end date of the event.
@param item The event item to use.
@return The day of the end date of the event.
-->
<#function getEndDateDay item>
<#return item.endDate?string("dd")>
</#function>
<#--doc
Gets the short name of the day of the end date of the event.
@param item The event item to use.
@return The short name of the day of the end date of the event.
-->
<#function getEndDateDayNameShort item>
<#return item.endDate?string("E")>
</#function>
<#--doc
Gets the end time of the event.
@param item The event item to use.
@return The end time of the event.
-->
<#function getEndTime item format="hh:mm">
<#return item.endDate?string(format)>
</#function>
<#--doc
Gets the hour of the end time of the event.
@param item The event item to use.
@return The hour of the end time of the event.
-->
<#function getEndTimeHour item>
<#return item.endDate?string("hh")>
</#function>
<#--doc
Gets the minute of the end time of the event.
@param item The event item to use.
@return The minute of the end time of the event.
-->
<#function getEndTimeMinute item>
<#return item.endDate?string("mm")>
</#function>
<#--doc
Gets the second of the end time of the event.
@param item The event item to use.
@return The second of the end time of the event.
-->
<#function getEndTimeSecond item>
<#return item.endDate?string("ss")>
</#function>
<#--doc
Gets the start date of an event item
@param item The news event to use.
@return The start of the event item.
-->
<#function getStartDate item format="yyyy-MM-dd hh:mm:ss">
<#return item.startDate?string(format)>
</#function>
<#--doc
Gets the year of the start date of the event.
@param item The event item to use.
@return The year of the start date of the event.
-->
<#function getStartDateYear item>
<#return item.startDate?string("yyyy")>
</#function>
<#--doc
Gets the month of the start date of the event.
@param item The event item to use.
@return The month of the start date of the event.
-->
<#function getStartDateMonth item>
<#return item.startDate?string("MM")>
</#function>
<#--doc
Gets the day of the start date of the event.
@param item The event item to use.
@return The day of the start date of the event.
-->
<#function getStartDateDay item>
<#return item.startDate?string("dd")>
</#function>
<#--doc
Gets the short name of the day of the start date of the event.
@param item The event item to use.
@return The short name of the day of the start date of the event.
-->
<#function getStartDateDayNameShort item>
<#return item.startDate?string("E")>
</#function>
<#--doc
Gets the start time of the event.
@param item The event item to use.
@return The start time of the event.
-->
<#function getStartTime item format="hh:mm">
<#return item.startDate?string(format)>
</#function>
<#--doc
Determines if the provided event item has a start time
@param item The event item to use.
@return `true` if the provided event item has a start time, `false` otherwise.
-->
<#function hasStartTime item>
<#return item.startDate??>
</#function>
<#--doc
Determines if the provided event item has a end time
@param item The event item to use.
@return `true` if the provided event item has a end time, `false` otherwise.
-->
<#function hasEndTime item>
<#return item.endDate??>
</#function>
<#--doc
Determines if the provided event item has a start date.
@param item The event item to use.
@return `true` if the provided event item has a start date, `false` otherwise.
-->
<#function hasStartDate item>
<#return item.startDate??>
</#function>
<#--doc
Determines if the provided event item has a end date.
@param item The event item to use.
@return `true` if the provided event item has a end date, `false` otherwise.
-->
<#function hasEndDate item>
<#return item.endDate??>
</#function>
<#--doc
Gets the hour of the start time of the event.
@param item The event item to use.
@return The hour of the start time of the event.
-->
<#function getStartTimeHour item>
<#return item.startDate?string("hh")>
</#function>
<#--doc
Gets the minute of the start time of the event.
@param item The event item to use.
@return The minute of the start time of the event.
-->
<#function getstartTimeMinute item>
<#return item.startDate?string("mm")>
</#function>
<#--doc
Gets the second of the start time of the event.
@param item The event item to use.
@return The second of the start time of the event.
-->
<#function getstartTimeSecond item>
<#return item.startTime?string("ss")>
</#function>
<#--doc
Gets the location of the event.
@param item The event item to use.
@return The value of the `location` property of the event.
-->
<#function getLocation(item)>
<#return item.location>
</#function>
<#--doc
Gets the main contributor of the event.
@param item The event item to use.
@return The value of the `mainContributor` property of the event.
-->
<#function getMainContributor item>
<#return item.mainContributor>
</#function>
<#--doc
Gets the type of the event.
@param item The event item to use.
@return The value of the `eventType` property of the event.
-->
<#function getEventType item>
<#return item.eventType>
</#function>
<#--doc
Gets the cost of the event.
@param item The event item to use.
@return The value of the `cost` property of the event.
-->
<#function getCost item>
<#return item.cost]>
</#function>
<#--doc
Gets the map link for the event.
@param item The event item to use.
@return The value of the `mapLink` property of the event.
-->
<#function getMapLink item>
<#return item.mapLink>
</#function>
<#--doc
Gets the addendium of the event.
@param item The event item to use.
@return The value of the `eventDate` property of the event.
-->
<#function getEventDateAddendum item>
<#return item.eventDate>
</#function>

41
ccm-cms/src/main/resources/themes/freemarker/ccm-cms/file-attachments.ftl 100644
View File

@ -0,0 +1,41 @@
<#--filedoc
Functions for processing file attachments.
-->
<#--doc
Gets the file attachements of an content item.
@param item The content item providing the file attachments.
@return A sorted sequence of hashes (see Freemarker documentation) containing
the data the file attachments. The following keys are available:
* `fileType`: Type of the attachments. Either `file` or `caption`
* `mimeType`: The mime type of the file.
* `mimeTypeLabel`: A human readable label for the mime type.
* `fileSize`: The size of the file.
* `fileExtension`: The extension part of the file name.
* `fileId`: The ID of the file.
* `fileName`: The name of the file.
* `description`: The description of the file attachment.
* `fileUrl`: The URL for downloading the file.
* `fileOrder`: The value of the order property of the file attachment.
-->
<#function getFileAttachments item>
<#return item.fileAttachments>
</#function>
<#--doc
*Internal* function for determing the type of a file attachment.
@param file The file attachment.
@depcrecated without replacement.
@return The type the file. Starting with version 7.0.0 always `file`.
-->
<#function _getFileType file>
<#return "file">
</#function>

16
ccm-cms/src/main/resources/themes/freemarker/ccm-cms/image-attachments.ftl 100644
View File

@ -0,0 +1,16 @@
<#--filedoc
Provides functions for processing the image attachemnts of a content item.
-->
<#--doc
Creates a sorted sequence of hashes (see Freemarker docuementation) for the
image attachments of a content item.
@param item The model of the content item to use.
@return The images attached to the provided item.
-->
<#function getImageAttachments item>
<#return item.imageAttachments>
</#function>

460
ccm-cms/src/main/resources/themes/freemarker/ccm-cms/item-list.ftl 100644
View File

@ -0,0 +1,460 @@
<#--filedoc
Functions for accessing item lists and their properties.
-->
<#--doc
Retrieve the item (models) of an object list. This function can deal with
several different types of object lists, including `SimpleObjectList`,
`ComplexObjectList` and `CustomziableObjectList`.
@param listId The ID of the object list from the the items are retrieved.
@param containerId The ID of the container of the list
@return The models for the entries in the object list. If no list with
the provided `listId` is found and empty sequence is returned.
-->
<#function getItems listId containerId="container">
<#return containerId?eval[listId].items>
</#function>
<#--doc
Gets the number of objects/items in an object list.
@param listId The ID of the object list to use.
@param containerId The ID of the container of the list
@return The number of objects in the list. If no list with the provided
`listId` is found `0` is returned.
-->
<#function getObjectCount listId containerId="container">
<#return getItems(listId, containerId)?size>
</#function>
<#--doc
Gets the base URL for the paginator of an object list.
@param listId The ID of the object list to use.
@param containerId The ID of the container of the list
@return The base URL for the the paginator.
-->
<#function getPaginatorBaseUrl listId containerId="container">
<#return containerId?eval[listId].paginator.baseUrl
</#function>
<#--doc
Gets the index of the first item shown on the current page.
@param listId The ID of the object list to use.
@param containerId The ID of the container of the list
@return The index of the first item shown on the current page.
-->
<#function getPaginatorBegin listId containerId="container">
<#return containerId?eval[listId].paginator.start>
</#function>
<#--doc
Gets the index of the last item shown on the curent page.
@param listId The ID of the object list to use.
@param containerId The ID of the container of the list
@return The index of the last item shown on the current page.
-->
<#function getPaginatorEnd listId containerId="container">
<#return containerId?eval[listId].paginator.end>
</#function>
<#--doc
Get the number of pages of an object list.
@param listId The ID of the object list to use.
@param containerId The ID of the container of the list
@return The number of pages of the object list. If no list with the
provided `listId` is found the function will return `0`.
-->
<#function getPageCount listId containerId="container">
<#return containerId?eval[listId].paginator.pageCount
</#function>
<#--doc
Gets the number of the current page.
@param listId The ID of the object list to use.
@param containerId The ID of the container of the list
@return The number of the page currently shown.
-->
<#function getPageNumber listId containerId="container">
<#return containerId?eval[listId].paginator.pageNumber>
</#function>
<#--doc
Gets the name of the page URL parameter.
@param listId The ID of the object list to use.
@param containerId The ID of the container of the list
@return The name of the page URL parameter.
-->
<#function getPageParam listId containerId="container">
<#return containerId?eval[listId].paginator.pageParam>
</#function>
<#--doc
Gets the maximum number of items on a page.
@param listId The ID of the object list to use.
@param containerId The ID of the container of the list
@return The maxium number of items on a page.
-->
<#function getPageSize listId containerId="container">
<#return containerId?eval[listId].paginator.pageSize>
</#function>
<#--doc
Gets the link to the previous page.
@param listId The ID of the object list to use.
@param containerId The ID of the container of the list
@return The link to the previous page.
-->
<#function getPrevPageLink listId containerId="container">
<#return containerId?eval[listId].paginator.prevPageLink>
</#function>
<#--doc
Gets the link to the next page.
@param listId The ID of the object list to use.
@param containerId The ID of the container of the list
@return The link to the next page.
-->
<#function getNextPageLink listId containerId="container">
<#return containerId?eval[listId].paginator.nextPageLink>
</#function>
<#--doc
Gets the link to the first page.
@param listId The ID of the object list to use.
@param containerId The ID of the container of the list
@return The link to the first page.
-->
<#function getFirstPageLink listId containerId="container">
<#return containerId?eval[listId].paginator.firstPageLink>
</#function>
<#--doc
Gets the link to the last page.
@param listId The ID of the object list to use.
@param containerId The ID of the container of the list
@return The link to the last page.
-->
<#function getLastPageLink listId containerId="container">
<#return containerId?eval[listId].paginator.lastPageLink>
</#function>
<#--doc
Gets the title of an item from an object list.
@param item The model of the list entry for the item.
@param containerId The ID of the container of the list
@depcrecated Use the title property of the item directly
@return The title of the item.
-->
<#function getItemTitle item>
<#return item.title>
</#function>
<#--doc
Gets the link to the detail view of an item in a list.
@param item The model of the list entry for the item.
@return The link to the detail view of the item.
-->
<#function getItemLink item>
<#return "./" + item.name>
</#function>
<#--doc
Checks if the model of the list entry of an item contains a value for the
`lead` property.
@param item The model of the list entry for the item.
@return `true` if the model provides a value of the `lead` property,
`false` if not.
-->
<#function hasItemLead item>
<#return item.lead??>
</#function>
<#--doc
Gets the value of the `lead` property of an item.
@param item The model of the list entry for the item.
@return The value of the `lead` property.
-->
<#function getItemLead item>
<#return item.lead>
</#function>
<#--doc
A generic function for checking if the model of a list entry for an item
has a specific property.
@param item The model of the list entry for the item.
@param property The name of the property to check for.
@return `true` If the provided model provides an value for the property,
`false` if not.
-->
<#function hasItemProperty item property>
<#return false>
</#function>
<#--doc
A generic function for retrieving the value of an property from the model
for a list entry for an item.
@param item The model of the list entry for the item.
@param property The name of the property to retrieve.
@return The value of the property.
-->
<#function getItemProperty item property>
<#return "">
</#function>
<#--doc
Checks if the provided item has an associated image.
@param item The model of the list entry for the item.
@return `true` if the item has an associated image, `false` if not.
-->
<#function hasImage item>
<#return false>
</#function>
<#--doc
Get the ID of an associated image.
@param item The model of the list entry for the item.
@return The ID of the associated image.
-->
<#function getImageId item>
<#return "">
</#function>
<#--doc
Generates the URL for an associated image.
@param item The model of the list entry for the item.
@return The URL of the associated image.
-->
<#function getImageUrl item>
<#return "">
</#function>
<#--doc
Gets the caption for the associated image.
@param item The model of the list entry for the item.
@return The caption for the associated image.
-->
<#function getImageCaption item>
<#return "">
</#function>
<#--doc
Retrieves the filters for an object list.
@param listId The ID of the list to use.
@return The filters for the list. An empty sequence is returned if no list
with the provided `listId` could be found or if the list does not have any filters.
-->
<#function getFilters listId containerId="container">
<#return []>
</#function>
<#--doc
Get the label of a filter.
@param filter model of a filter as returned by `getFilters`.
@return The label of the filter.
-->
<#function getFilterLabel filter>
<#return "">
</#function>
<#--doc
Get the type of a filter.
@param filter model of a filter as returned by `getFilters`.
@return The type of the filter.
-->
<#function getFilterType filter>
<#return "">
</#function>
<#--doc
Get the options of a select filter.
@param filter model of a filter as returned by `getFilters`.
@return The options of the select filter.
-->
<#function getSelectFilterOptions filter>
<#return []>
</#function>
<#--doc
Get the currently selected option of a select filter.
@param filter model of a filter as returned by `getFilters`.
@return The currently selected option.
-->
<#function getSelectFilterSelection filter>
<#return "">
</#function>
<#--doc
The label for an option of a select filter.
@param filter model of an option as returned by `getSelectFilterOptions`.
@return The label of the option.
-->
<#function getSelectFilterOptionLabel option>
<#return "">
</#function>
<#--doc
Gets the search string of an category filter.
@param filter model of a filter as returned by `getFilters`.
@return The search string.
-->
<#function getCategoryFilterSearchString filter>
<#return "">
</#function>
<#--doc
Gets the separator for a category filter.
@param filter The model of a filter as returned by `getFilters`.
@return The separator for separating the categories in the search string.
-->
<#function getCategoryFilterSeparator filter>
<#return "">
</#function>
<#--doc
Determines if a category allows the selection of multiple categories.
@param filter The model of a filter as returned by `getFilters`.
@return `true` if the filter allows multiple selections, `false` otherwise.
-->
<#function getCategoryFilterMultiple filter>
<#return false>
</#function>
<#--doc
Gets the selectable categories for a category filter.
@param filter The model of a filter as returned by `getFilters`.
@return The selectable categories.
-->
<#function getCategoryFilterCategories filter>
<#return []>
</#function>
<#--doc
Gets the groups of a category filter.
@param filter The model of a filter as returned by `getFilters`.
@return The groups of a category filter.
-->
<#function getCategoryFilterCategoryGroups filter>
<#return []>
</#function>
<#--doc
Gets the label of a category group.
@param group The model of a category group as returned by
`getCategoryFilterCategoryGroups`.
@return The label for the group.
-->
<#function getCategoryGroupLabel group>
<#return "">
</#function>
<#--doc
Gets the categories in a group.
@param group The model of a category group as returned by
`getCategoryFilterCategoryGroups`.
@return The categories in the group.
-->
<#function getCategoryFilterCategoryGroupsCategories groups>
<#return "">
</#function>
<#--doc
Gets the ID of a category of a category filter.
@param category The model of a category as returned by
`getCategoryFilterCategoryGroupsCategories`.
@return The ID of the category.
-->
<#function getCategoryFilterCategoryId category>
<#return "">
</#function>
<#--doc
Gets the label of a category of a category filter.
@param category The model of a category as returned by
`getCategoryFilterCategoryGroupsCategories`.
@return The label of the category.
-->
<#function getCategoryFilterCategoryLabel category>
<#return "">
</#function>

49
ccm-cms/src/main/resources/themes/freemarker/ccm-cms/multiparticle-item-toc.ftl 100644
View File

@ -0,0 +1,49 @@
<#--filedoc
Functions for creating the table of contents of a multi part article.
-->
<#--doc
Gets the sections of a multi part article.
@param item The model of the multi part article to use.
@return The sections of the multi part article.
-->
<#function getSections item>
<#return item.toc.sections"]>
</#function>
<#--doc
Gets the title of a section.
@param section The model of the section as returned by `getSections`.
@return The title of the section.
-->
<#function getSectionTitle section>
<#return section.title>
</#function>
<#--doc
Gets the link for the section.
@param section The model of the section as returned by `getSections`.
@return The link for the section.
-->
<#function getSectionLink section>
<#return section.link>
</#function>
<#--doc
Determines of the provided section is the active section.
@param item The model of the multi part article to use.
@param section The model of the section as returned by `getSections`.
@return `true` if the provided section is the active section, `false` otherwise.
-->
<#function isActiveSection item section>
<#return section.rank == item.rank>
</#function>

147
ccm-cms/src/main/resources/themes/freemarker/ccm-cms/multiparticle-item.ftl 100644
View File

@ -0,0 +1,147 @@
<#--filedoc
Functions for processing MultiPartArticles.
-->
<#--doc
Get the summary of a multi part article.
@param item The model of the multi part article to use.
@return The summary of the multi part article.
-->
<#function getSummary item>
<#return item.summary>
</#function>
<#--doc
Get the visible sections of a multi part article.
@param item The model of the multi part article to use.
@return The visible sections of the multi part article.
-->
<#function getSections item>
<#return item.sections>
</#function>
<#--doc
Gets the title of a section.
@param section The model of the section to use, as returned by `getSections`.
@return The title of the section.
-->
<#function getSectionTitle section>
<#return section.title>
</#function>
<#--doc
Gets the content of a section.
@param section The model of the section to use, as returned by `getSections`.
@return The content of the section.
-->
<#function getSectionContent section>
<#return section.text>
</#function>
<#--doc
Gets the rank (sort key) of a section.
@param section The model of the section to use, as returned by `getSections`.
@return The rank of the section.
-->
<#function getSectionRank section>
<#return section.rank>
</#function>
<#--doc
Gets the number of the current page.
@param item The model of the multi part article to use.
@return The number of the current page.
-->
<#function getPageNumber item>
<#return item.pageNumber>
</#function>
<#--doc
Gets the number of the pages.
@param item The model of the multi part article to use.
@return The number of the pages.
-->
<#function getNumberOfPages item>
<#return item.numberOfPages>
</#function>
<#--doc
Determines if a link to the previous page is available.
@param item The model of the multi part article to use.
@return `true` if the link is available, `false` otherwise.
-->
<#function hasPreviousPage item>
<#return (item.pageNumber != "all" && item.numberOfPages > 1)>
</#function>
<#--doc
Determines if a link to the next page is available.
@param item The model of the multi part article to use.
@return `true` if the link is available, `false` otherwise.
-->
<#function hasNextPage item>
<#return (item.pageNumber != "all" && item.pageNumber < itemnumberOfPages)>
</#function>
<#--doc
Determines of the multi part article has multiple pages.
@param item The model of the multi part article to use.
@return `true` if the article has multiple pages, `false` otherwise.
-->
<#function hasMultiplePages item>
<#return item.pageNumber != "all" && item.pageNumber != "1">
</#function>
<#--doc
Gets the link to the previous page.
@param item The model of the multi part article to use.
@return The link to the previous page.
-->
<#function getLinkToPreviousPage item>
<#return "?page${item.pageNumber - 1}">
</#function>
<#--doc
Gets the link to the next page.
@param item The model of the multi part article to use.
@return The link to the next page.
-->
<#function getLinkToNextPage item>
<#return "?page${item.pageNumber + 1}">
</#function>
<#--doc
Gets the link for showing all sections on one page..
@param item The model of the multi part article to use.
@return The link for showing all sections on one page.
-->
<#function getAllSectionsLink item>
<#return "?page=all">
</#function>

127
ccm-cms/src/main/resources/themes/freemarker/ccm-cms/news-item.ftl 100644
View File

@ -0,0 +1,127 @@
<#import "/ccm-cms/article-item.ftl" as Article>
<#--filedoc
Functions for News items
-->
<#--doc
Gets the lead text of a news item
@param item The news item to use.
@return The lead text of the news item.
-->
<#function getLead item>
<#return Article.getLead(item)>
</#function>
<#--doc
Gets the main text of a news item
@param item The news item to use.
@return The main of the news item.
-->
<#function getMainText item>
<#return Article.getMainText(item)>
</#function>
<#--doc
Gets the date of a news item
@param item The news item to use.
@return The date of the news item.
-->
<#function getNewsDate item format="yyyy-MM-dd">
<#return item.newDate?string(format)>
</#function>
<#--doc
Gets the year of the news date.
@param item The news item to use.
@return The year of the news date.
-->
<#function getNewsDateYear item>
<#return item.newsDate?string("yyyy")>
</#function>
<#--doc
Gets the month of the news date.
@param item The news item to use.
@return The month of the news date.
-->
<#function getNewsDateMonth item>
<#return item.newsDate?string("mm")>
</#function>
<#--doc
Gets the day of the news date.
@param item The news item to use.
@return The day of the news date.
-->
<#function getNewsDateDay item>
<#return item.newDate?string("dd")>
</#function>
<#--doc
Gets the short name of the day of the news date.
@param item The news item to use.
@return The short name of the day of the news date.
-->
<#function getNewsDateDayNameShort item>
<#return item.newDate?string("E")>
</#function>
<#--doc
Gets the hour of the news date.
@param item The news item to use.
@return The hour of the news date.
-->
<#function newsDateHour item>
<#return item.newDate?string("hh")>
</#function>
<#--doc
Gets the minute of the news date.
@param item The news item to use.
@return The minute of the news date.
-->
<#function newsDateMinute item>
<#return item.newDate?string("mm")>
</#function>
<#--doc
Gets the second of the news date.
@param item The news item to use.
@return The second of the news date.
-->
<#function newsDateSecond item>
<#return item.newDate?string("ss")>
</#function>
<#--doc
Gets the news date in ISO format (`yyyy-mm-dd HH:mm:ss`).
@param item The news item to use.
@return The in ISO format.
-->
<#function getNewsDateIso item>
<#return news.newsDate?string("yyyy-MM-dd hh:mm:ss")>
</#function>

Some files were not shown because too many files have changed in this diff Show More