Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dariah
dariahsp
Commits
c1d0a5b7
Commit
c1d0a5b7
authored
Oct 06, 2017
by
Gradl, Tobias
Browse files
DME 830: Export and import of mappings / Upgrade of metamodel
Task-Url:
https://minfba.de.dariah.eu/mantisbt/view.php?id=830
parent
f84bca33
Changes
8
Hide whitespace changes
Inline
Side-by-side
dariahsp-core/pom.xml
View file @
c1d0a5b7
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
eu.dariah.de
</groupId>
<artifactId>
dariahsp
</artifactId>
<version>
1.
0
.0-SNAPSHOT
</version>
<version>
1.
1
.0-SNAPSHOT
</version>
</parent>
<artifactId>
dariahsp-core
</artifactId>
<name>
dariahsp - core library
</name>
...
...
@@ -18,14 +18,14 @@
</dependency>
<dependency>
<groupId>
de.unibamberg.minf.
dme.
core
</groupId>
<groupId>
de.unibamberg.minf.core
</groupId>
<artifactId>
core-metamodel
</artifactId>
<version>
${de.unibamberg.minf.
dm
e.core-metamodel.version}
</version>
<version>
${de.unibamberg.minf.
cor
e.core-metamodel.version}
</version>
</dependency>
<dependency>
<groupId>
eu.dariah.de
.minf
ba
.core
</groupId>
<groupId>
de.unibamberg
.minf.core
</groupId>
<artifactId>
core-util
</artifactId>
<version>
${
eu.dariah.de.minfba
.core-util.version}
</version>
<version>
${
de.unibamberg.minf.core
.core-util.version}
</version>
</dependency>
<dependency>
<groupId>
eu.dariah.eu
</groupId>
...
...
dariahsp-core/src/main/java/eu/dariah/de/dariahsp/local/LocalUserConf.java
View file @
c1d0a5b7
package
eu.dariah.de.dariahsp.local
;
import
eu.dariah.de
.minf
ba
.core.util.conversion.BaseConfigurationConvertible
;
import
de.unibamberg
.minf.core.util.conversion.BaseConfigurationConvertible
;
public
class
LocalUserConf
extends
BaseConfigurationConvertible
{
private
static
final
long
serialVersionUID
=
5019731121422808251L
;
...
...
dariahsp-core/src/main/java/eu/dariah/de/dariahsp/saml/attributequery/options/SAMLAttributeGroup.java
View file @
c1d0a5b7
...
...
@@ -2,9 +2,9 @@ package eu.dariah.de.dariahsp.saml.attributequery.options;
import
java.util.List
;
import
de.unibamberg.minf.core.util.conversion.BaseConfigurationConvertible
;
import
eu.dariah.de.dariahsp.Constants.REQUIRED_ATTRIBUTE_CHECKLOGIC
;
import
eu.dariah.de.dariahsp.saml.model.SAMLAttribute
;
import
eu.dariah.de.minfba.core.util.conversion.BaseConfigurationConvertible
;
public
class
SAMLAttributeGroup
extends
BaseConfigurationConvertible
{
private
static
final
long
serialVersionUID
=
-
7188665456657464324L
;
...
...
dariahsp-core/src/main/java/eu/dariah/de/dariahsp/saml/attributequery/options/SAMLRequiredAttributes.java
View file @
c1d0a5b7
package
eu.dariah.de.dariahsp.saml.attributequery.options
;
import
java.util.List
;
import
de.unibamberg.minf.core.util.conversion.BaseConfigurationConvertible
;
import
eu.dariah.de.dariahsp.Constants.AUTHENTICATION_STAGE
;
import
eu.dariah.de.minfba.core.util.conversion.BaseConfigurationConvertible
;
public
class
SAMLRequiredAttributes
extends
BaseConfigurationConvertible
{
private
static
final
long
serialVersionUID
=
2303075498393395435L
;
...
...
dariahsp-core/src/main/java/eu/dariah/de/dariahsp/saml/model/SAMLAttribute.java
View file @
c1d0a5b7
package
eu.dariah.de.dariahsp.saml.model
;
import
eu.dariah.de
.minf
ba
.core.util.conversion.BaseConfigurationConvertible
;
import
de.unibamberg
.minf.core.util.conversion.BaseConfigurationConvertible
;
public
class
SAMLAttribute
extends
BaseConfigurationConvertible
{
private
static
final
long
serialVersionUID
=
-
926489867985009574L
;
...
...
dariahsp-sample/pom.xml
View file @
c1d0a5b7
...
...
@@ -3,7 +3,7 @@
<parent>
<groupId>
eu.dariah.de
</groupId>
<artifactId>
dariahsp
</artifactId>
<version>
1.
0
.0-SNAPSHOT
</version>
<version>
1.
1
.0-SNAPSHOT
</version>
</parent>
<artifactId>
dariahsp-sample
</artifactId>
<packaging>
war
</packaging>
...
...
@@ -12,7 +12,7 @@
<properties>
<org.apache.tiles-version>
3.0.7
</org.apache.tiles-version>
<
eu.dariah.de.minfba
.core-web.version>
1.5
.0-SNAPSHOT
</
eu.dariah.de.minfba
.core-web.version>
<
de.unibamberg.minf.core
.core-web.version>
2.0
.0-SNAPSHOT
</
de.unibamberg.minf.core
.core-web.version>
</properties>
<dependencies>
...
...
@@ -23,9 +23,9 @@
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
eu.dariah.de
.minf
ba
.core
</groupId>
<groupId>
de.unibamberg
.minf.core
</groupId>
<artifactId>
core-web
</artifactId>
<version>
${
eu.dariah.de.minfba
.core-web.version}
</version>
<version>
${
de.unibamberg.minf.core
.core-web.version}
</version>
</dependency>
<!-- Spring -->
...
...
dariahsp-sample/src/main/resources/spring/config-context.xml
View file @
c1d0a5b7
...
...
@@ -14,7 +14,7 @@
<property
name=
"resources"
ref=
"configLocation"
/>
</bean>
<bean
class=
"
eu.dariah.de
.minf
ba
.core.util.init.ListAwarePropertySourcesPlaceholderConfigurer"
>
<bean
class=
"
de.unibamberg
.minf.core.util.init.ListAwarePropertySourcesPlaceholderConfigurer"
>
<property
name=
"properties"
ref=
"properties"
/>
<property
name=
"objectMapper"
ref=
"objectMapper"
/>
<property
name=
"conversionService"
ref=
"conversionService"
/>
...
...
@@ -23,7 +23,7 @@
<bean
id=
"conversionService"
class=
"org.springframework.context.support.ConversionServiceFactoryBean"
>
<property
name=
"converters"
>
<list>
<bean
class=
"
eu.dariah.de
.minf
ba
.core.util.conversion.JsonToStringConverter"
/>
<bean
class=
"
de.unibamberg
.minf.core.util.conversion.JsonToStringConverter"
/>
</list>
</property>
</bean>
...
...
pom.xml
View file @
c1d0a5b7
...
...
@@ -3,7 +3,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
eu.dariah.de
</groupId>
<artifactId>
dariahsp
</artifactId>
<version>
1.
0
.0-SNAPSHOT
</version>
<version>
1.
1
.0-SNAPSHOT
</version>
<name>
dariahsp - parent pom
</name>
<description>
Metapackage for the DARIAH Service Provider (dariahsp) library
</description>
<packaging>
pom
</packaging>
...
...
@@ -20,8 +20,8 @@
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<de.unibamberg.minf.
dm
e.core-metamodel.version>
4.
1
.0-SNAPSHOT
</de.unibamberg.minf.
dm
e.core-metamodel.version>
<
eu.dariah.de.minfba
.core-util.version>
1.1
.0-SNAPSHOT
</
eu.dariah.de.minfba
.core-util.version>
<de.unibamberg.minf.
cor
e.core-metamodel.version>
4.
2
.0-SNAPSHOT
</de.unibamberg.minf.
cor
e.core-metamodel.version>
<
de.unibamberg.minf.core
.core-util.version>
2.0
.0-SNAPSHOT
</
de.unibamberg.minf.core
.core-util.version>
<org.springframework-version>
4.3.6.RELEASE
</org.springframework-version>
<org.springsecurity-version>
4.2.1.RELEASE
</org.springsecurity-version>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment