Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Robert von Burg 2016-07-04 18:24:05 +02:00
parent 285b43bd23 d20e63553b
commit 2dd8a723ae
623 changed files with 36683 additions and 1693 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitmodules vendored
View File

@ -1,12 +0,0 @@
[submodule "ch.eitchnet.parent"]
path = ch.eitchnet.parent
url = https://github.com/eitchnet/ch.eitchnet.parent.git
[submodule "ch.eitchnet.utils"]
path = ch.eitchnet.utils
url = https://github.com/eitchnet/ch.eitchnet.utils.git
[submodule "ch.eitchnet.privilege"]
path = ch.eitchnet.privilege
url = https://github.com/eitchnet/ch.eitchnet.privilege.git
[submodule "ch.eitchnet.xmlpers"]
path = ch.eitchnet.xmlpers
url = https://github.com/eitchnet/ch.eitchnet.xmlpers.git

34
README.md
View File

@ -26,36 +26,4 @@ Find more to Strolch at our website: http://strolch.li
Build status Build status
=================== ===================
[![Build Status](http://jenkins.eitchnet.ch/view/ch.eitchnet/job/ch.eitchnet.parent/badge/icon)](http://jenkins.eitchnet.ch/view/ch.eitchnet/job/ch.eitchnet.parent/) ch.eitchnet.parent [![Build Status](https://jenkins.eitchnet.ch/job/li.strolch/badge/icon)](https://jenkins.eitchnet.ch/job/li.strolch/)
[![Build Status](http://jenkins.eitchnet.ch/view/ch.eitchnet/job/ch.eitchnet.privilege/badge/icon)](http://jenkins.eitchnet.ch/view/ch.eitchnet/job/ch.eitchnet.privilege/) ch.eitchnet.privilege
[![Build Status](http://jenkins.eitchnet.ch/view/ch.eitchnet/job/ch.eitchnet.utils/badge/icon)](http://jenkins.eitchnet.ch/view/ch.eitchnet/job/ch.eitchnet.utils/) ch.eitchnet.utils
[![Build Status](http://jenkins.eitchnet.ch/view/ch.eitchnet/job/ch.eitchnet.xmlpers/badge/icon)](http://jenkins.eitchnet.ch/view/ch.eitchnet/job/ch.eitchnet.xmlpers/) ch.eitchnet.xmlpers
[![Build Status](https://jenkins.eitchnet.ch/view/strolch/job/li.strolch.model/badge/icon)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.model/) li.strolch.model
[![Build Status](https://jenkins.eitchnet.ch/view/strolch/job/li.strolch.agent/badge/icon)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.agent/) li.strolch.agent
[![Build Status](https://jenkins.eitchnet.ch/view/strolch/job/li.strolch.bom/badge/icon)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.bom/) li.strolch.bom
[![Build Status](https://jenkins.eitchnet.ch/view/strolch/job/li.strolch.dev/badge/icon)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.dev/) li.strolch.dev
[![Build Status](https://jenkins.eitchnet.ch/view/strolch/job/li.strolch.parent/badge/icon)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.parent/) li.strolch.parent
[![Build Status](https://jenkins.eitchnet.ch/view/strolch/job/li.strolch.persistence.postgresql/badge/icon)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.persistence.postgresql/) li.strolch.persistence.postgresql
[![Build Status](https://jenkins.eitchnet.ch/view/strolch/job/li.strolch.persistence.xml/badge/icon)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.persistence.xml/) li.strolch.persistence.xml
[![Build Status](https://jenkins.eitchnet.ch/view/strolch/job/li.strolch.rest/badge/icon)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.rest/) li.strolch.rest
[![Build Status](https://jenkins.eitchnet.ch/view/strolch/job/li.strolch.service/badge/icon)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.service/) li.strolch.service
[![Build Status](https://jenkins.eitchnet.ch/view/strolch/job/li.strolch.testbase/badge/icon)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.testbase/) li.strolch.testbase
[![Build Status](https://jenkins.eitchnet.ch/view/strolch/job/li.strolch.tutorialapp/badge/icon)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.tutorialapp/) li.strolch.tutorialapp
[![Build Status](https://jenkins.eitchnet.ch/view/strolch/job/li.strolch.tutorialwebapp/badge/icon)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.tutorialwebapp/) li.strolch.tutorialwebapp
[![Build Status](https://jenkins.eitchnet.ch/view/strolch/job/li.strolch.website/badge/icon)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.website/) li.strolch.website

1
ch.eitchnet.parent

@ -1 +0,0 @@
Subproject commit 538fc3c44956b57535c2c15fcf99b3602a22dd28

1
ch.eitchnet.privilege

@ -1 +0,0 @@
Subproject commit 9b05d8cbbd6bb6e176c0ae5bf3210c517a48fc93

1
ch.eitchnet.utils

@ -1 +0,0 @@
Subproject commit 49b325eca13ffe7fe9cfc51ab964b8f7decc8522

1
ch.eitchnet.xmlpers

@ -1 +0,0 @@
Subproject commit 4ba00c83d661accb6a642d77ef0eda2ffc4ef4c3

28
li.strolch.agent/pom.xml
View File

@ -1,34 +1,20 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>li.strolch</groupId> <groupId>li.strolch</groupId>
<artifactId>li.strolch.parent</artifactId> <artifactId>li.strolch</artifactId>
<version>1.1.0-SNAPSHOT</version> <version>1.2.0-SNAPSHOT</version>
<relativePath>../li.strolch.parent/pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>li.strolch.agent</artifactId> <artifactId>li.strolch.agent</artifactId>
<name>li.strolch.agent</name> <name>li.strolch.agent</name>
<description>Strolch Agent which is the runtime for Strolch</description> <description>Strolch Agent which is the runtime for Strolch</description>
<url>https://github.com/eitchnet/li.strolch.agent</url>
<inceptionYear>2011</inceptionYear> <inceptionYear>2011</inceptionYear>
<issueManagement>
<system>Github Issues</system>
<url>https://github.com/eitchnet/li.strolch.agent/issues</url>
</issueManagement>
<scm>
<connection>scm:git:https://github.com/eitchnet/strolch.git</connection>
<developerConnection>scm:git:git@github.com:eitch/strolch.git</developerConnection>
<url>https://github.com/eitchnet/strolch</url>
</scm>
<dependencies> <dependencies>
<!-- main --> <!-- main -->
<dependency> <dependency>
@ -36,8 +22,8 @@
<artifactId>li.strolch.model</artifactId> <artifactId>li.strolch.model</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ch.eitchnet</groupId> <groupId>li.strolch</groupId>
<artifactId>ch.eitchnet.privilege</artifactId> <artifactId>li.strolch.privilege</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-cli</groupId> <groupId>commons-cli</groupId>

2
li.strolch.agent/src/main/java/li/strolch/agent/api/AuditTrail.java
View File

@ -21,7 +21,7 @@ import java.util.Set;
import li.strolch.model.audit.Audit; import li.strolch.model.audit.Audit;
import li.strolch.model.audit.AuditQuery; import li.strolch.model.audit.AuditQuery;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import ch.eitchnet.utils.collections.DateRange; import li.strolch.utils.collections.DateRange;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/agent/api/ComponentContainer.java
View File

@ -18,9 +18,9 @@ package li.strolch.agent.api;
import java.util.Set; import java.util.Set;
import li.strolch.exception.StrolchException; import li.strolch.exception.StrolchException;
import li.strolch.privilege.model.Certificate;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
import li.strolch.runtime.privilege.PrivilegeHandler; import li.strolch.runtime.privilege.PrivilegeHandler;
import ch.eitchnet.privilege.model.Certificate;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/agent/api/RestrictableElement.java
View File

@ -15,7 +15,7 @@
*/ */
package li.strolch.agent.api; package li.strolch.agent.api;
import ch.eitchnet.privilege.model.Restrictable; import li.strolch.privilege.model.Restrictable;
/** /**
* A simple implementation for the {@link Restrictable} interface * A simple implementation for the {@link Restrictable} interface

2
li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchAgent.java
View File

@ -25,11 +25,11 @@ import java.util.Set;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.utils.helper.StringHelper;
import li.strolch.agent.impl.ComponentContainerImpl; import li.strolch.agent.impl.ComponentContainerImpl;
import li.strolch.runtime.configuration.ConfigurationParser; import li.strolch.runtime.configuration.ConfigurationParser;
import li.strolch.runtime.configuration.RuntimeConfiguration; import li.strolch.runtime.configuration.RuntimeConfiguration;
import li.strolch.runtime.configuration.StrolchConfiguration; import li.strolch.runtime.configuration.StrolchConfiguration;
import li.strolch.utils.helper.StringHelper;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

8
li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchBootstrapper.java
View File

@ -12,12 +12,12 @@ import org.xml.sax.Attributes;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.DefaultHandler;
import ch.eitchnet.utils.dbc.DBC;
import ch.eitchnet.utils.helper.FileHelper;
import ch.eitchnet.utils.helper.StringHelper;
import ch.eitchnet.utils.helper.XmlHelper;
import li.strolch.runtime.configuration.ConfigurationParser; import li.strolch.runtime.configuration.ConfigurationParser;
import li.strolch.runtime.configuration.StrolchConfigurationException; import li.strolch.runtime.configuration.StrolchConfigurationException;
import li.strolch.utils.dbc.DBC;
import li.strolch.utils.helper.FileHelper;
import li.strolch.utils.helper.StringHelper;
import li.strolch.utils.helper.XmlHelper;
public class StrolchBootstrapper extends DefaultHandler { public class StrolchBootstrapper extends DefaultHandler {

4
li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchComponent.java
View File

@ -23,8 +23,8 @@ import java.util.Properties;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.privilege.base.PrivilegeException; import li.strolch.privilege.base.PrivilegeException;
import ch.eitchnet.privilege.handler.SystemUserAction; import li.strolch.privilege.handler.SystemUserAction;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.ComponentConfiguration;
import li.strolch.runtime.privilege.RunRunnable; import li.strolch.runtime.privilege.RunRunnable;

2
li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchRealm.java
View File

@ -18,7 +18,7 @@ package li.strolch.agent.api;
import li.strolch.agent.impl.DataStoreMode; import li.strolch.agent.impl.DataStoreMode;
import li.strolch.model.StrolchRootElement; import li.strolch.model.StrolchRootElement;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import ch.eitchnet.privilege.model.Certificate; import li.strolch.privilege.model.Certificate;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingActivityMap.java
View File

@ -17,7 +17,6 @@ package li.strolch.agent.impl;
import java.util.List; import java.util.List;
import ch.eitchnet.utils.dbc.DBC;
import li.strolch.agent.api.ActivityMap; import li.strolch.agent.api.ActivityMap;
import li.strolch.agent.api.AuditTrail; import li.strolch.agent.api.AuditTrail;
import li.strolch.agent.api.ElementMap; import li.strolch.agent.api.ElementMap;
@ -25,6 +24,7 @@ import li.strolch.model.ActivityVisitor;
import li.strolch.model.activity.Activity; import li.strolch.model.activity.Activity;
import li.strolch.model.query.ActivityQuery; import li.strolch.model.query.ActivityQuery;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.utils.dbc.DBC;
/** /**
* This is the {@link AuditTrail} for {@link Activity Activities} * This is the {@link AuditTrail} for {@link Activity Activities}

4
li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingAuditMapFacade.java
View File

@ -26,8 +26,8 @@ import li.strolch.model.audit.Audit;
import li.strolch.model.audit.AuditQuery; import li.strolch.model.audit.AuditQuery;
import li.strolch.model.audit.AuditVisitor; import li.strolch.model.audit.AuditVisitor;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import ch.eitchnet.utils.collections.DateRange; import li.strolch.utils.collections.DateRange;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
/** /**
* <p> * <p>

2
li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingElementMapFacade.java
View File

@ -28,7 +28,7 @@ import li.strolch.model.StrolchRootElement;
import li.strolch.model.parameter.StringListParameter; import li.strolch.model.parameter.StringListParameter;
import li.strolch.model.parameter.StringParameter; import li.strolch.model.parameter.StringParameter;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
/** /**
* <p> * <p>

2
li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingOrderMap.java
View File

@ -24,7 +24,7 @@ import li.strolch.model.Order;
import li.strolch.model.OrderVisitor; import li.strolch.model.OrderVisitor;
import li.strolch.model.query.OrderQuery; import li.strolch.model.query.OrderQuery;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
/** /**
* This is the {@link AuditTrail} for {@link Order Orders} * This is the {@link AuditTrail} for {@link Order Orders}

2
li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingResourceMap.java
View File

@ -24,7 +24,7 @@ import li.strolch.model.Resource;
import li.strolch.model.ResourceVisitor; import li.strolch.model.ResourceVisitor;
import li.strolch.model.query.ResourceQuery; import li.strolch.model.query.ResourceQuery;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
/** /**
* This is the {@link AuditTrail} for {@link Resource Resources} * This is the {@link AuditTrail} for {@link Resource Resources}

3
li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedAuditTrail.java
View File

@ -25,12 +25,11 @@ import li.strolch.model.audit.AuditQuery;
import li.strolch.persistence.api.AuditDao; import li.strolch.persistence.api.AuditDao;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.persistence.inmemory.InMemoryAuditDao; import li.strolch.persistence.inmemory.InMemoryAuditDao;
import li.strolch.utils.collections.DateRange;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.utils.collections.DateRange;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>
*/ */

8
li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedRealm.java
View File

@ -32,11 +32,11 @@ import li.strolch.persistence.api.OrderDao;
import li.strolch.persistence.api.PersistenceHandler; import li.strolch.persistence.api.PersistenceHandler;
import li.strolch.persistence.api.ResourceDao; import li.strolch.persistence.api.ResourceDao;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.privilege.model.Certificate;
import li.strolch.privilege.model.PrivilegeContext;
import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.ComponentConfiguration;
import ch.eitchnet.privilege.model.Certificate; import li.strolch.utils.dbc.DBC;
import ch.eitchnet.privilege.model.PrivilegeContext; import li.strolch.utils.helper.StringHelper;
import ch.eitchnet.utils.dbc.DBC;
import ch.eitchnet.utils.helper.StringHelper;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

6
li.strolch.agent/src/main/java/li/strolch/agent/impl/ComponentContainerImpl.java
View File

@ -26,9 +26,6 @@ import java.util.Set;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.privilege.model.Certificate;
import ch.eitchnet.utils.helper.StringHelper;
import ch.eitchnet.utils.helper.SystemHelper;
import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ComponentContainer;
import li.strolch.agent.api.ComponentState; import li.strolch.agent.api.ComponentState;
import li.strolch.agent.api.RealmHandler; import li.strolch.agent.api.RealmHandler;
@ -36,11 +33,14 @@ import li.strolch.agent.api.StrolchAgent;
import li.strolch.agent.api.StrolchComponent; import li.strolch.agent.api.StrolchComponent;
import li.strolch.agent.api.StrolchRealm; import li.strolch.agent.api.StrolchRealm;
import li.strolch.exception.StrolchException; import li.strolch.exception.StrolchException;
import li.strolch.privilege.model.Certificate;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.ComponentConfiguration;
import li.strolch.runtime.configuration.StrolchConfiguration; import li.strolch.runtime.configuration.StrolchConfiguration;
import li.strolch.runtime.configuration.StrolchConfigurationException; import li.strolch.runtime.configuration.StrolchConfigurationException;
import li.strolch.runtime.privilege.PrivilegeHandler; import li.strolch.runtime.privilege.PrivilegeHandler;
import li.strolch.utils.helper.StringHelper;
import li.strolch.utils.helper.SystemHelper;
public class ComponentContainerImpl implements ComponentContainer { public class ComponentContainerImpl implements ComponentContainer {

5
li.strolch.agent/src/main/java/li/strolch/agent/impl/ComponentDependencyAnalyzer.java
View File

@ -23,13 +23,12 @@ import java.util.Set;
import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.ComponentConfiguration;
import li.strolch.runtime.configuration.StrolchConfiguration; import li.strolch.runtime.configuration.StrolchConfiguration;
import li.strolch.runtime.configuration.StrolchConfigurationException; import li.strolch.runtime.configuration.StrolchConfigurationException;
import li.strolch.utils.dbc.DBC;
import li.strolch.utils.helper.StringHelper;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.utils.dbc.DBC;
import ch.eitchnet.utils.helper.StringHelper;
public class ComponentDependencyAnalyzer { public class ComponentDependencyAnalyzer {
private static final Logger logger = LoggerFactory.getLogger(ComponentDependencyAnalyzer.class); private static final Logger logger = LoggerFactory.getLogger(ComponentDependencyAnalyzer.class);

3
li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultLockHandler.java
View File

@ -25,12 +25,11 @@ import li.strolch.agent.api.LockHandler;
import li.strolch.agent.api.StrolchLockException; import li.strolch.agent.api.StrolchLockException;
import li.strolch.model.Locator; import li.strolch.model.Locator;
import li.strolch.model.StrolchRootElement; import li.strolch.model.StrolchRootElement;
import li.strolch.utils.dbc.DBC;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>
*/ */

2
li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultRealmHandler.java
View File

@ -29,7 +29,7 @@ import li.strolch.exception.StrolchException;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.ComponentConfiguration;
import li.strolch.runtime.privilege.PrivilegeHandler; import li.strolch.runtime.privilege.PrivilegeHandler;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

6
li.strolch.agent/src/main/java/li/strolch/agent/impl/EmptyRealm.java
View File

@ -25,11 +25,11 @@ import li.strolch.agent.api.ResourceMap;
import li.strolch.persistence.api.PersistenceHandler; import li.strolch.persistence.api.PersistenceHandler;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.persistence.inmemory.InMemoryPersistence; import li.strolch.persistence.inmemory.InMemoryPersistence;
import li.strolch.privilege.model.Certificate;
import li.strolch.privilege.model.PrivilegeContext;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.ComponentConfiguration;
import ch.eitchnet.privilege.model.Certificate; import li.strolch.utils.dbc.DBC;
import ch.eitchnet.privilege.model.PrivilegeContext;
import ch.eitchnet.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

5
li.strolch.agent/src/main/java/li/strolch/agent/impl/InternalStrolchRealm.java
View File

@ -27,15 +27,14 @@ import li.strolch.agent.api.OrderMap;
import li.strolch.agent.api.ResourceMap; import li.strolch.agent.api.ResourceMap;
import li.strolch.agent.api.StrolchRealm; import li.strolch.agent.api.StrolchRealm;
import li.strolch.model.StrolchRootElement; import li.strolch.model.StrolchRootElement;
import li.strolch.privilege.model.PrivilegeContext;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.ComponentConfiguration;
import li.strolch.utils.dbc.DBC;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.privilege.model.PrivilegeContext;
import ch.eitchnet.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>
*/ */

2
li.strolch.agent/src/main/java/li/strolch/agent/impl/NoStrategyAuditTrail.java
View File

@ -22,7 +22,7 @@ import li.strolch.agent.api.AuditTrail;
import li.strolch.model.audit.Audit; import li.strolch.model.audit.Audit;
import li.strolch.model.audit.AuditQuery; import li.strolch.model.audit.AuditQuery;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import ch.eitchnet.utils.collections.DateRange; import li.strolch.utils.collections.DateRange;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

4
li.strolch.agent/src/main/java/li/strolch/agent/impl/StartRealms.java
View File

@ -15,8 +15,8 @@
*/ */
package li.strolch.agent.impl; package li.strolch.agent.impl;
import ch.eitchnet.privilege.handler.SystemUserAction; import li.strolch.privilege.handler.SystemUserAction;
import ch.eitchnet.privilege.model.PrivilegeContext; import li.strolch.privilege.model.PrivilegeContext;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/agent/impl/TransactionalAuditTrail.java
View File

@ -23,7 +23,7 @@ import li.strolch.model.audit.Audit;
import li.strolch.model.audit.AuditQuery; import li.strolch.model.audit.AuditQuery;
import li.strolch.persistence.api.AuditDao; import li.strolch.persistence.api.AuditDao;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import ch.eitchnet.utils.collections.DateRange; import li.strolch.utils.collections.DateRange;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

8
li.strolch.agent/src/main/java/li/strolch/agent/impl/TransactionalRealm.java
View File

@ -24,11 +24,11 @@ import li.strolch.agent.api.OrderMap;
import li.strolch.agent.api.ResourceMap; import li.strolch.agent.api.ResourceMap;
import li.strolch.persistence.api.PersistenceHandler; import li.strolch.persistence.api.PersistenceHandler;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.privilege.model.Certificate;
import li.strolch.privilege.model.PrivilegeContext;
import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.ComponentConfiguration;
import ch.eitchnet.privilege.model.Certificate; import li.strolch.utils.dbc.DBC;
import ch.eitchnet.privilege.model.PrivilegeContext; import li.strolch.utils.helper.StringHelper;
import ch.eitchnet.utils.dbc.DBC;
import ch.eitchnet.utils.helper.StringHelper;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

8
li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientRealm.java
View File

@ -18,10 +18,6 @@ package li.strolch.agent.impl;
import java.io.File; import java.io.File;
import java.text.MessageFormat; import java.text.MessageFormat;
import ch.eitchnet.privilege.model.Certificate;
import ch.eitchnet.privilege.model.PrivilegeContext;
import ch.eitchnet.utils.dbc.DBC;
import ch.eitchnet.utils.helper.StringHelper;
import li.strolch.agent.api.ActivityMap; import li.strolch.agent.api.ActivityMap;
import li.strolch.agent.api.AuditTrail; import li.strolch.agent.api.AuditTrail;
import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ComponentContainer;
@ -32,9 +28,13 @@ import li.strolch.model.xml.XmlModelSaxFileReader;
import li.strolch.persistence.api.PersistenceHandler; import li.strolch.persistence.api.PersistenceHandler;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.persistence.inmemory.InMemoryPersistence; import li.strolch.persistence.inmemory.InMemoryPersistence;
import li.strolch.privilege.model.Certificate;
import li.strolch.privilege.model.PrivilegeContext;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.ComponentConfiguration;
import li.strolch.runtime.configuration.StrolchConfigurationException; import li.strolch.runtime.configuration.StrolchConfigurationException;
import li.strolch.utils.dbc.DBC;
import li.strolch.utils.helper.StringHelper;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

12
li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
View File

@ -26,12 +26,6 @@ import java.util.Set;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.privilege.base.PrivilegeException;
import ch.eitchnet.privilege.model.Certificate;
import ch.eitchnet.privilege.model.PrivilegeContext;
import ch.eitchnet.utils.dbc.DBC;
import ch.eitchnet.utils.helper.ExceptionHelper;
import ch.eitchnet.utils.helper.StringHelper;
import li.strolch.agent.api.ActivityMap; import li.strolch.agent.api.ActivityMap;
import li.strolch.agent.api.AuditTrail; import li.strolch.agent.api.AuditTrail;
import li.strolch.agent.api.ObserverHandler; import li.strolch.agent.api.ObserverHandler;
@ -69,9 +63,15 @@ import li.strolch.model.query.StrolchQuery;
import li.strolch.model.timedstate.StrolchTimedState; import li.strolch.model.timedstate.StrolchTimedState;
import li.strolch.model.timevalue.IValue; import li.strolch.model.timevalue.IValue;
import li.strolch.model.visitor.ElementTypeVisitor; import li.strolch.model.visitor.ElementTypeVisitor;
import li.strolch.privilege.base.PrivilegeException;
import li.strolch.privilege.model.Certificate;
import li.strolch.privilege.model.PrivilegeContext;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
import li.strolch.runtime.privilege.PrivilegeHandler; import li.strolch.runtime.privilege.PrivilegeHandler;
import li.strolch.service.api.Command; import li.strolch.service.api.Command;
import li.strolch.utils.dbc.DBC;
import li.strolch.utils.helper.ExceptionHelper;
import li.strolch.utils.helper.StringHelper;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/persistence/api/AuditDao.java
View File

@ -20,7 +20,7 @@ import java.util.Set;
import li.strolch.model.audit.Audit; import li.strolch.model.audit.Audit;
import li.strolch.model.audit.AuditQuery; import li.strolch.model.audit.AuditQuery;
import ch.eitchnet.utils.collections.DateRange; import li.strolch.utils.collections.DateRange;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/persistence/api/PersistenceHandler.java
View File

@ -24,7 +24,7 @@ import li.strolch.model.Order;
import li.strolch.model.Resource; import li.strolch.model.Resource;
import li.strolch.model.activity.Activity; import li.strolch.model.activity.Activity;
import li.strolch.model.audit.Audit; import li.strolch.model.audit.Audit;
import ch.eitchnet.privilege.model.Certificate; import li.strolch.privilege.model.Certificate;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/persistence/api/StrolchTransaction.java
View File

@ -17,7 +17,6 @@ package li.strolch.persistence.api;
import java.util.List; import java.util.List;
import ch.eitchnet.privilege.model.Certificate;
import li.strolch.agent.api.ActivityMap; import li.strolch.agent.api.ActivityMap;
import li.strolch.agent.api.AuditTrail; import li.strolch.agent.api.AuditTrail;
import li.strolch.agent.api.OrderMap; import li.strolch.agent.api.OrderMap;
@ -48,6 +47,7 @@ import li.strolch.model.parameter.StringParameter;
import li.strolch.model.query.ActivityQuery; import li.strolch.model.query.ActivityQuery;
import li.strolch.model.query.OrderQuery; import li.strolch.model.query.OrderQuery;
import li.strolch.model.query.ResourceQuery; import li.strolch.model.query.ResourceQuery;
import li.strolch.privilege.model.Certificate;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
import li.strolch.service.api.Command; import li.strolch.service.api.Command;

2
li.strolch.agent/src/main/java/li/strolch/persistence/api/TransactionResult.java
View File

@ -17,7 +17,7 @@ package li.strolch.persistence.api;
import java.util.Date; import java.util.Date;
import ch.eitchnet.utils.helper.StringHelper; import li.strolch.utils.helper.StringHelper;
public class TransactionResult { public class TransactionResult {

4
li.strolch.agent/src/main/java/li/strolch/persistence/inmemory/InMemoryAuditDao.java
View File

@ -26,8 +26,8 @@ import li.strolch.model.audit.AuditQuery;
import li.strolch.persistence.api.AuditDao; import li.strolch.persistence.api.AuditDao;
import li.strolch.runtime.query.inmemory.InMemoryAuditQuery; import li.strolch.runtime.query.inmemory.InMemoryAuditQuery;
import li.strolch.runtime.query.inmemory.InMemoryAuditQueryVisitor; import li.strolch.runtime.query.inmemory.InMemoryAuditQueryVisitor;
import ch.eitchnet.utils.collections.DateRange; import li.strolch.utils.collections.DateRange;
import ch.eitchnet.utils.collections.MapOfMaps; import li.strolch.utils.collections.MapOfMaps;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/persistence/inmemory/InMemoryPersistence.java
View File

@ -25,8 +25,8 @@ import li.strolch.persistence.api.OrderDao;
import li.strolch.persistence.api.PersistenceHandler; import li.strolch.persistence.api.PersistenceHandler;
import li.strolch.persistence.api.ResourceDao; import li.strolch.persistence.api.ResourceDao;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.privilege.model.Certificate;
import li.strolch.runtime.privilege.PrivilegeHandler; import li.strolch.runtime.privilege.PrivilegeHandler;
import ch.eitchnet.privilege.model.Certificate;
public class InMemoryPersistence implements PersistenceHandler { public class InMemoryPersistence implements PersistenceHandler {

2
li.strolch.agent/src/main/java/li/strolch/persistence/inmemory/InMemoryPersistenceHandler.java
View File

@ -24,8 +24,8 @@ import li.strolch.persistence.api.OrderDao;
import li.strolch.persistence.api.PersistenceHandler; import li.strolch.persistence.api.PersistenceHandler;
import li.strolch.persistence.api.ResourceDao; import li.strolch.persistence.api.ResourceDao;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.privilege.model.Certificate;
import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.ComponentConfiguration;
import ch.eitchnet.privilege.model.Certificate;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/persistence/inmemory/InMemoryTransaction.java
View File

@ -20,8 +20,8 @@ import li.strolch.persistence.api.AbstractTransaction;
import li.strolch.persistence.api.PersistenceHandler; import li.strolch.persistence.api.PersistenceHandler;
import li.strolch.persistence.api.TransactionResult; import li.strolch.persistence.api.TransactionResult;
import li.strolch.persistence.api.TransactionState; import li.strolch.persistence.api.TransactionState;
import li.strolch.privilege.model.Certificate;
import li.strolch.runtime.privilege.PrivilegeHandler; import li.strolch.runtime.privilege.PrivilegeHandler;
import ch.eitchnet.privilege.model.Certificate;
public class InMemoryTransaction extends AbstractTransaction { public class InMemoryTransaction extends AbstractTransaction {

4
li.strolch.agent/src/main/java/li/strolch/policy/DefaultPolicyHandler.java
View File

@ -21,8 +21,6 @@ import java.lang.reflect.InvocationTargetException;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.Map; import java.util.Map;
import ch.eitchnet.utils.collections.MapOfMaps;
import ch.eitchnet.utils.helper.XmlHelper;
import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ComponentContainer;
import li.strolch.agent.api.StrolchComponent; import li.strolch.agent.api.StrolchComponent;
import li.strolch.exception.StrolchPolicyException; import li.strolch.exception.StrolchPolicyException;
@ -34,6 +32,8 @@ import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.policy.StrolchPolicyFileParser.PolicyModel; import li.strolch.policy.StrolchPolicyFileParser.PolicyModel;
import li.strolch.policy.StrolchPolicyFileParser.PolicyType; import li.strolch.policy.StrolchPolicyFileParser.PolicyType;
import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.ComponentConfiguration;
import li.strolch.utils.collections.MapOfMaps;
import li.strolch.utils.helper.XmlHelper;
/** /**
* <p> * <p>

2
li.strolch.agent/src/main/java/li/strolch/policy/StrolchPolicyFileParser.java
View File

@ -22,7 +22,7 @@ import org.xml.sax.Attributes;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.DefaultHandler;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

4
li.strolch.agent/src/main/java/li/strolch/runtime/StrolchConstants.java
View File

@ -15,12 +15,12 @@
*/ */
package li.strolch.runtime; package li.strolch.runtime;
import static ch.eitchnet.utils.helper.StringHelper.DOT; import static li.strolch.utils.helper.StringHelper.DOT;
import ch.eitchnet.privilege.handler.PrivilegeHandler;
import li.strolch.agent.api.ObserverHandler; import li.strolch.agent.api.ObserverHandler;
import li.strolch.model.StrolchModelConstants; import li.strolch.model.StrolchModelConstants;
import li.strolch.persistence.api.PersistenceHandler; import li.strolch.persistence.api.PersistenceHandler;
import li.strolch.privilege.handler.PrivilegeHandler;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/runtime/configuration/AbstractionConfiguration.java
View File

@ -24,7 +24,7 @@ import java.util.Set;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.utils.helper.StringHelper; import li.strolch.utils.helper.StringHelper;
public abstract class AbstractionConfiguration { public abstract class AbstractionConfiguration {

4
li.strolch.agent/src/main/java/li/strolch/runtime/configuration/ConfigurationParser.java
View File

@ -18,9 +18,9 @@ package li.strolch.runtime.configuration;
import java.io.File; import java.io.File;
import java.text.MessageFormat; import java.text.MessageFormat;
import ch.eitchnet.utils.dbc.DBC;
import ch.eitchnet.utils.helper.XmlHelper;
import li.strolch.runtime.configuration.ConfigurationSaxParser.ConfigurationBuilder; import li.strolch.runtime.configuration.ConfigurationSaxParser.ConfigurationBuilder;
import li.strolch.utils.dbc.DBC;
import li.strolch.utils.helper.XmlHelper;
public class ConfigurationParser { public class ConfigurationParser {

4
li.strolch.agent/src/main/java/li/strolch/runtime/configuration/ConfigurationSaxParser.java
View File

@ -43,10 +43,10 @@ import org.xml.sax.Attributes;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.DefaultHandler;
import ch.eitchnet.utils.dbc.DBC;
import ch.eitchnet.utils.helper.StringHelper;
import li.strolch.model.Locator; import li.strolch.model.Locator;
import li.strolch.model.Locator.LocatorBuilder; import li.strolch.model.Locator.LocatorBuilder;
import li.strolch.utils.dbc.DBC;
import li.strolch.utils.helper.StringHelper;
public class ConfigurationSaxParser extends DefaultHandler { public class ConfigurationSaxParser extends DefaultHandler {

8
li.strolch.agent/src/main/java/li/strolch/runtime/configuration/DbConnectionBuilder.java
View File

@ -15,10 +15,10 @@
*/ */
package li.strolch.runtime.configuration; package li.strolch.runtime.configuration;
import static ch.eitchnet.db.DbConstants.PROP_DB_IGNORE_REALM; import static li.strolch.db.DbConstants.PROP_DB_IGNORE_REALM;
import static ch.eitchnet.db.DbConstants.PROP_DB_PASSWORD; import static li.strolch.db.DbConstants.PROP_DB_PASSWORD;
import static ch.eitchnet.db.DbConstants.PROP_DB_URL; import static li.strolch.db.DbConstants.PROP_DB_URL;
import static ch.eitchnet.db.DbConstants.PROP_DB_USERNAME; import static li.strolch.db.DbConstants.PROP_DB_USERNAME;
import static li.strolch.runtime.StrolchConstants.makeRealmKey; import static li.strolch.runtime.StrolchConstants.makeRealmKey;
import java.sql.Connection; import java.sql.Connection;

4
li.strolch.agent/src/main/java/li/strolch/runtime/configuration/StrolchEnvironment.java
View File

@ -21,8 +21,8 @@ import java.text.MessageFormat;
import java.util.Properties; import java.util.Properties;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
import ch.eitchnet.utils.helper.StringHelper; import li.strolch.utils.helper.StringHelper;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

4
li.strolch.agent/src/main/java/li/strolch/runtime/main/MainStarter.java
View File

@ -31,11 +31,11 @@ import org.apache.commons.cli.ParseException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.utils.dbc.DBC;
import ch.eitchnet.utils.helper.StringHelper;
import li.strolch.agent.api.StrolchAgent; import li.strolch.agent.api.StrolchAgent;
import li.strolch.agent.api.StrolchBootstrapper; import li.strolch.agent.api.StrolchBootstrapper;
import li.strolch.agent.api.StrolchVersion; import li.strolch.agent.api.StrolchVersion;
import li.strolch.utils.dbc.DBC;
import li.strolch.utils.helper.StringHelper;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

38
li.strolch.agent/src/main/java/li/strolch/runtime/privilege/DefaultStrolchPrivilegeHandler.java
View File

@ -15,43 +15,43 @@
*/ */
package li.strolch.runtime.privilege; package li.strolch.runtime.privilege;
import static ch.eitchnet.privilege.handler.PrivilegeHandler.PARAM_PERSIST_SESSIONS; import static li.strolch.privilege.handler.PrivilegeHandler.PARAM_PERSIST_SESSIONS;
import static ch.eitchnet.privilege.handler.PrivilegeHandler.PARAM_PERSIST_SESSIONS_PATH; import static li.strolch.privilege.handler.PrivilegeHandler.PARAM_PERSIST_SESSIONS_PATH;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.Map; import java.util.Map;
import ch.eitchnet.privilege.base.PrivilegeException;
import ch.eitchnet.privilege.handler.DefaultPrivilegeHandler;
import ch.eitchnet.privilege.handler.EncryptionHandler;
import ch.eitchnet.privilege.handler.PersistenceHandler;
import ch.eitchnet.privilege.handler.SystemUserAction;
import ch.eitchnet.privilege.handler.XmlPersistenceHandler;
import ch.eitchnet.privilege.helper.PrivilegeInitializationHelper;
import ch.eitchnet.privilege.helper.XmlConstants;
import ch.eitchnet.privilege.model.Certificate;
import ch.eitchnet.privilege.model.PrivilegeContext;
import ch.eitchnet.privilege.model.internal.PrivilegeContainerModel;
import ch.eitchnet.privilege.xml.PrivilegeConfigSaxReader;
import ch.eitchnet.utils.helper.XmlHelper;
import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ComponentContainer;
import li.strolch.agent.api.StrolchComponent; import li.strolch.agent.api.StrolchComponent;
import li.strolch.agent.api.StrolchRealm; import li.strolch.agent.api.StrolchRealm;
import li.strolch.model.audit.AccessType; import li.strolch.model.audit.AccessType;
import li.strolch.model.audit.Audit; import li.strolch.model.audit.Audit;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.privilege.base.PrivilegeException;
import li.strolch.privilege.handler.DefaultPrivilegeHandler;
import li.strolch.privilege.handler.EncryptionHandler;
import li.strolch.privilege.handler.PersistenceHandler;
import li.strolch.privilege.handler.SystemUserAction;
import li.strolch.privilege.handler.XmlPersistenceHandler;
import li.strolch.privilege.helper.PrivilegeInitializationHelper;
import li.strolch.privilege.helper.XmlConstants;
import li.strolch.privilege.model.Certificate;
import li.strolch.privilege.model.PrivilegeContext;
import li.strolch.privilege.model.internal.PrivilegeContainerModel;
import li.strolch.privilege.xml.PrivilegeConfigSaxReader;
import li.strolch.runtime.StrolchConstants.StrolchPrivilegeConstants; import li.strolch.runtime.StrolchConstants.StrolchPrivilegeConstants;
import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.ComponentConfiguration;
import li.strolch.runtime.configuration.RuntimeConfiguration; import li.strolch.runtime.configuration.RuntimeConfiguration;
import li.strolch.utils.helper.XmlHelper;
public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements PrivilegeHandler { public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements PrivilegeHandler {
public static final String PROP_PRIVILEGE_CONFIG_FILE = "privilegeConfigFile"; //$NON-NLS-1$ public static final String PROP_PRIVILEGE_CONFIG_FILE = "privilegeConfigFile"; //$NON-NLS-1$
public static final String PRIVILEGE_CONFIG_XML = "PrivilegeConfig.xml"; //$NON-NLS-1$ public static final String PRIVILEGE_CONFIG_XML = "PrivilegeConfig.xml"; //$NON-NLS-1$
private ch.eitchnet.privilege.handler.PrivilegeHandler privilegeHandler; private li.strolch.privilege.handler.PrivilegeHandler privilegeHandler;
public DefaultStrolchPrivilegeHandler(ComponentContainer container, String componentName) { public DefaultStrolchPrivilegeHandler(ComponentContainer container, String componentName) {
super(container, componentName); super(container, componentName);
@ -65,7 +65,7 @@ public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements
RuntimeConfiguration runtimeConfiguration = configuration.getRuntimeConfiguration(); RuntimeConfiguration runtimeConfiguration = configuration.getRuntimeConfiguration();
File privilegeConfigFile = configuration.getConfigFile(PROP_PRIVILEGE_CONFIG_FILE, PRIVILEGE_CONFIG_XML, File privilegeConfigFile = configuration.getConfigFile(PROP_PRIVILEGE_CONFIG_FILE, PRIVILEGE_CONFIG_XML,
runtimeConfiguration); runtimeConfiguration);
ch.eitchnet.privilege.handler.PrivilegeHandler privilegeHandler = initializeFromXml(configuration, li.strolch.privilege.handler.PrivilegeHandler privilegeHandler = initializeFromXml(configuration,
privilegeConfigFile); privilegeConfigFile);
this.privilegeHandler = privilegeHandler; this.privilegeHandler = privilegeHandler;
} }
@ -79,7 +79,7 @@ public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements
* @return the initialized {@link PrivilegeHandler} where the {@link EncryptionHandler} and * @return the initialized {@link PrivilegeHandler} where the {@link EncryptionHandler} and
* {@link PersistenceHandler} are set and initialized as well * {@link PersistenceHandler} are set and initialized as well
*/ */
private ch.eitchnet.privilege.handler.PrivilegeHandler initializeFromXml(ComponentConfiguration configuration, private li.strolch.privilege.handler.PrivilegeHandler initializeFromXml(ComponentConfiguration configuration,
File privilegeXmlFile) { File privilegeXmlFile) {
// make sure file exists // make sure file exists
@ -189,7 +189,7 @@ public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements
} }
@Override @Override
public ch.eitchnet.privilege.handler.PrivilegeHandler getPrivilegeHandler(Certificate certificate) public li.strolch.privilege.handler.PrivilegeHandler getPrivilegeHandler(Certificate certificate)
throws PrivilegeException { throws PrivilegeException {
return this.privilegeHandler; return this.privilegeHandler;
} }

26
li.strolch.agent/src/main/java/li/strolch/runtime/privilege/PrivilegeHandler.java
View File

@ -15,10 +15,10 @@
*/ */
package li.strolch.runtime.privilege; package li.strolch.runtime.privilege;
import ch.eitchnet.privilege.base.PrivilegeException; import li.strolch.privilege.base.PrivilegeException;
import ch.eitchnet.privilege.handler.SystemUserAction; import li.strolch.privilege.handler.SystemUserAction;
import ch.eitchnet.privilege.model.Certificate; import li.strolch.privilege.model.Certificate;
import ch.eitchnet.privilege.model.PrivilegeContext; import li.strolch.privilege.model.PrivilegeContext;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>
@ -30,28 +30,28 @@ public interface PrivilegeHandler {
* @param password * @param password
* @return * @return
* *
* @see ch.eitchnet.privilege.handler.PrivilegeHandler#authenticate(String, byte[]) * @see li.strolch.privilege.handler.PrivilegeHandler#authenticate(String, byte[])
*/ */
public abstract Certificate authenticate(String username, byte[] password); public abstract Certificate authenticate(String username, byte[] password);
/** /**
* @param certificate * @param certificate
* @throws PrivilegeException * @throws PrivilegeException
* @see ch.eitchnet.privilege.handler.PrivilegeHandler#isCertificateValid(Certificate) * @see li.strolch.privilege.handler.PrivilegeHandler#isCertificateValid(Certificate)
*/ */
public abstract void isCertificateValid(Certificate certificate) throws PrivilegeException; public abstract void isCertificateValid(Certificate certificate) throws PrivilegeException;
/** /**
* @param certificate * @param certificate
* @return * @return
* @see ch.eitchnet.privilege.handler.PrivilegeHandler#invalidateSession(ch.eitchnet.privilege.model.Certificate) * @see li.strolch.privilege.handler.PrivilegeHandler#invalidateSession(li.strolch.privilege.model.Certificate)
*/ */
public abstract boolean invalidateSession(Certificate certificate); public abstract boolean invalidateSession(Certificate certificate);
/** /**
* @param certificate * @param certificate
* @return * @return
* @see ch.eitchnet.privilege.handler.PrivilegeHandler#invalidateSession(ch.eitchnet.privilege.model.Certificate) * @see li.strolch.privilege.handler.PrivilegeHandler#invalidateSession(li.strolch.privilege.model.Certificate)
*/ */
public abstract boolean sessionTimeout(Certificate certificate); public abstract boolean sessionTimeout(Certificate certificate);
@ -59,7 +59,7 @@ public interface PrivilegeHandler {
* @param certificate * @param certificate
* @return * @return
* @throws PrivilegeException * @throws PrivilegeException
* @see ch.eitchnet.privilege.handler.PrivilegeHandler#getPrivilegeContext(ch.eitchnet.privilege.model.Certificate) * @see li.strolch.privilege.handler.PrivilegeHandler#getPrivilegeContext(li.strolch.privilege.model.Certificate)
*/ */
public abstract PrivilegeContext getPrivilegeContext(Certificate certificate) throws PrivilegeException; public abstract PrivilegeContext getPrivilegeContext(Certificate certificate) throws PrivilegeException;
@ -67,8 +67,8 @@ public interface PrivilegeHandler {
* @param systemUsername * @param systemUsername
* @param action * @param action
* @throws PrivilegeException * @throws PrivilegeException
* @see ch.eitchnet.privilege.handler.PrivilegeHandler#runAsSystem(java.lang.String, * @see li.strolch.privilege.handler.PrivilegeHandler#runAsSystem(java.lang.String,
* ch.eitchnet.privilege.handler.SystemUserAction) * li.strolch.privilege.handler.SystemUserAction)
*/ */
public abstract <T extends SystemUserAction> T runAsSystem(String systemUsername, T action) public abstract <T extends SystemUserAction> T runAsSystem(String systemUsername, T action)
throws PrivilegeException; throws PrivilegeException;
@ -78,14 +78,14 @@ public interface PrivilegeHandler {
* @return * @return
* @throws PrivilegeException * @throws PrivilegeException
*/ */
public abstract ch.eitchnet.privilege.handler.PrivilegeHandler getPrivilegeHandler(Certificate certificate) public abstract li.strolch.privilege.handler.PrivilegeHandler getPrivilegeHandler(Certificate certificate)
throws PrivilegeException; throws PrivilegeException;
/** /**
* @param certificate * @param certificate
* @param password * @param password
* @throws PrivilegeException * @throws PrivilegeException
* @see {@link ch.eitchnet.privilege.handler.PrivilegeHandler#checkPassword(Certificate, byte[])} * @see {@link li.strolch.privilege.handler.PrivilegeHandler#checkPassword(Certificate, byte[])}
*/ */
public void checkPassword(Certificate certificate, byte[] password) throws PrivilegeException; public void checkPassword(Certificate certificate, byte[] password) throws PrivilegeException;
} }

4
li.strolch.agent/src/main/java/li/strolch/runtime/privilege/RunAsAgent.java
View File

@ -1,7 +1,7 @@
package li.strolch.runtime.privilege; package li.strolch.runtime.privilege;
import ch.eitchnet.privilege.handler.SystemUserAction; import li.strolch.privilege.handler.SystemUserAction;
import ch.eitchnet.privilege.model.PrivilegeContext; import li.strolch.privilege.model.PrivilegeContext;
import li.strolch.service.api.AbstractService; import li.strolch.service.api.AbstractService;
import li.strolch.service.api.Service; import li.strolch.service.api.Service;
import li.strolch.service.api.ServiceArgument; import li.strolch.service.api.ServiceArgument;

4
li.strolch.agent/src/main/java/li/strolch/runtime/privilege/RunRunnable.java
View File

@ -1,7 +1,7 @@
package li.strolch.runtime.privilege; package li.strolch.runtime.privilege;
import ch.eitchnet.privilege.handler.SystemUserAction; import li.strolch.privilege.handler.SystemUserAction;
import ch.eitchnet.privilege.model.PrivilegeContext; import li.strolch.privilege.model.PrivilegeContext;
/** /**
* {@link SystemUserAction} to run {@link Runnable} as a system user * {@link SystemUserAction} to run {@link Runnable} as a system user

6
li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java
View File

@ -15,7 +15,7 @@
*/ */
package li.strolch.runtime.query.enums; package li.strolch.runtime.query.enums;
import static ch.eitchnet.utils.helper.StringHelper.UNDERLINE; import static li.strolch.utils.helper.StringHelper.UNDERLINE;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.HashMap; import java.util.HashMap;
@ -31,10 +31,10 @@ import li.strolch.model.ParameterBag;
import li.strolch.model.Resource; import li.strolch.model.Resource;
import li.strolch.model.parameter.StringParameter; import li.strolch.model.parameter.StringParameter;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.privilege.model.Certificate;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.ComponentConfiguration;
import ch.eitchnet.privilege.model.Certificate; import li.strolch.utils.dbc.DBC;
import ch.eitchnet.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/EnumHandler.java
View File

@ -17,7 +17,7 @@ package li.strolch.runtime.query.enums;
import java.util.Locale; import java.util.Locale;
import ch.eitchnet.privilege.model.Certificate; import li.strolch.privilege.model.Certificate;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/StrolchEnum.java
View File

@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import ch.eitchnet.utils.helper.StringHelper; import li.strolch.utils.helper.StringHelper;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

4
li.strolch.agent/src/main/java/li/strolch/runtime/query/inmemory/AuditTypeNavigator.java
View File

@ -19,8 +19,8 @@ import java.util.List;
import li.strolch.model.audit.Audit; import li.strolch.model.audit.Audit;
import li.strolch.persistence.api.AuditDao; import li.strolch.persistence.api.AuditDao;
import ch.eitchnet.utils.collections.DateRange; import li.strolch.utils.collections.DateRange;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/runtime/query/inmemory/DateSelector.java
View File

@ -16,7 +16,7 @@
package li.strolch.runtime.query.inmemory; package li.strolch.runtime.query.inmemory;
import li.strolch.model.Order; import li.strolch.model.Order;
import ch.eitchnet.utils.collections.DateRange; import li.strolch.utils.collections.DateRange;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/runtime/query/inmemory/IdSelector.java
View File

@ -17,8 +17,8 @@ package li.strolch.runtime.query.inmemory;
import java.util.List; import java.util.List;
import ch.eitchnet.utils.StringMatchMode;
import li.strolch.model.StrolchElement; import li.strolch.model.StrolchElement;
import li.strolch.utils.StringMatchMode;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/runtime/query/inmemory/InMemoryActivityQueryVisitor.java
View File

@ -23,7 +23,7 @@ import li.strolch.model.query.ActivityQuery;
import li.strolch.model.query.ActivityQueryVisitor; import li.strolch.model.query.ActivityQueryVisitor;
import li.strolch.model.query.StrolchTypeNavigation; import li.strolch.model.query.StrolchTypeNavigation;
import li.strolch.persistence.api.ActivityDao; import li.strolch.persistence.api.ActivityDao;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/runtime/query/inmemory/InMemoryAuditQuery.java
View File

@ -21,7 +21,7 @@ import java.util.List;
import li.strolch.model.audit.Audit; import li.strolch.model.audit.Audit;
import li.strolch.model.audit.AuditVisitor; import li.strolch.model.audit.AuditVisitor;
import li.strolch.persistence.inmemory.InMemoryAuditDao; import li.strolch.persistence.inmemory.InMemoryAuditDao;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

4
li.strolch.agent/src/main/java/li/strolch/runtime/query/inmemory/InMemoryAuditQueryVisitor.java
View File

@ -24,8 +24,8 @@ import li.strolch.model.audit.AuditQueryVisitor;
import li.strolch.model.audit.AuditVisitor; import li.strolch.model.audit.AuditVisitor;
import li.strolch.model.audit.ElementSelection; import li.strolch.model.audit.ElementSelection;
import li.strolch.model.audit.IdentitySelection; import li.strolch.model.audit.IdentitySelection;
import ch.eitchnet.utils.collections.DateRange; import li.strolch.utils.collections.DateRange;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/runtime/query/inmemory/InMemoryOrderQueryVisitor.java
View File

@ -25,7 +25,7 @@ import li.strolch.model.query.OrderQueryVisitor;
import li.strolch.model.query.StateSelection; import li.strolch.model.query.StateSelection;
import li.strolch.model.query.StrolchTypeNavigation; import li.strolch.model.query.StrolchTypeNavigation;
import li.strolch.persistence.api.OrderDao; import li.strolch.persistence.api.OrderDao;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/runtime/query/inmemory/InMemoryQuery.java
View File

@ -24,7 +24,7 @@ import java.util.List;
import li.strolch.model.StrolchElement; import li.strolch.model.StrolchElement;
import li.strolch.model.visitor.StrolchElementVisitor; import li.strolch.model.visitor.StrolchElementVisitor;
import li.strolch.persistence.api.StrolchDao; import li.strolch.persistence.api.StrolchDao;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/runtime/query/inmemory/InMemoryQueryVisitor.java
View File

@ -20,7 +20,6 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import ch.eitchnet.utils.dbc.DBC;
import li.strolch.model.GroupedParameterizedElement; import li.strolch.model.GroupedParameterizedElement;
import li.strolch.model.query.AndSelection; import li.strolch.model.query.AndSelection;
import li.strolch.model.query.BooleanSelection; import li.strolch.model.query.BooleanSelection;
@ -54,6 +53,7 @@ import li.strolch.model.query.ordering.StrolchQueryOrderingVisitor;
import li.strolch.persistence.api.StrolchDao; import li.strolch.persistence.api.StrolchDao;
import li.strolch.runtime.query.inmemory.ParameterBagSelector.NullParameterBagSelector; import li.strolch.runtime.query.inmemory.ParameterBagSelector.NullParameterBagSelector;
import li.strolch.runtime.query.inmemory.ParameterSelector.StringParameterSelector; import li.strolch.runtime.query.inmemory.ParameterSelector.StringParameterSelector;
import li.strolch.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/runtime/query/inmemory/InMemoryResourceQueryVisitor.java
View File

@ -23,7 +23,7 @@ import li.strolch.model.query.ResourceQuery;
import li.strolch.model.query.ResourceQueryVisitor; import li.strolch.model.query.ResourceQueryVisitor;
import li.strolch.model.query.StrolchTypeNavigation; import li.strolch.model.query.StrolchTypeNavigation;
import li.strolch.persistence.api.ResourceDao; import li.strolch.persistence.api.ResourceDao;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/runtime/query/inmemory/NameSelector.java
View File

@ -15,8 +15,8 @@
*/ */
package li.strolch.runtime.query.inmemory; package li.strolch.runtime.query.inmemory;
import ch.eitchnet.utils.StringMatchMode;
import li.strolch.model.StrolchElement; import li.strolch.model.StrolchElement;
import li.strolch.utils.StringMatchMode;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/runtime/query/inmemory/NotSelector.java
View File

@ -16,7 +16,7 @@
package li.strolch.runtime.query.inmemory; package li.strolch.runtime.query.inmemory;
import li.strolch.model.StrolchElement; import li.strolch.model.StrolchElement;
import ch.eitchnet.utils.dbc.DBC; import li.strolch.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

4
li.strolch.agent/src/main/java/li/strolch/runtime/query/inmemory/ParameterSelector.java
View File

@ -18,8 +18,6 @@ package li.strolch.runtime.query.inmemory;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import ch.eitchnet.utils.StringMatchMode;
import ch.eitchnet.utils.collections.DateRange;
import li.strolch.model.GroupedParameterizedElement; import li.strolch.model.GroupedParameterizedElement;
import li.strolch.model.ParameterBag; import li.strolch.model.ParameterBag;
import li.strolch.model.parameter.BooleanParameter; import li.strolch.model.parameter.BooleanParameter;
@ -31,6 +29,8 @@ import li.strolch.model.parameter.ListParameter;
import li.strolch.model.parameter.LongParameter; import li.strolch.model.parameter.LongParameter;
import li.strolch.model.parameter.Parameter; import li.strolch.model.parameter.Parameter;
import li.strolch.model.parameter.StringParameter; import li.strolch.model.parameter.StringParameter;
import li.strolch.utils.StringMatchMode;
import li.strolch.utils.collections.DateRange;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

14
li.strolch.agent/src/main/java/li/strolch/service/api/AbstractService.java
View File

@ -20,19 +20,19 @@ import java.text.MessageFormat;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.privilege.base.PrivilegeException;
import ch.eitchnet.privilege.handler.SystemUserAction;
import ch.eitchnet.privilege.model.Certificate;
import ch.eitchnet.privilege.model.PrivilegeContext;
import ch.eitchnet.utils.dbc.DBC;
import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ComponentContainer;
import li.strolch.agent.api.StrolchComponent; import li.strolch.agent.api.StrolchComponent;
import li.strolch.agent.api.StrolchRealm; import li.strolch.agent.api.StrolchRealm;
import li.strolch.exception.StrolchException; import li.strolch.exception.StrolchException;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.privilege.base.PrivilegeException;
import li.strolch.privilege.handler.SystemUserAction;
import li.strolch.privilege.model.Certificate;
import li.strolch.privilege.model.PrivilegeContext;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
import li.strolch.runtime.configuration.RuntimeConfiguration; import li.strolch.runtime.configuration.RuntimeConfiguration;
import li.strolch.runtime.privilege.PrivilegeHandler; import li.strolch.runtime.privilege.PrivilegeHandler;
import li.strolch.utils.dbc.DBC;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>
@ -314,7 +314,7 @@ public abstract class AbstractService<T extends ServiceArgument, U extends Servi
protected abstract U internalDoService(T arg) throws Exception; protected abstract U internalDoService(T arg) throws Exception;
/** /**
* @see ch.eitchnet.privilege.model.Restrictable#getPrivilegeName() * @see li.strolch.privilege.model.Restrictable#getPrivilegeName()
*/ */
@Override @Override
public String getPrivilegeName() { public String getPrivilegeName() {
@ -322,7 +322,7 @@ public abstract class AbstractService<T extends ServiceArgument, U extends Servi
} }
/** /**
* @see ch.eitchnet.privilege.model.Restrictable#getPrivilegeValue() * @see li.strolch.privilege.model.Restrictable#getPrivilegeValue()
*/ */
@Override @Override
public Object getPrivilegeValue() { public Object getPrivilegeValue() {

10
li.strolch.agent/src/main/java/li/strolch/service/api/Command.java
View File

@ -18,9 +18,6 @@ package li.strolch.service.api;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.privilege.base.PrivilegeException;
import ch.eitchnet.privilege.handler.SystemUserAction;
import ch.eitchnet.privilege.model.Restrictable;
import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ComponentContainer;
import li.strolch.agent.api.StrolchComponent; import li.strolch.agent.api.StrolchComponent;
import li.strolch.model.PolicyContainer; import li.strolch.model.PolicyContainer;
@ -29,6 +26,9 @@ import li.strolch.model.policy.PolicyDefs;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.policy.PolicyHandler; import li.strolch.policy.PolicyHandler;
import li.strolch.policy.StrolchPolicy; import li.strolch.policy.StrolchPolicy;
import li.strolch.privilege.base.PrivilegeException;
import li.strolch.privilege.handler.SystemUserAction;
import li.strolch.privilege.model.Restrictable;
/** /**
* <p> * <p>
@ -131,7 +131,7 @@ public abstract class Command implements Restrictable {
} }
/** /**
* @see ch.eitchnet.privilege.model.Restrictable#getPrivilegeName() * @see li.strolch.privilege.model.Restrictable#getPrivilegeName()
*/ */
@Override @Override
public String getPrivilegeName() { public String getPrivilegeName() {
@ -139,7 +139,7 @@ public abstract class Command implements Restrictable {
} }
/** /**
* @see ch.eitchnet.privilege.model.Restrictable#getPrivilegeValue() * @see li.strolch.privilege.model.Restrictable#getPrivilegeValue()
*/ */
@Override @Override
public Object getPrivilegeValue() { public Object getPrivilegeValue() {

8
li.strolch.agent/src/main/java/li/strolch/service/api/DefaultServiceHandler.java
View File

@ -17,17 +17,17 @@ package li.strolch.service.api;
import java.text.MessageFormat; import java.text.MessageFormat;
import ch.eitchnet.privilege.base.PrivilegeException;
import ch.eitchnet.privilege.model.Certificate;
import ch.eitchnet.privilege.model.PrivilegeContext;
import ch.eitchnet.utils.helper.StringHelper;
import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ComponentContainer;
import li.strolch.agent.api.StrolchComponent; import li.strolch.agent.api.StrolchComponent;
import li.strolch.exception.StrolchAccessDeniedException; import li.strolch.exception.StrolchAccessDeniedException;
import li.strolch.exception.StrolchException; import li.strolch.exception.StrolchException;
import li.strolch.privilege.base.PrivilegeException;
import li.strolch.privilege.model.Certificate;
import li.strolch.privilege.model.PrivilegeContext;
import li.strolch.runtime.configuration.ComponentConfiguration; import li.strolch.runtime.configuration.ComponentConfiguration;
import li.strolch.runtime.configuration.RuntimeConfiguration; import li.strolch.runtime.configuration.RuntimeConfiguration;
import li.strolch.runtime.privilege.PrivilegeHandler; import li.strolch.runtime.privilege.PrivilegeHandler;
import li.strolch.utils.helper.StringHelper;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

2
li.strolch.agent/src/main/java/li/strolch/service/api/Service.java
View File

@ -17,7 +17,7 @@ package li.strolch.service.api;
import java.io.Serializable; import java.io.Serializable;
import ch.eitchnet.privilege.model.Restrictable; import li.strolch.privilege.model.Restrictable;
/** /**
* Interface for Strolch service's. Service's are the main object in which business logic is implemented in a Strolch * Interface for Strolch service's. Service's are the main object in which business logic is implemented in a Strolch

2
li.strolch.agent/src/main/java/li/strolch/service/api/ServiceHandler.java
View File

@ -15,7 +15,7 @@
*/ */
package li.strolch.service.api; package li.strolch.service.api;
import ch.eitchnet.privilege.model.Certificate; import li.strolch.privilege.model.Certificate;
public interface ServiceHandler { public interface ServiceHandler {

4
li.strolch.agent/src/test/java/li/strolch/RuntimeMock.java
View File

@ -26,8 +26,6 @@ import java.util.Properties;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.utils.helper.FileHelper;
import ch.eitchnet.utils.helper.StringHelper;
import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ComponentContainer;
import li.strolch.agent.api.StrolchAgent; import li.strolch.agent.api.StrolchAgent;
import li.strolch.agent.api.StrolchBootstrapper; import li.strolch.agent.api.StrolchBootstrapper;
@ -37,6 +35,8 @@ import li.strolch.runtime.privilege.PrivilegeHandler;
import li.strolch.service.api.ServiceHandler; import li.strolch.service.api.ServiceHandler;
import li.strolch.service.api.ServiceResult; import li.strolch.service.api.ServiceResult;
import li.strolch.service.api.ServiceResultState; import li.strolch.service.api.ServiceResultState;
import li.strolch.utils.helper.FileHelper;
import li.strolch.utils.helper.StringHelper;
/** /**
* Basically you should use the RuntimeMock class in the testbase project, but to mitigate circular dependencies, in * Basically you should use the RuntimeMock class in the testbase project, but to mitigate circular dependencies, in

2
li.strolch.agent/src/test/java/li/strolch/agent/ComponentContainerTest.java
View File

@ -23,7 +23,6 @@ import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ch.eitchnet.privilege.model.Certificate;
import li.strolch.RuntimeMock; import li.strolch.RuntimeMock;
import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ComponentContainer;
import li.strolch.agent.api.OrderMap; import li.strolch.agent.api.OrderMap;
@ -35,6 +34,7 @@ import li.strolch.model.Resource;
import li.strolch.persistence.api.OrderDao; import li.strolch.persistence.api.OrderDao;
import li.strolch.persistence.api.ResourceDao; import li.strolch.persistence.api.ResourceDao;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.privilege.model.Certificate;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
import li.strolch.runtime.configuration.model.ResourceGeneratorHandlerTest; import li.strolch.runtime.configuration.model.ResourceGeneratorHandlerTest;
import li.strolch.runtime.configuration.model.ServiceHandlerTest; import li.strolch.runtime.configuration.model.ServiceHandlerTest;

2
li.strolch.agent/src/test/java/li/strolch/policytest/PolicyHandlerTest.java
View File

@ -19,7 +19,6 @@ import static org.junit.Assert.assertNotNull;
import org.junit.Test; import org.junit.Test;
import ch.eitchnet.privilege.model.Certificate;
import li.strolch.RuntimeMock; import li.strolch.RuntimeMock;
import li.strolch.agent.ComponentContainerTest; import li.strolch.agent.ComponentContainerTest;
import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ComponentContainer;
@ -27,6 +26,7 @@ import li.strolch.model.Resource;
import li.strolch.model.policy.PolicyDef; import li.strolch.model.policy.PolicyDef;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.policy.PolicyHandler; import li.strolch.policy.PolicyHandler;
import li.strolch.privilege.model.Certificate;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
/** /**

2
li.strolch.agent/src/test/java/li/strolch/runtime/configuration/BootstrapperTest.java
View File

@ -6,10 +6,10 @@ import java.io.File;
import org.junit.Test; import org.junit.Test;
import ch.eitchnet.utils.helper.FileHelper;
import li.strolch.RuntimeMock; import li.strolch.RuntimeMock;
import li.strolch.agent.api.StrolchAgent; import li.strolch.agent.api.StrolchAgent;
import li.strolch.agent.api.StrolchBootstrapper; import li.strolch.agent.api.StrolchBootstrapper;
import li.strolch.utils.helper.FileHelper;
public class BootstrapperTest { public class BootstrapperTest {

2
li.strolch.agent/src/test/java/li/strolch/runtime/configuration/ConfigurationParserTest.java
View File

@ -23,10 +23,10 @@ import java.io.File;
import org.junit.Test; import org.junit.Test;
import ch.eitchnet.utils.helper.FileHelper;
import li.strolch.RuntimeMock; import li.strolch.RuntimeMock;
import li.strolch.agent.api.StrolchAgent; import li.strolch.agent.api.StrolchAgent;
import li.strolch.agent.api.StrolchBootstrapper; import li.strolch.agent.api.StrolchBootstrapper;
import li.strolch.utils.helper.FileHelper;
@SuppressWarnings("nls") @SuppressWarnings("nls")
public class ConfigurationParserTest { public class ConfigurationParserTest {

2
li.strolch.agent/src/test/java/li/strolch/runtime/configuration/ControllerDependencyTest.java
View File

@ -30,13 +30,13 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import ch.eitchnet.utils.dbc.DBC.DbcException;
import li.strolch.agent.api.ComponentState; import li.strolch.agent.api.ComponentState;
import li.strolch.agent.api.StrolchComponent; import li.strolch.agent.api.StrolchComponent;
import li.strolch.agent.impl.ComponentContainerImpl; import li.strolch.agent.impl.ComponentContainerImpl;
import li.strolch.agent.impl.ComponentContainerStateHandler; import li.strolch.agent.impl.ComponentContainerStateHandler;
import li.strolch.agent.impl.ComponentController; import li.strolch.agent.impl.ComponentController;
import li.strolch.agent.impl.ComponentDependencyAnalyzer; import li.strolch.agent.impl.ComponentDependencyAnalyzer;
import li.strolch.utils.dbc.DBC.DbcException;
@SuppressWarnings("nls") @SuppressWarnings("nls")
public class ControllerDependencyTest { public class ControllerDependencyTest {

2
li.strolch.agent/src/test/java/li/strolch/runtime/query/enums/EnumHandlerTest.java
View File

@ -23,10 +23,10 @@ import java.util.Locale;
import org.junit.Test; import org.junit.Test;
import ch.eitchnet.privilege.model.Certificate;
import li.strolch.RuntimeMock; import li.strolch.RuntimeMock;
import li.strolch.agent.ComponentContainerTest; import li.strolch.agent.ComponentContainerTest;
import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ComponentContainer;
import li.strolch.privilege.model.Certificate;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

5
li.strolch.agent/src/test/java/li/strolch/runtime/query/inmemory/AuditQueryTest.java
View File

@ -34,13 +34,12 @@ import li.strolch.model.audit.AuditQuery;
import li.strolch.model.audit.AuditVisitor; import li.strolch.model.audit.AuditVisitor;
import li.strolch.model.audit.NoStrategyAuditVisitor; import li.strolch.model.audit.NoStrategyAuditVisitor;
import li.strolch.persistence.inmemory.InMemoryAuditDao; import li.strolch.persistence.inmemory.InMemoryAuditDao;
import li.strolch.utils.StringMatchMode;
import li.strolch.utils.collections.DateRange;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import ch.eitchnet.utils.StringMatchMode;
import ch.eitchnet.utils.collections.DateRange;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>
*/ */

2
li.strolch.agent/src/test/java/li/strolch/runtime/query/inmemory/FindByLocatorTest.java
View File

@ -19,7 +19,6 @@ import static org.junit.Assert.assertNotNull;
import org.junit.Test; import org.junit.Test;
import ch.eitchnet.privilege.model.Certificate;
import li.strolch.RuntimeMock; import li.strolch.RuntimeMock;
import li.strolch.agent.ComponentContainerTest; import li.strolch.agent.ComponentContainerTest;
import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ComponentContainer;
@ -32,6 +31,7 @@ import li.strolch.model.parameter.FloatParameter;
import li.strolch.model.parameter.StringParameter; import li.strolch.model.parameter.StringParameter;
import li.strolch.model.timedstate.IntegerTimedState; import li.strolch.model.timedstate.IntegerTimedState;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.privilege.model.Certificate;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
/** /**

4
li.strolch.agent/src/test/java/li/strolch/runtime/query/inmemory/InMemoryQueryTest.java
View File

@ -15,8 +15,6 @@
*/ */
package li.strolch.runtime.query.inmemory; package li.strolch.runtime.query.inmemory;
import static ch.eitchnet.utils.StringMatchMode.ci;
import static ch.eitchnet.utils.StringMatchMode.es;
import static li.strolch.model.query.ParameterSelection.booleanSelection; import static li.strolch.model.query.ParameterSelection.booleanSelection;
import static li.strolch.model.query.ParameterSelection.floatListSelection; import static li.strolch.model.query.ParameterSelection.floatListSelection;
import static li.strolch.model.query.ParameterSelection.floatSelection; import static li.strolch.model.query.ParameterSelection.floatSelection;
@ -24,6 +22,8 @@ import static li.strolch.model.query.ParameterSelection.integerListSelection;
import static li.strolch.model.query.ParameterSelection.longListSelection; import static li.strolch.model.query.ParameterSelection.longListSelection;
import static li.strolch.model.query.ParameterSelection.stringListSelection; import static li.strolch.model.query.ParameterSelection.stringListSelection;
import static li.strolch.model.query.ParameterSelection.stringSelection; import static li.strolch.model.query.ParameterSelection.stringSelection;
import static li.strolch.utils.StringMatchMode.ci;
import static li.strolch.utils.StringMatchMode.es;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import java.util.ArrayList; import java.util.ArrayList;

4
li.strolch.agent/src/test/java/li/strolch/runtime/query/inmemory/QueryTest.java
View File

@ -26,8 +26,6 @@ import java.util.List;
import org.junit.Test; import org.junit.Test;
import ch.eitchnet.privilege.model.Certificate;
import ch.eitchnet.utils.StringMatchMode;
import li.strolch.RuntimeMock; import li.strolch.RuntimeMock;
import li.strolch.agent.ComponentContainerTest; import li.strolch.agent.ComponentContainerTest;
import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ComponentContainer;
@ -40,7 +38,9 @@ import li.strolch.model.query.ParameterSelection;
import li.strolch.model.query.ResourceQuery; import li.strolch.model.query.ResourceQuery;
import li.strolch.model.query.Selection; import li.strolch.model.query.Selection;
import li.strolch.persistence.api.StrolchTransaction; import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.privilege.model.Certificate;
import li.strolch.runtime.StrolchConstants; import li.strolch.runtime.StrolchConstants;
import li.strolch.utils.StringMatchMode;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>

10
li.strolch.agent/src/test/resources/cachedtest/config/PrivilegeConfig.xml
View File

@ -8,13 +8,13 @@
<Parameter name="autoPersistOnUserChangesData" value="true" /> <Parameter name="autoPersistOnUserChangesData" value="true" />
</Parameters> </Parameters>
<EncryptionHandler class="ch.eitchnet.privilege.handler.DefaultEncryptionHandler"> <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
<Parameters> <Parameters>
<Parameter name="hashAlgorithm" value="SHA-256" /> <Parameter name="hashAlgorithm" value="SHA-256" />
</Parameters> </Parameters>
</EncryptionHandler> </EncryptionHandler>
<PersistenceHandler class="ch.eitchnet.privilege.handler.XmlPersistenceHandler"> <PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
<Parameters> <Parameters>
<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" /> <Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" /> <Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
@ -24,9 +24,9 @@
</Container> </Container>
<Policies> <Policies>
<Policy name="DefaultPrivilege" class="ch.eitchnet.privilege.policy.DefaultPrivilege" /> <Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
<Policy name="RoleAccessPrivilege" class="ch.eitchnet.privilege.policy.RoleAccessPrivilege" /> <Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
<Policy name="UserAccessPrivilege" class="ch.eitchnet.privilege.policy.UserAccessPrivilege" /> <Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
</Policies> </Policies>
</Privilege> </Privilege>

2
li.strolch.agent/src/test/resources/cachedtest/config/PrivilegeRoles.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Roles> <Roles>
<Role name="agent"> <Role name="agent">
<Privilege name="ch.eitchnet.privilege.handler.SystemUserAction" policy="DefaultPrivilege"> <Privilege name="li.strolch.privilege.handler.SystemUserAction" policy="DefaultPrivilege">
<Allow>li.strolch.agent.impl.StartRealms</Allow> <Allow>li.strolch.agent.impl.StartRealms</Allow>
</Privilege> </Privilege>
</Role> </Role>

10
li.strolch.agent/src/test/resources/emptytest/config/PrivilegeConfig.xml
View File

@ -8,13 +8,13 @@
<Parameter name="autoPersistOnUserChangesData" value="true" /> <Parameter name="autoPersistOnUserChangesData" value="true" />
</Parameters> </Parameters>
<EncryptionHandler class="ch.eitchnet.privilege.handler.DefaultEncryptionHandler"> <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
<Parameters> <Parameters>
<Parameter name="hashAlgorithm" value="SHA-256" /> <Parameter name="hashAlgorithm" value="SHA-256" />
</Parameters> </Parameters>
</EncryptionHandler> </EncryptionHandler>
<PersistenceHandler class="ch.eitchnet.privilege.handler.XmlPersistenceHandler"> <PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
<Parameters> <Parameters>
<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" /> <Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" /> <Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
@ -24,9 +24,9 @@
</Container> </Container>
<Policies> <Policies>
<Policy name="DefaultPrivilege" class="ch.eitchnet.privilege.policy.DefaultPrivilege" /> <Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
<Policy name="RoleAccessPrivilege" class="ch.eitchnet.privilege.policy.RoleAccessPrivilege" /> <Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
<Policy name="UserAccessPrivilege" class="ch.eitchnet.privilege.policy.UserAccessPrivilege" /> <Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
</Policies> </Policies>
</Privilege> </Privilege>

2
li.strolch.agent/src/test/resources/emptytest/config/PrivilegeRoles.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Roles> <Roles>
<Role name="agent"> <Role name="agent">
<Privilege name="ch.eitchnet.privilege.handler.SystemUserAction" policy="DefaultPrivilege"> <Privilege name="li.strolch.privilege.handler.SystemUserAction" policy="DefaultPrivilege">
<Allow>li.strolch.agent.impl.StartRealms</Allow> <Allow>li.strolch.agent.impl.StartRealms</Allow>
</Privilege> </Privilege>
</Role> </Role>

2
li.strolch.agent/src/test/resources/log4j.xml
View File

@ -17,7 +17,7 @@
</layout> </layout>
</appender> </appender>
<logger name="ch.eitchnet"> <logger name="li.strolch">
<level value="info" /> <level value="info" />
</logger> </logger>

10
li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeConfig.xml
View File

@ -8,13 +8,13 @@
<Parameter name="autoPersistOnUserChangesData" value="true" /> <Parameter name="autoPersistOnUserChangesData" value="true" />
</Parameters> </Parameters>
<EncryptionHandler class="ch.eitchnet.privilege.handler.DefaultEncryptionHandler"> <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
<Parameters> <Parameters>
<Parameter name="hashAlgorithm" value="SHA-256" /> <Parameter name="hashAlgorithm" value="SHA-256" />
</Parameters> </Parameters>
</EncryptionHandler> </EncryptionHandler>
<PersistenceHandler class="ch.eitchnet.privilege.handler.XmlPersistenceHandler"> <PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
<Parameters> <Parameters>
<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" /> <Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" /> <Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
@ -24,9 +24,9 @@
</Container> </Container>
<Policies> <Policies>
<Policy name="DefaultPrivilege" class="ch.eitchnet.privilege.policy.DefaultPrivilege" /> <Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
<Policy name="RoleAccessPrivilege" class="ch.eitchnet.privilege.policy.RoleAccessPrivilege" /> <Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
<Policy name="UserAccessPrivilege" class="ch.eitchnet.privilege.policy.UserAccessPrivilege" /> <Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
</Policies> </Policies>
</Privilege> </Privilege>

2
li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeRoles.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Roles> <Roles>
<Role name="agent"> <Role name="agent">
<Privilege name="ch.eitchnet.privilege.handler.SystemUserAction" policy="DefaultPrivilege"> <Privilege name="li.strolch.privilege.handler.SystemUserAction" policy="DefaultPrivilege">
<Allow>li.strolch.agent.impl.StartRealms</Allow> <Allow>li.strolch.agent.impl.StartRealms</Allow>
</Privilege> </Privilege>
</Role> </Role>

10
li.strolch.agent/src/test/resources/realmtest/config/PrivilegeConfig.xml
View File

@ -8,13 +8,13 @@
<Parameter name="autoPersistOnUserChangesData" value="true" /> <Parameter name="autoPersistOnUserChangesData" value="true" />
</Parameters> </Parameters>
<EncryptionHandler class="ch.eitchnet.privilege.handler.DefaultEncryptionHandler"> <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
<Parameters> <Parameters>
<Parameter name="hashAlgorithm" value="SHA-256" /> <Parameter name="hashAlgorithm" value="SHA-256" />
</Parameters> </Parameters>
</EncryptionHandler> </EncryptionHandler>
<PersistenceHandler class="ch.eitchnet.privilege.handler.XmlPersistenceHandler"> <PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
<Parameters> <Parameters>
<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" /> <Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" /> <Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
@ -24,9 +24,9 @@
</Container> </Container>
<Policies> <Policies>
<Policy name="DefaultPrivilege" class="ch.eitchnet.privilege.policy.DefaultPrivilege" /> <Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
<Policy name="RoleAccessPrivilege" class="ch.eitchnet.privilege.policy.RoleAccessPrivilege" /> <Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
<Policy name="UserAccessPrivilege" class="ch.eitchnet.privilege.policy.UserAccessPrivilege" /> <Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
</Policies> </Policies>
</Privilege> </Privilege>

2
li.strolch.agent/src/test/resources/realmtest/config/PrivilegeRoles.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Roles> <Roles>
<Role name="agent"> <Role name="agent">
<Privilege name="ch.eitchnet.privilege.handler.SystemUserAction" policy="DefaultPrivilege"> <Privilege name="li.strolch.privilege.handler.SystemUserAction" policy="DefaultPrivilege">
<Allow>li.strolch.agent.impl.StartRealms</Allow> <Allow>li.strolch.agent.impl.StartRealms</Allow>
</Privilege> </Privilege>
</Role> </Role>

10
li.strolch.agent/src/test/resources/transactionaltest/config/PrivilegeConfig.xml
View File

@ -8,13 +8,13 @@
<Parameter name="autoPersistOnUserChangesData" value="true" /> <Parameter name="autoPersistOnUserChangesData" value="true" />
</Parameters> </Parameters>
<EncryptionHandler class="ch.eitchnet.privilege.handler.DefaultEncryptionHandler"> <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
<Parameters> <Parameters>
<Parameter name="hashAlgorithm" value="SHA-256" /> <Parameter name="hashAlgorithm" value="SHA-256" />
</Parameters> </Parameters>
</EncryptionHandler> </EncryptionHandler>
<PersistenceHandler class="ch.eitchnet.privilege.handler.XmlPersistenceHandler"> <PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
<Parameters> <Parameters>
<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" /> <Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" /> <Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
@ -24,9 +24,9 @@
</Container> </Container>
<Policies> <Policies>
<Policy name="DefaultPrivilege" class="ch.eitchnet.privilege.policy.DefaultPrivilege" /> <Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
<Policy name="RoleAccessPrivilege" class="ch.eitchnet.privilege.policy.RoleAccessPrivilege" /> <Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
<Policy name="UserAccessPrivilege" class="ch.eitchnet.privilege.policy.UserAccessPrivilege" /> <Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
</Policies> </Policies>
</Privilege> </Privilege>

2
li.strolch.agent/src/test/resources/transactionaltest/config/PrivilegeRoles.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Roles> <Roles>
<Role name="agent"> <Role name="agent">
<Privilege name="ch.eitchnet.privilege.handler.SystemUserAction" policy="DefaultPrivilege"> <Privilege name="li.strolch.privilege.handler.SystemUserAction" policy="DefaultPrivilege">
<Allow>li.strolch.agent.impl.StartRealms</Allow> <Allow>li.strolch.agent.impl.StartRealms</Allow>
</Privilege> </Privilege>
</Role> </Role>

10
li.strolch.agent/src/test/resources/transienttest/config/PrivilegeConfig.xml
View File

@ -8,13 +8,13 @@
<Parameter name="autoPersistOnUserChangesData" value="true" /> <Parameter name="autoPersistOnUserChangesData" value="true" />
</Parameters> </Parameters>
<EncryptionHandler class="ch.eitchnet.privilege.handler.DefaultEncryptionHandler"> <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
<Parameters> <Parameters>
<Parameter name="hashAlgorithm" value="SHA-256" /> <Parameter name="hashAlgorithm" value="SHA-256" />
</Parameters> </Parameters>
</EncryptionHandler> </EncryptionHandler>
<PersistenceHandler class="ch.eitchnet.privilege.handler.XmlPersistenceHandler"> <PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
<Parameters> <Parameters>
<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" /> <Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" /> <Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
@ -24,9 +24,9 @@
</Container> </Container>
<Policies> <Policies>
<Policy name="DefaultPrivilege" class="ch.eitchnet.privilege.policy.DefaultPrivilege" /> <Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
<Policy name="RoleAccessPrivilege" class="ch.eitchnet.privilege.policy.RoleAccessPrivilege" /> <Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
<Policy name="UserAccessPrivilege" class="ch.eitchnet.privilege.policy.UserAccessPrivilege" /> <Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
</Policies> </Policies>
</Privilege> </Privilege>

2
li.strolch.agent/src/test/resources/transienttest/config/PrivilegeRoles.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Roles> <Roles>
<Role name="agent"> <Role name="agent">
<Privilege name="ch.eitchnet.privilege.handler.SystemUserAction" policy="DefaultPrivilege"> <Privilege name="li.strolch.privilege.handler.SystemUserAction" policy="DefaultPrivilege">
<Allow>li.strolch.agent.impl.StartRealms</Allow> <Allow>li.strolch.agent.impl.StartRealms</Allow>
</Privilege> </Privilege>
</Role> </Role>

19
li.strolch.bom/pom.xml
View File

@ -1,24 +1,19 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>li.strolch</groupId> <groupId>li.strolch</groupId>
<artifactId>li.strolch.parent</artifactId> <artifactId>li.strolch</artifactId>
<version>1.1.0-SNAPSHOT</version> <version>1.2.0-SNAPSHOT</version>
<relativePath>../li.strolch.parent</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>li.strolch.bom</artifactId> <artifactId>li.strolch.bom</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>li.strolch.bom</name> <name>li.strolch.bom</name>
<description>The default set of dependencies to start working with strolch projects</description> <description>The default set of dependencies to start working with strolch projects</description>
<scm>
<connection>scm:git:https://github.com/eitchnet/strolch.git</connection>
<developerConnection>scm:git:git@github.com:eitch/strolch.git</developerConnection>
<url>https://github.com/eitchnet/strolch</url>
</scm>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
@ -52,7 +47,7 @@
<artifactId>li.strolch.rest</artifactId> <artifactId>li.strolch.rest</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!-- test --> <!-- test -->
<dependency> <dependency>
<groupId>li.strolch</groupId> <groupId>li.strolch</groupId>
@ -60,7 +55,7 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</project> </project>

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