Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
2dd8a723ae
|
@ -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
34
README.md
|
@ -26,36 +26,4 @@ Find more to Strolch at our website: http://strolch.li
|
|||
|
||||
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](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
|
||||
[![Build Status](https://jenkins.eitchnet.ch/job/li.strolch/badge/icon)](https://jenkins.eitchnet.ch/job/li.strolch/)
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 538fc3c44956b57535c2c15fcf99b3602a22dd28
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 9b05d8cbbd6bb6e176c0ae5bf3210c517a48fc93
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 49b325eca13ffe7fe9cfc51ab964b8f7decc8522
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 4ba00c83d661accb6a642d77ef0eda2ffc4ef4c3
|
|
@ -1,34 +1,20 @@
|
|||
<?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>
|
||||
|
||||
<parent>
|
||||
<groupId>li.strolch</groupId>
|
||||
<artifactId>li.strolch.parent</artifactId>
|
||||
<version>1.1.0-SNAPSHOT</version>
|
||||
<relativePath>../li.strolch.parent/pom.xml</relativePath>
|
||||
<artifactId>li.strolch</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>li.strolch.agent</artifactId>
|
||||
|
||||
<name>li.strolch.agent</name>
|
||||
<description>Strolch Agent which is the runtime for Strolch</description>
|
||||
|
||||
<url>https://github.com/eitchnet/li.strolch.agent</url>
|
||||
|
||||
<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>
|
||||
<!-- main -->
|
||||
<dependency>
|
||||
|
@ -36,8 +22,8 @@
|
|||
<artifactId>li.strolch.model</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ch.eitchnet</groupId>
|
||||
<artifactId>ch.eitchnet.privilege</artifactId>
|
||||
<groupId>li.strolch</groupId>
|
||||
<artifactId>li.strolch.privilege</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-cli</groupId>
|
||||
|
|
|
@ -21,7 +21,7 @@ import java.util.Set;
|
|||
import li.strolch.model.audit.Audit;
|
||||
import li.strolch.model.audit.AuditQuery;
|
||||
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>
|
||||
|
|
|
@ -18,9 +18,9 @@ package li.strolch.agent.api;
|
|||
import java.util.Set;
|
||||
|
||||
import li.strolch.exception.StrolchException;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
import li.strolch.runtime.StrolchConstants;
|
||||
import li.strolch.runtime.privilege.PrivilegeHandler;
|
||||
import ch.eitchnet.privilege.model.Certificate;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
*/
|
||||
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
|
||||
|
|
|
@ -25,11 +25,11 @@ import java.util.Set;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import ch.eitchnet.utils.helper.StringHelper;
|
||||
import li.strolch.agent.impl.ComponentContainerImpl;
|
||||
import li.strolch.runtime.configuration.ConfigurationParser;
|
||||
import li.strolch.runtime.configuration.RuntimeConfiguration;
|
||||
import li.strolch.runtime.configuration.StrolchConfiguration;
|
||||
import li.strolch.utils.helper.StringHelper;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -12,12 +12,12 @@ import org.xml.sax.Attributes;
|
|||
import org.xml.sax.SAXException;
|
||||
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.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 {
|
||||
|
||||
|
|
|
@ -23,8 +23,8 @@ import java.util.Properties;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import ch.eitchnet.privilege.base.PrivilegeException;
|
||||
import ch.eitchnet.privilege.handler.SystemUserAction;
|
||||
import li.strolch.privilege.base.PrivilegeException;
|
||||
import li.strolch.privilege.handler.SystemUserAction;
|
||||
import li.strolch.runtime.StrolchConstants;
|
||||
import li.strolch.runtime.configuration.ComponentConfiguration;
|
||||
import li.strolch.runtime.privilege.RunRunnable;
|
||||
|
|
|
@ -18,7 +18,7 @@ package li.strolch.agent.api;
|
|||
import li.strolch.agent.impl.DataStoreMode;
|
||||
import li.strolch.model.StrolchRootElement;
|
||||
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>
|
||||
|
|
|
@ -17,7 +17,6 @@ package li.strolch.agent.impl;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import ch.eitchnet.utils.dbc.DBC;
|
||||
import li.strolch.agent.api.ActivityMap;
|
||||
import li.strolch.agent.api.AuditTrail;
|
||||
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.query.ActivityQuery;
|
||||
import li.strolch.persistence.api.StrolchTransaction;
|
||||
import li.strolch.utils.dbc.DBC;
|
||||
|
||||
/**
|
||||
* This is the {@link AuditTrail} for {@link Activity Activities}
|
||||
|
|
|
@ -26,8 +26,8 @@ import li.strolch.model.audit.Audit;
|
|||
import li.strolch.model.audit.AuditQuery;
|
||||
import li.strolch.model.audit.AuditVisitor;
|
||||
import li.strolch.persistence.api.StrolchTransaction;
|
||||
import ch.eitchnet.utils.collections.DateRange;
|
||||
import ch.eitchnet.utils.dbc.DBC;
|
||||
import li.strolch.utils.collections.DateRange;
|
||||
import li.strolch.utils.dbc.DBC;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
|
@ -28,7 +28,7 @@ import li.strolch.model.StrolchRootElement;
|
|||
import li.strolch.model.parameter.StringListParameter;
|
||||
import li.strolch.model.parameter.StringParameter;
|
||||
import li.strolch.persistence.api.StrolchTransaction;
|
||||
import ch.eitchnet.utils.dbc.DBC;
|
||||
import li.strolch.utils.dbc.DBC;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
|
@ -24,7 +24,7 @@ import li.strolch.model.Order;
|
|||
import li.strolch.model.OrderVisitor;
|
||||
import li.strolch.model.query.OrderQuery;
|
||||
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}
|
||||
|
|
|
@ -24,7 +24,7 @@ import li.strolch.model.Resource;
|
|||
import li.strolch.model.ResourceVisitor;
|
||||
import li.strolch.model.query.ResourceQuery;
|
||||
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}
|
||||
|
|
|
@ -25,12 +25,11 @@ import li.strolch.model.audit.AuditQuery;
|
|||
import li.strolch.persistence.api.AuditDao;
|
||||
import li.strolch.persistence.api.StrolchTransaction;
|
||||
import li.strolch.persistence.inmemory.InMemoryAuditDao;
|
||||
import li.strolch.utils.collections.DateRange;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import ch.eitchnet.utils.collections.DateRange;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
*/
|
||||
|
|
|
@ -32,11 +32,11 @@ import li.strolch.persistence.api.OrderDao;
|
|||
import li.strolch.persistence.api.PersistenceHandler;
|
||||
import li.strolch.persistence.api.ResourceDao;
|
||||
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 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.utils.dbc.DBC;
|
||||
import li.strolch.utils.helper.StringHelper;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -26,9 +26,6 @@ import java.util.Set;
|
|||
import org.slf4j.Logger;
|
||||
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.ComponentState;
|
||||
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.StrolchRealm;
|
||||
import li.strolch.exception.StrolchException;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
import li.strolch.runtime.StrolchConstants;
|
||||
import li.strolch.runtime.configuration.ComponentConfiguration;
|
||||
import li.strolch.runtime.configuration.StrolchConfiguration;
|
||||
import li.strolch.runtime.configuration.StrolchConfigurationException;
|
||||
import li.strolch.runtime.privilege.PrivilegeHandler;
|
||||
import li.strolch.utils.helper.StringHelper;
|
||||
import li.strolch.utils.helper.SystemHelper;
|
||||
|
||||
public class ComponentContainerImpl implements ComponentContainer {
|
||||
|
||||
|
|
|
@ -23,13 +23,12 @@ import java.util.Set;
|
|||
import li.strolch.runtime.configuration.ComponentConfiguration;
|
||||
import li.strolch.runtime.configuration.StrolchConfiguration;
|
||||
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.LoggerFactory;
|
||||
|
||||
import ch.eitchnet.utils.dbc.DBC;
|
||||
import ch.eitchnet.utils.helper.StringHelper;
|
||||
|
||||
public class ComponentDependencyAnalyzer {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(ComponentDependencyAnalyzer.class);
|
||||
|
|
|
@ -25,12 +25,11 @@ import li.strolch.agent.api.LockHandler;
|
|||
import li.strolch.agent.api.StrolchLockException;
|
||||
import li.strolch.model.Locator;
|
||||
import li.strolch.model.StrolchRootElement;
|
||||
import li.strolch.utils.dbc.DBC;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import ch.eitchnet.utils.dbc.DBC;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
*/
|
||||
|
|
|
@ -29,7 +29,7 @@ import li.strolch.exception.StrolchException;
|
|||
import li.strolch.runtime.StrolchConstants;
|
||||
import li.strolch.runtime.configuration.ComponentConfiguration;
|
||||
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>
|
||||
|
|
|
@ -25,11 +25,11 @@ import li.strolch.agent.api.ResourceMap;
|
|||
import li.strolch.persistence.api.PersistenceHandler;
|
||||
import li.strolch.persistence.api.StrolchTransaction;
|
||||
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.configuration.ComponentConfiguration;
|
||||
import ch.eitchnet.privilege.model.Certificate;
|
||||
import ch.eitchnet.privilege.model.PrivilegeContext;
|
||||
import ch.eitchnet.utils.dbc.DBC;
|
||||
import li.strolch.utils.dbc.DBC;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -27,15 +27,14 @@ import li.strolch.agent.api.OrderMap;
|
|||
import li.strolch.agent.api.ResourceMap;
|
||||
import li.strolch.agent.api.StrolchRealm;
|
||||
import li.strolch.model.StrolchRootElement;
|
||||
import li.strolch.privilege.model.PrivilegeContext;
|
||||
import li.strolch.runtime.StrolchConstants;
|
||||
import li.strolch.runtime.configuration.ComponentConfiguration;
|
||||
import li.strolch.utils.dbc.DBC;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import ch.eitchnet.privilege.model.PrivilegeContext;
|
||||
import ch.eitchnet.utils.dbc.DBC;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
*/
|
||||
|
|
|
@ -22,7 +22,7 @@ import li.strolch.agent.api.AuditTrail;
|
|||
import li.strolch.model.audit.Audit;
|
||||
import li.strolch.model.audit.AuditQuery;
|
||||
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>
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
*/
|
||||
package li.strolch.agent.impl;
|
||||
|
||||
import ch.eitchnet.privilege.handler.SystemUserAction;
|
||||
import ch.eitchnet.privilege.model.PrivilegeContext;
|
||||
import li.strolch.privilege.handler.SystemUserAction;
|
||||
import li.strolch.privilege.model.PrivilegeContext;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -23,7 +23,7 @@ import li.strolch.model.audit.Audit;
|
|||
import li.strolch.model.audit.AuditQuery;
|
||||
import li.strolch.persistence.api.AuditDao;
|
||||
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>
|
||||
|
|
|
@ -24,11 +24,11 @@ import li.strolch.agent.api.OrderMap;
|
|||
import li.strolch.agent.api.ResourceMap;
|
||||
import li.strolch.persistence.api.PersistenceHandler;
|
||||
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 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.utils.dbc.DBC;
|
||||
import li.strolch.utils.helper.StringHelper;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -18,10 +18,6 @@ package li.strolch.agent.impl;
|
|||
import java.io.File;
|
||||
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.AuditTrail;
|
||||
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.StrolchTransaction;
|
||||
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.configuration.ComponentConfiguration;
|
||||
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>
|
||||
|
|
|
@ -26,12 +26,6 @@ import java.util.Set;
|
|||
import org.slf4j.Logger;
|
||||
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.AuditTrail;
|
||||
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.timevalue.IValue;
|
||||
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.privilege.PrivilegeHandler;
|
||||
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>
|
||||
|
|
|
@ -20,7 +20,7 @@ import java.util.Set;
|
|||
|
||||
import li.strolch.model.audit.Audit;
|
||||
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>
|
||||
|
|
|
@ -24,7 +24,7 @@ import li.strolch.model.Order;
|
|||
import li.strolch.model.Resource;
|
||||
import li.strolch.model.activity.Activity;
|
||||
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>
|
||||
|
|
|
@ -17,7 +17,6 @@ package li.strolch.persistence.api;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import ch.eitchnet.privilege.model.Certificate;
|
||||
import li.strolch.agent.api.ActivityMap;
|
||||
import li.strolch.agent.api.AuditTrail;
|
||||
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.OrderQuery;
|
||||
import li.strolch.model.query.ResourceQuery;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
import li.strolch.runtime.StrolchConstants;
|
||||
import li.strolch.service.api.Command;
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ package li.strolch.persistence.api;
|
|||
|
||||
import java.util.Date;
|
||||
|
||||
import ch.eitchnet.utils.helper.StringHelper;
|
||||
import li.strolch.utils.helper.StringHelper;
|
||||
|
||||
public class TransactionResult {
|
||||
|
||||
|
|
|
@ -26,8 +26,8 @@ import li.strolch.model.audit.AuditQuery;
|
|||
import li.strolch.persistence.api.AuditDao;
|
||||
import li.strolch.runtime.query.inmemory.InMemoryAuditQuery;
|
||||
import li.strolch.runtime.query.inmemory.InMemoryAuditQueryVisitor;
|
||||
import ch.eitchnet.utils.collections.DateRange;
|
||||
import ch.eitchnet.utils.collections.MapOfMaps;
|
||||
import li.strolch.utils.collections.DateRange;
|
||||
import li.strolch.utils.collections.MapOfMaps;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -25,8 +25,8 @@ import li.strolch.persistence.api.OrderDao;
|
|||
import li.strolch.persistence.api.PersistenceHandler;
|
||||
import li.strolch.persistence.api.ResourceDao;
|
||||
import li.strolch.persistence.api.StrolchTransaction;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
import li.strolch.runtime.privilege.PrivilegeHandler;
|
||||
import ch.eitchnet.privilege.model.Certificate;
|
||||
|
||||
public class InMemoryPersistence implements PersistenceHandler {
|
||||
|
||||
|
|
|
@ -24,8 +24,8 @@ import li.strolch.persistence.api.OrderDao;
|
|||
import li.strolch.persistence.api.PersistenceHandler;
|
||||
import li.strolch.persistence.api.ResourceDao;
|
||||
import li.strolch.persistence.api.StrolchTransaction;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
import li.strolch.runtime.configuration.ComponentConfiguration;
|
||||
import ch.eitchnet.privilege.model.Certificate;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -20,8 +20,8 @@ import li.strolch.persistence.api.AbstractTransaction;
|
|||
import li.strolch.persistence.api.PersistenceHandler;
|
||||
import li.strolch.persistence.api.TransactionResult;
|
||||
import li.strolch.persistence.api.TransactionState;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
import li.strolch.runtime.privilege.PrivilegeHandler;
|
||||
import ch.eitchnet.privilege.model.Certificate;
|
||||
|
||||
public class InMemoryTransaction extends AbstractTransaction {
|
||||
|
||||
|
|
|
@ -21,8 +21,6 @@ import java.lang.reflect.InvocationTargetException;
|
|||
import java.text.MessageFormat;
|
||||
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.StrolchComponent;
|
||||
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.PolicyType;
|
||||
import li.strolch.runtime.configuration.ComponentConfiguration;
|
||||
import li.strolch.utils.collections.MapOfMaps;
|
||||
import li.strolch.utils.helper.XmlHelper;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
|
@ -22,7 +22,7 @@ import org.xml.sax.Attributes;
|
|||
import org.xml.sax.SAXException;
|
||||
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>
|
||||
|
|
|
@ -15,12 +15,12 @@
|
|||
*/
|
||||
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.model.StrolchModelConstants;
|
||||
import li.strolch.persistence.api.PersistenceHandler;
|
||||
import li.strolch.privilege.handler.PrivilegeHandler;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -24,7 +24,7 @@ import java.util.Set;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import ch.eitchnet.utils.helper.StringHelper;
|
||||
import li.strolch.utils.helper.StringHelper;
|
||||
|
||||
public abstract class AbstractionConfiguration {
|
||||
|
||||
|
|
|
@ -18,9 +18,9 @@ package li.strolch.runtime.configuration;
|
|||
import java.io.File;
|
||||
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.utils.dbc.DBC;
|
||||
import li.strolch.utils.helper.XmlHelper;
|
||||
|
||||
public class ConfigurationParser {
|
||||
|
||||
|
|
|
@ -43,10 +43,10 @@ import org.xml.sax.Attributes;
|
|||
import org.xml.sax.SAXException;
|
||||
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.LocatorBuilder;
|
||||
import li.strolch.utils.dbc.DBC;
|
||||
import li.strolch.utils.helper.StringHelper;
|
||||
|
||||
public class ConfigurationSaxParser extends DefaultHandler {
|
||||
|
||||
|
|
|
@ -15,10 +15,10 @@
|
|||
*/
|
||||
package li.strolch.runtime.configuration;
|
||||
|
||||
import static ch.eitchnet.db.DbConstants.PROP_DB_IGNORE_REALM;
|
||||
import static ch.eitchnet.db.DbConstants.PROP_DB_PASSWORD;
|
||||
import static ch.eitchnet.db.DbConstants.PROP_DB_URL;
|
||||
import static ch.eitchnet.db.DbConstants.PROP_DB_USERNAME;
|
||||
import static li.strolch.db.DbConstants.PROP_DB_IGNORE_REALM;
|
||||
import static li.strolch.db.DbConstants.PROP_DB_PASSWORD;
|
||||
import static li.strolch.db.DbConstants.PROP_DB_URL;
|
||||
import static li.strolch.db.DbConstants.PROP_DB_USERNAME;
|
||||
import static li.strolch.runtime.StrolchConstants.makeRealmKey;
|
||||
|
||||
import java.sql.Connection;
|
||||
|
|
|
@ -21,8 +21,8 @@ import java.text.MessageFormat;
|
|||
import java.util.Properties;
|
||||
|
||||
import li.strolch.runtime.StrolchConstants;
|
||||
import ch.eitchnet.utils.dbc.DBC;
|
||||
import ch.eitchnet.utils.helper.StringHelper;
|
||||
import li.strolch.utils.dbc.DBC;
|
||||
import li.strolch.utils.helper.StringHelper;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -31,11 +31,11 @@ import org.apache.commons.cli.ParseException;
|
|||
import org.slf4j.Logger;
|
||||
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.StrolchBootstrapper;
|
||||
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>
|
||||
|
|
|
@ -15,43 +15,43 @@
|
|||
*/
|
||||
package li.strolch.runtime.privilege;
|
||||
|
||||
import static ch.eitchnet.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;
|
||||
import static li.strolch.privilege.handler.PrivilegeHandler.PARAM_PERSIST_SESSIONS_PATH;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.text.MessageFormat;
|
||||
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.StrolchComponent;
|
||||
import li.strolch.agent.api.StrolchRealm;
|
||||
import li.strolch.model.audit.AccessType;
|
||||
import li.strolch.model.audit.Audit;
|
||||
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.configuration.ComponentConfiguration;
|
||||
import li.strolch.runtime.configuration.RuntimeConfiguration;
|
||||
import li.strolch.utils.helper.XmlHelper;
|
||||
|
||||
public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements PrivilegeHandler {
|
||||
|
||||
public static final String PROP_PRIVILEGE_CONFIG_FILE = "privilegeConfigFile"; //$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) {
|
||||
super(container, componentName);
|
||||
|
@ -65,7 +65,7 @@ public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements
|
|||
RuntimeConfiguration runtimeConfiguration = configuration.getRuntimeConfiguration();
|
||||
File privilegeConfigFile = configuration.getConfigFile(PROP_PRIVILEGE_CONFIG_FILE, PRIVILEGE_CONFIG_XML,
|
||||
runtimeConfiguration);
|
||||
ch.eitchnet.privilege.handler.PrivilegeHandler privilegeHandler = initializeFromXml(configuration,
|
||||
li.strolch.privilege.handler.PrivilegeHandler privilegeHandler = initializeFromXml(configuration,
|
||||
privilegeConfigFile);
|
||||
this.privilegeHandler = privilegeHandler;
|
||||
}
|
||||
|
@ -79,7 +79,7 @@ public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements
|
|||
* @return the initialized {@link PrivilegeHandler} where the {@link EncryptionHandler} and
|
||||
* {@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) {
|
||||
|
||||
// make sure file exists
|
||||
|
@ -189,7 +189,7 @@ public class DefaultStrolchPrivilegeHandler extends StrolchComponent implements
|
|||
}
|
||||
|
||||
@Override
|
||||
public ch.eitchnet.privilege.handler.PrivilegeHandler getPrivilegeHandler(Certificate certificate)
|
||||
public li.strolch.privilege.handler.PrivilegeHandler getPrivilegeHandler(Certificate certificate)
|
||||
throws PrivilegeException {
|
||||
return this.privilegeHandler;
|
||||
}
|
||||
|
|
|
@ -15,10 +15,10 @@
|
|||
*/
|
||||
package li.strolch.runtime.privilege;
|
||||
|
||||
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 li.strolch.privilege.base.PrivilegeException;
|
||||
import li.strolch.privilege.handler.SystemUserAction;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
import li.strolch.privilege.model.PrivilegeContext;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
@ -30,28 +30,28 @@ public interface PrivilegeHandler {
|
|||
* @param password
|
||||
* @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);
|
||||
|
||||
/**
|
||||
* @param certificate
|
||||
* @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;
|
||||
|
||||
/**
|
||||
* @param certificate
|
||||
* @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);
|
||||
|
||||
/**
|
||||
* @param certificate
|
||||
* @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);
|
||||
|
||||
|
@ -59,7 +59,7 @@ public interface PrivilegeHandler {
|
|||
* @param certificate
|
||||
* @return
|
||||
* @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;
|
||||
|
||||
|
@ -67,8 +67,8 @@ public interface PrivilegeHandler {
|
|||
* @param systemUsername
|
||||
* @param action
|
||||
* @throws PrivilegeException
|
||||
* @see ch.eitchnet.privilege.handler.PrivilegeHandler#runAsSystem(java.lang.String,
|
||||
* ch.eitchnet.privilege.handler.SystemUserAction)
|
||||
* @see li.strolch.privilege.handler.PrivilegeHandler#runAsSystem(java.lang.String,
|
||||
* li.strolch.privilege.handler.SystemUserAction)
|
||||
*/
|
||||
public abstract <T extends SystemUserAction> T runAsSystem(String systemUsername, T action)
|
||||
throws PrivilegeException;
|
||||
|
@ -78,14 +78,14 @@ public interface PrivilegeHandler {
|
|||
* @return
|
||||
* @throws PrivilegeException
|
||||
*/
|
||||
public abstract ch.eitchnet.privilege.handler.PrivilegeHandler getPrivilegeHandler(Certificate certificate)
|
||||
public abstract li.strolch.privilege.handler.PrivilegeHandler getPrivilegeHandler(Certificate certificate)
|
||||
throws PrivilegeException;
|
||||
|
||||
/**
|
||||
* @param certificate
|
||||
* @param password
|
||||
* @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;
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package li.strolch.runtime.privilege;
|
||||
|
||||
import ch.eitchnet.privilege.handler.SystemUserAction;
|
||||
import ch.eitchnet.privilege.model.PrivilegeContext;
|
||||
import li.strolch.privilege.handler.SystemUserAction;
|
||||
import li.strolch.privilege.model.PrivilegeContext;
|
||||
import li.strolch.service.api.AbstractService;
|
||||
import li.strolch.service.api.Service;
|
||||
import li.strolch.service.api.ServiceArgument;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package li.strolch.runtime.privilege;
|
||||
|
||||
import ch.eitchnet.privilege.handler.SystemUserAction;
|
||||
import ch.eitchnet.privilege.model.PrivilegeContext;
|
||||
import li.strolch.privilege.handler.SystemUserAction;
|
||||
import li.strolch.privilege.model.PrivilegeContext;
|
||||
|
||||
/**
|
||||
* {@link SystemUserAction} to run {@link Runnable} as a system user
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
*/
|
||||
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.util.HashMap;
|
||||
|
@ -31,10 +31,10 @@ import li.strolch.model.ParameterBag;
|
|||
import li.strolch.model.Resource;
|
||||
import li.strolch.model.parameter.StringParameter;
|
||||
import li.strolch.persistence.api.StrolchTransaction;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
import li.strolch.runtime.StrolchConstants;
|
||||
import li.strolch.runtime.configuration.ComponentConfiguration;
|
||||
import ch.eitchnet.privilege.model.Certificate;
|
||||
import ch.eitchnet.utils.dbc.DBC;
|
||||
import li.strolch.utils.dbc.DBC;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -17,7 +17,7 @@ package li.strolch.runtime.query.enums;
|
|||
|
||||
import java.util.Locale;
|
||||
|
||||
import ch.eitchnet.privilege.model.Certificate;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlRootElement;
|
|||
import javax.xml.bind.annotation.XmlTransient;
|
||||
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>
|
||||
|
|
|
@ -19,8 +19,8 @@ import java.util.List;
|
|||
|
||||
import li.strolch.model.audit.Audit;
|
||||
import li.strolch.persistence.api.AuditDao;
|
||||
import ch.eitchnet.utils.collections.DateRange;
|
||||
import ch.eitchnet.utils.dbc.DBC;
|
||||
import li.strolch.utils.collections.DateRange;
|
||||
import li.strolch.utils.dbc.DBC;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
package li.strolch.runtime.query.inmemory;
|
||||
|
||||
import li.strolch.model.Order;
|
||||
import ch.eitchnet.utils.collections.DateRange;
|
||||
import li.strolch.utils.collections.DateRange;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -17,8 +17,8 @@ package li.strolch.runtime.query.inmemory;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import ch.eitchnet.utils.StringMatchMode;
|
||||
import li.strolch.model.StrolchElement;
|
||||
import li.strolch.utils.StringMatchMode;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -23,7 +23,7 @@ import li.strolch.model.query.ActivityQuery;
|
|||
import li.strolch.model.query.ActivityQueryVisitor;
|
||||
import li.strolch.model.query.StrolchTypeNavigation;
|
||||
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>
|
||||
|
|
|
@ -21,7 +21,7 @@ import java.util.List;
|
|||
import li.strolch.model.audit.Audit;
|
||||
import li.strolch.model.audit.AuditVisitor;
|
||||
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>
|
||||
|
|
|
@ -24,8 +24,8 @@ import li.strolch.model.audit.AuditQueryVisitor;
|
|||
import li.strolch.model.audit.AuditVisitor;
|
||||
import li.strolch.model.audit.ElementSelection;
|
||||
import li.strolch.model.audit.IdentitySelection;
|
||||
import ch.eitchnet.utils.collections.DateRange;
|
||||
import ch.eitchnet.utils.dbc.DBC;
|
||||
import li.strolch.utils.collections.DateRange;
|
||||
import li.strolch.utils.dbc.DBC;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -25,7 +25,7 @@ import li.strolch.model.query.OrderQueryVisitor;
|
|||
import li.strolch.model.query.StateSelection;
|
||||
import li.strolch.model.query.StrolchTypeNavigation;
|
||||
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>
|
||||
|
|
|
@ -24,7 +24,7 @@ import java.util.List;
|
|||
import li.strolch.model.StrolchElement;
|
||||
import li.strolch.model.visitor.StrolchElementVisitor;
|
||||
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>
|
||||
|
|
|
@ -20,7 +20,6 @@ import java.util.Collections;
|
|||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
import ch.eitchnet.utils.dbc.DBC;
|
||||
import li.strolch.model.GroupedParameterizedElement;
|
||||
import li.strolch.model.query.AndSelection;
|
||||
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.runtime.query.inmemory.ParameterBagSelector.NullParameterBagSelector;
|
||||
import li.strolch.runtime.query.inmemory.ParameterSelector.StringParameterSelector;
|
||||
import li.strolch.utils.dbc.DBC;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -23,7 +23,7 @@ import li.strolch.model.query.ResourceQuery;
|
|||
import li.strolch.model.query.ResourceQueryVisitor;
|
||||
import li.strolch.model.query.StrolchTypeNavigation;
|
||||
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>
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
*/
|
||||
package li.strolch.runtime.query.inmemory;
|
||||
|
||||
import ch.eitchnet.utils.StringMatchMode;
|
||||
import li.strolch.model.StrolchElement;
|
||||
import li.strolch.utils.StringMatchMode;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
package li.strolch.runtime.query.inmemory;
|
||||
|
||||
import li.strolch.model.StrolchElement;
|
||||
import ch.eitchnet.utils.dbc.DBC;
|
||||
import li.strolch.utils.dbc.DBC;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -18,8 +18,6 @@ package li.strolch.runtime.query.inmemory;
|
|||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import ch.eitchnet.utils.StringMatchMode;
|
||||
import ch.eitchnet.utils.collections.DateRange;
|
||||
import li.strolch.model.GroupedParameterizedElement;
|
||||
import li.strolch.model.ParameterBag;
|
||||
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.Parameter;
|
||||
import li.strolch.model.parameter.StringParameter;
|
||||
import li.strolch.utils.StringMatchMode;
|
||||
import li.strolch.utils.collections.DateRange;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -20,19 +20,19 @@ import java.text.MessageFormat;
|
|||
import org.slf4j.Logger;
|
||||
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.StrolchComponent;
|
||||
import li.strolch.agent.api.StrolchRealm;
|
||||
import li.strolch.exception.StrolchException;
|
||||
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.configuration.RuntimeConfiguration;
|
||||
import li.strolch.runtime.privilege.PrivilegeHandler;
|
||||
import li.strolch.utils.dbc.DBC;
|
||||
|
||||
/**
|
||||
* @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;
|
||||
|
||||
/**
|
||||
* @see ch.eitchnet.privilege.model.Restrictable#getPrivilegeName()
|
||||
* @see li.strolch.privilege.model.Restrictable#getPrivilegeName()
|
||||
*/
|
||||
@Override
|
||||
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
|
||||
public Object getPrivilegeValue() {
|
||||
|
|
|
@ -18,9 +18,6 @@ package li.strolch.service.api;
|
|||
import org.slf4j.Logger;
|
||||
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.StrolchComponent;
|
||||
import li.strolch.model.PolicyContainer;
|
||||
|
@ -29,6 +26,9 @@ import li.strolch.model.policy.PolicyDefs;
|
|||
import li.strolch.persistence.api.StrolchTransaction;
|
||||
import li.strolch.policy.PolicyHandler;
|
||||
import li.strolch.policy.StrolchPolicy;
|
||||
import li.strolch.privilege.base.PrivilegeException;
|
||||
import li.strolch.privilege.handler.SystemUserAction;
|
||||
import li.strolch.privilege.model.Restrictable;
|
||||
|
||||
/**
|
||||
* <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
|
||||
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
|
||||
public Object getPrivilegeValue() {
|
||||
|
|
|
@ -17,17 +17,17 @@ package li.strolch.service.api;
|
|||
|
||||
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.StrolchComponent;
|
||||
import li.strolch.exception.StrolchAccessDeniedException;
|
||||
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.RuntimeConfiguration;
|
||||
import li.strolch.runtime.privilege.PrivilegeHandler;
|
||||
import li.strolch.utils.helper.StringHelper;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -17,7 +17,7 @@ package li.strolch.service.api;
|
|||
|
||||
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
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
*/
|
||||
package li.strolch.service.api;
|
||||
|
||||
import ch.eitchnet.privilege.model.Certificate;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
|
||||
public interface ServiceHandler {
|
||||
|
||||
|
|
|
@ -26,8 +26,6 @@ import java.util.Properties;
|
|||
import org.slf4j.Logger;
|
||||
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.StrolchAgent;
|
||||
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.ServiceResult;
|
||||
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
|
||||
|
|
|
@ -23,7 +23,6 @@ import org.junit.Test;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import ch.eitchnet.privilege.model.Certificate;
|
||||
import li.strolch.RuntimeMock;
|
||||
import li.strolch.agent.api.ComponentContainer;
|
||||
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.ResourceDao;
|
||||
import li.strolch.persistence.api.StrolchTransaction;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
import li.strolch.runtime.StrolchConstants;
|
||||
import li.strolch.runtime.configuration.model.ResourceGeneratorHandlerTest;
|
||||
import li.strolch.runtime.configuration.model.ServiceHandlerTest;
|
||||
|
|
|
@ -19,7 +19,6 @@ import static org.junit.Assert.assertNotNull;
|
|||
|
||||
import org.junit.Test;
|
||||
|
||||
import ch.eitchnet.privilege.model.Certificate;
|
||||
import li.strolch.RuntimeMock;
|
||||
import li.strolch.agent.ComponentContainerTest;
|
||||
import li.strolch.agent.api.ComponentContainer;
|
||||
|
@ -27,6 +26,7 @@ import li.strolch.model.Resource;
|
|||
import li.strolch.model.policy.PolicyDef;
|
||||
import li.strolch.persistence.api.StrolchTransaction;
|
||||
import li.strolch.policy.PolicyHandler;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
import li.strolch.runtime.StrolchConstants;
|
||||
|
||||
/**
|
||||
|
|
|
@ -6,10 +6,10 @@ import java.io.File;
|
|||
|
||||
import org.junit.Test;
|
||||
|
||||
import ch.eitchnet.utils.helper.FileHelper;
|
||||
import li.strolch.RuntimeMock;
|
||||
import li.strolch.agent.api.StrolchAgent;
|
||||
import li.strolch.agent.api.StrolchBootstrapper;
|
||||
import li.strolch.utils.helper.FileHelper;
|
||||
|
||||
public class BootstrapperTest {
|
||||
|
||||
|
|
|
@ -23,10 +23,10 @@ import java.io.File;
|
|||
|
||||
import org.junit.Test;
|
||||
|
||||
import ch.eitchnet.utils.helper.FileHelper;
|
||||
import li.strolch.RuntimeMock;
|
||||
import li.strolch.agent.api.StrolchAgent;
|
||||
import li.strolch.agent.api.StrolchBootstrapper;
|
||||
import li.strolch.utils.helper.FileHelper;
|
||||
|
||||
@SuppressWarnings("nls")
|
||||
public class ConfigurationParserTest {
|
||||
|
|
|
@ -30,13 +30,13 @@ import org.junit.Rule;
|
|||
import org.junit.Test;
|
||||
import org.junit.rules.ExpectedException;
|
||||
|
||||
import ch.eitchnet.utils.dbc.DBC.DbcException;
|
||||
import li.strolch.agent.api.ComponentState;
|
||||
import li.strolch.agent.api.StrolchComponent;
|
||||
import li.strolch.agent.impl.ComponentContainerImpl;
|
||||
import li.strolch.agent.impl.ComponentContainerStateHandler;
|
||||
import li.strolch.agent.impl.ComponentController;
|
||||
import li.strolch.agent.impl.ComponentDependencyAnalyzer;
|
||||
import li.strolch.utils.dbc.DBC.DbcException;
|
||||
|
||||
@SuppressWarnings("nls")
|
||||
public class ControllerDependencyTest {
|
||||
|
|
|
@ -23,10 +23,10 @@ import java.util.Locale;
|
|||
|
||||
import org.junit.Test;
|
||||
|
||||
import ch.eitchnet.privilege.model.Certificate;
|
||||
import li.strolch.RuntimeMock;
|
||||
import li.strolch.agent.ComponentContainerTest;
|
||||
import li.strolch.agent.api.ComponentContainer;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -34,13 +34,12 @@ import li.strolch.model.audit.AuditQuery;
|
|||
import li.strolch.model.audit.AuditVisitor;
|
||||
import li.strolch.model.audit.NoStrategyAuditVisitor;
|
||||
import li.strolch.persistence.inmemory.InMemoryAuditDao;
|
||||
import li.strolch.utils.StringMatchMode;
|
||||
import li.strolch.utils.collections.DateRange;
|
||||
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
|
||||
import ch.eitchnet.utils.StringMatchMode;
|
||||
import ch.eitchnet.utils.collections.DateRange;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
*/
|
||||
|
|
|
@ -19,7 +19,6 @@ import static org.junit.Assert.assertNotNull;
|
|||
|
||||
import org.junit.Test;
|
||||
|
||||
import ch.eitchnet.privilege.model.Certificate;
|
||||
import li.strolch.RuntimeMock;
|
||||
import li.strolch.agent.ComponentContainerTest;
|
||||
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.timedstate.IntegerTimedState;
|
||||
import li.strolch.persistence.api.StrolchTransaction;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
import li.strolch.runtime.StrolchConstants;
|
||||
|
||||
/**
|
||||
|
|
|
@ -15,8 +15,6 @@
|
|||
*/
|
||||
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.floatListSelection;
|
||||
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.stringListSelection;
|
||||
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 java.util.ArrayList;
|
||||
|
|
|
@ -26,8 +26,6 @@ import java.util.List;
|
|||
|
||||
import org.junit.Test;
|
||||
|
||||
import ch.eitchnet.privilege.model.Certificate;
|
||||
import ch.eitchnet.utils.StringMatchMode;
|
||||
import li.strolch.RuntimeMock;
|
||||
import li.strolch.agent.ComponentContainerTest;
|
||||
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.Selection;
|
||||
import li.strolch.persistence.api.StrolchTransaction;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
import li.strolch.runtime.StrolchConstants;
|
||||
import li.strolch.utils.StringMatchMode;
|
||||
|
||||
/**
|
||||
* @author Robert von Burg <eitch@eitchnet.ch>
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
<Parameter name="autoPersistOnUserChangesData" value="true" />
|
||||
</Parameters>
|
||||
|
||||
<EncryptionHandler class="ch.eitchnet.privilege.handler.DefaultEncryptionHandler">
|
||||
<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
|
||||
<Parameters>
|
||||
<Parameter name="hashAlgorithm" value="SHA-256" />
|
||||
</Parameters>
|
||||
</EncryptionHandler>
|
||||
|
||||
<PersistenceHandler class="ch.eitchnet.privilege.handler.XmlPersistenceHandler">
|
||||
<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
|
||||
<Parameters>
|
||||
<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
|
||||
<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
|
||||
|
@ -24,9 +24,9 @@
|
|||
</Container>
|
||||
|
||||
<Policies>
|
||||
<Policy name="DefaultPrivilege" class="ch.eitchnet.privilege.policy.DefaultPrivilege" />
|
||||
<Policy name="RoleAccessPrivilege" class="ch.eitchnet.privilege.policy.RoleAccessPrivilege" />
|
||||
<Policy name="UserAccessPrivilege" class="ch.eitchnet.privilege.policy.UserAccessPrivilege" />
|
||||
<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
|
||||
<Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
|
||||
<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
|
||||
</Policies>
|
||||
|
||||
</Privilege>
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Roles>
|
||||
<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>
|
||||
</Privilege>
|
||||
</Role>
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
<Parameter name="autoPersistOnUserChangesData" value="true" />
|
||||
</Parameters>
|
||||
|
||||
<EncryptionHandler class="ch.eitchnet.privilege.handler.DefaultEncryptionHandler">
|
||||
<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
|
||||
<Parameters>
|
||||
<Parameter name="hashAlgorithm" value="SHA-256" />
|
||||
</Parameters>
|
||||
</EncryptionHandler>
|
||||
|
||||
<PersistenceHandler class="ch.eitchnet.privilege.handler.XmlPersistenceHandler">
|
||||
<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
|
||||
<Parameters>
|
||||
<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
|
||||
<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
|
||||
|
@ -24,9 +24,9 @@
|
|||
</Container>
|
||||
|
||||
<Policies>
|
||||
<Policy name="DefaultPrivilege" class="ch.eitchnet.privilege.policy.DefaultPrivilege" />
|
||||
<Policy name="RoleAccessPrivilege" class="ch.eitchnet.privilege.policy.RoleAccessPrivilege" />
|
||||
<Policy name="UserAccessPrivilege" class="ch.eitchnet.privilege.policy.UserAccessPrivilege" />
|
||||
<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
|
||||
<Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
|
||||
<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
|
||||
</Policies>
|
||||
|
||||
</Privilege>
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Roles>
|
||||
<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>
|
||||
</Privilege>
|
||||
</Role>
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
</layout>
|
||||
</appender>
|
||||
|
||||
<logger name="ch.eitchnet">
|
||||
<logger name="li.strolch">
|
||||
<level value="info" />
|
||||
</logger>
|
||||
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
<Parameter name="autoPersistOnUserChangesData" value="true" />
|
||||
</Parameters>
|
||||
|
||||
<EncryptionHandler class="ch.eitchnet.privilege.handler.DefaultEncryptionHandler">
|
||||
<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
|
||||
<Parameters>
|
||||
<Parameter name="hashAlgorithm" value="SHA-256" />
|
||||
</Parameters>
|
||||
</EncryptionHandler>
|
||||
|
||||
<PersistenceHandler class="ch.eitchnet.privilege.handler.XmlPersistenceHandler">
|
||||
<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
|
||||
<Parameters>
|
||||
<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
|
||||
<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
|
||||
|
@ -24,9 +24,9 @@
|
|||
</Container>
|
||||
|
||||
<Policies>
|
||||
<Policy name="DefaultPrivilege" class="ch.eitchnet.privilege.policy.DefaultPrivilege" />
|
||||
<Policy name="RoleAccessPrivilege" class="ch.eitchnet.privilege.policy.RoleAccessPrivilege" />
|
||||
<Policy name="UserAccessPrivilege" class="ch.eitchnet.privilege.policy.UserAccessPrivilege" />
|
||||
<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
|
||||
<Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
|
||||
<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
|
||||
</Policies>
|
||||
|
||||
</Privilege>
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Roles>
|
||||
<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>
|
||||
</Privilege>
|
||||
</Role>
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
<Parameter name="autoPersistOnUserChangesData" value="true" />
|
||||
</Parameters>
|
||||
|
||||
<EncryptionHandler class="ch.eitchnet.privilege.handler.DefaultEncryptionHandler">
|
||||
<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
|
||||
<Parameters>
|
||||
<Parameter name="hashAlgorithm" value="SHA-256" />
|
||||
</Parameters>
|
||||
</EncryptionHandler>
|
||||
|
||||
<PersistenceHandler class="ch.eitchnet.privilege.handler.XmlPersistenceHandler">
|
||||
<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
|
||||
<Parameters>
|
||||
<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
|
||||
<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
|
||||
|
@ -24,9 +24,9 @@
|
|||
</Container>
|
||||
|
||||
<Policies>
|
||||
<Policy name="DefaultPrivilege" class="ch.eitchnet.privilege.policy.DefaultPrivilege" />
|
||||
<Policy name="RoleAccessPrivilege" class="ch.eitchnet.privilege.policy.RoleAccessPrivilege" />
|
||||
<Policy name="UserAccessPrivilege" class="ch.eitchnet.privilege.policy.UserAccessPrivilege" />
|
||||
<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
|
||||
<Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
|
||||
<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
|
||||
</Policies>
|
||||
|
||||
</Privilege>
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Roles>
|
||||
<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>
|
||||
</Privilege>
|
||||
</Role>
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
<Parameter name="autoPersistOnUserChangesData" value="true" />
|
||||
</Parameters>
|
||||
|
||||
<EncryptionHandler class="ch.eitchnet.privilege.handler.DefaultEncryptionHandler">
|
||||
<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
|
||||
<Parameters>
|
||||
<Parameter name="hashAlgorithm" value="SHA-256" />
|
||||
</Parameters>
|
||||
</EncryptionHandler>
|
||||
|
||||
<PersistenceHandler class="ch.eitchnet.privilege.handler.XmlPersistenceHandler">
|
||||
<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
|
||||
<Parameters>
|
||||
<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
|
||||
<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
|
||||
|
@ -24,9 +24,9 @@
|
|||
</Container>
|
||||
|
||||
<Policies>
|
||||
<Policy name="DefaultPrivilege" class="ch.eitchnet.privilege.policy.DefaultPrivilege" />
|
||||
<Policy name="RoleAccessPrivilege" class="ch.eitchnet.privilege.policy.RoleAccessPrivilege" />
|
||||
<Policy name="UserAccessPrivilege" class="ch.eitchnet.privilege.policy.UserAccessPrivilege" />
|
||||
<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
|
||||
<Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
|
||||
<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
|
||||
</Policies>
|
||||
|
||||
</Privilege>
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Roles>
|
||||
<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>
|
||||
</Privilege>
|
||||
</Role>
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
<Parameter name="autoPersistOnUserChangesData" value="true" />
|
||||
</Parameters>
|
||||
|
||||
<EncryptionHandler class="ch.eitchnet.privilege.handler.DefaultEncryptionHandler">
|
||||
<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
|
||||
<Parameters>
|
||||
<Parameter name="hashAlgorithm" value="SHA-256" />
|
||||
</Parameters>
|
||||
</EncryptionHandler>
|
||||
|
||||
<PersistenceHandler class="ch.eitchnet.privilege.handler.XmlPersistenceHandler">
|
||||
<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
|
||||
<Parameters>
|
||||
<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
|
||||
<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
|
||||
|
@ -24,9 +24,9 @@
|
|||
</Container>
|
||||
|
||||
<Policies>
|
||||
<Policy name="DefaultPrivilege" class="ch.eitchnet.privilege.policy.DefaultPrivilege" />
|
||||
<Policy name="RoleAccessPrivilege" class="ch.eitchnet.privilege.policy.RoleAccessPrivilege" />
|
||||
<Policy name="UserAccessPrivilege" class="ch.eitchnet.privilege.policy.UserAccessPrivilege" />
|
||||
<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
|
||||
<Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
|
||||
<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
|
||||
</Policies>
|
||||
|
||||
</Privilege>
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Roles>
|
||||
<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>
|
||||
</Privilege>
|
||||
</Role>
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
<?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>
|
||||
|
||||
<parent>
|
||||
<groupId>li.strolch</groupId>
|
||||
<artifactId>li.strolch.parent</artifactId>
|
||||
<version>1.1.0-SNAPSHOT</version>
|
||||
<relativePath>../li.strolch.parent</relativePath>
|
||||
<artifactId>li.strolch</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>li.strolch.bom</artifactId>
|
||||
|
@ -14,12 +15,6 @@
|
|||
<name>li.strolch.bom</name>
|
||||
<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>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue