argeo.osgi.start.2.http=\
org.eclipse.equinox.http.servlet,\
-org.eclipse.equinox.http.jetty
+org.eclipse.equinox.http.jetty,\
+org.eclipse.rap.rwt.osgi
argeo.osgi.start.3.node=\
org.argeo.cms
argeo.osgi.start.4.apps=\
-org.eclipse.rap.rwt.osgi,\
org.eclipse.gemini.blueprint.extender
argeo.osgi.start.4.workbench=\
# DON'T CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING
eclipse.ignoreApp=true
osgi.noShutdown=true
+org.eclipse.equinox.http.jetty.autostart=false
# Avoid errors logs (see https://issues.apache.org/jira/browse/JCR-2226)
org.apache.jackrabbit.core.statementcache=false
\ No newline at end of file
<reference id="repository" interface="javax.jcr.Repository"\r
filter="(argeo.jcr.repository.alias=slc)" />\r
\r
- <reference id="authenticationManager"\r
- interface="org.springframework.security.authentication.AuthenticationManager" />\r
+<!-- <reference id="authenticationManager" -->\r
+<!-- interface="org.springframework.security.authentication.AuthenticationManager" /> -->\r
\r
<reference id="modulesManager"\r
interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
\r
<bean id="agentCli" class="org.argeo.slc.core.execution.DefaultAgentCli">\r
<property name="agent" ref="agent" />\r
- <property name="authenticationManager" ref="authenticationManager" />\r
+<!-- <property name="authenticationManager" ref="authenticationManager" /> -->\r
</bean>\r
\r
<bean id="executionModulesListener" class="org.argeo.slc.jcr.execution.JcrExecutionModulesListener"\r
\r
<!-- Thread-bound session is used when multiple threads with various authentication \r
will call the component -->\r
- <bean id="session" class="org.argeo.security.jcr.SecureThreadBoundSession">\r
- <property name="repository" ref="repository" />\r
- </bean>\r
+<!-- <bean id="session" class="org.argeo.security.jcr.SecureThreadBoundSession"> -->\r
+<!-- <property name="repository" ref="repository" /> -->\r
+<!-- </bean> -->\r
\r
<bean id="attachmentUploader" class="org.argeo.slc.jcr.execution.JcrAttachmentUploader">\r
- <property name="session" ref="session" />\r
+<!-- <property name="session" ref="session" /> -->\r
</bean>\r
\r
\r
<bean\r
class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">\r
- <property name="authenticationManager" ref="authenticationManager" />\r
+<!-- <property name="authenticationManager" ref="authenticationManager" /> -->\r
</bean>\r
\r
\r
cardinality="0..N">\r
<listener ref="modulesManager" />\r
</list>\r
+ <reference id="userTransaction" interface="javax.transaction.UserTransaction" />\r
+ <reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />\r
\r
<!-- SERVICES -->\r
<service ref="modulesManager" interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
</beans:bean>\r
\r
<!-- ROLES -->\r
- <reference id="userAdminService" interface="org.argeo.security.UserAdminService" />\r
+<!-- <reference id="userAdminService" interface="org.argeo.security.UserAdminService" /> -->\r
\r
<beans:bean class="org.argeo.security.core.SimpleRoleRegistration"\r
init-method="run">\r
<beans:property name="role" value="ROLE_SLC" />\r
- <beans:property name="userAdminService" ref="userAdminService" />\r
+ <beans:property name="userAdmin" ref="userAdmin" />\r
+ <beans:property name="userTransaction" ref="userTransaction" />\r
+<!-- <beans:property name="userAdminService" ref="userAdminService" /> -->\r
</beans:bean>\r
</beans:beans>
\ No newline at end of file
filter="(argeo.jcr.repository.alias=node)" />\r
\r
<reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
- <reference id="keyring" interface="org.argeo.security.crypto.CryptoKeyring" />\r
+ <reference id="keyring" interface="org.argeo.util.security.CryptoKeyring" />\r
\r
</beans:beans>
\ No newline at end of file
filter="(argeo.jcr.repository.alias=java)" />\r
\r
<reference id="repositoryFactory" interface="javax.jcr.RepositoryFactory" />\r
- <reference id="keyring" interface="org.argeo.security.crypto.CryptoKeyring" />\r
+ <reference id="keyring" interface="org.argeo.util.security.CryptoKeyring" />\r
\r
<reference id="nodeRepository" interface="javax.jcr.Repository"\r
filter="(argeo.jcr.repository.alias=node)" />\r
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.security.OsAuthenticationToken;
import org.argeo.slc.DefaultNameVersion;
import org.argeo.slc.NameVersion;
import org.argeo.slc.SlcException;
import org.argeo.slc.execution.ExecutionSpecAttribute;
import org.argeo.slc.execution.SlcAgent;
import org.argeo.slc.execution.SlcAgentCli;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.core.context.SecurityContextHolder;
/**
* Authenticates thread and executes synchronously a command line execution.
private final static String UTF8 = "UTF-8";
private SlcAgent agent;
- private AuthenticationManager authenticationManager;
+// private AuthenticationManager authenticationManager;
private Long timeout = 24 * 60 * 60 * 1000l;
public String process(String[] args) {
- if (SecurityContextHolder.getContext().getAuthentication() == null) {
- OsAuthenticationToken oat = new OsAuthenticationToken();
- Authentication authentication = authenticationManager
- .authenticate(oat);
- SecurityContextHolder.getContext()
- .setAuthentication(authentication);
- }
+// if (SecurityContextHolder.getContext().getAuthentication() == null) {
+// OsAuthenticationToken oat = new OsAuthenticationToken();
+// Authentication authentication = authenticationManager
+// .authenticate(oat);
+// SecurityContextHolder.getContext()
+// .setAuthentication(authentication);
+// }
if (args.length > 0 && args[0].equals("help")) {
StringBuilder buf = new StringBuilder();
this.agent = agent;
}
- public void setAuthenticationManager(
- AuthenticationManager authenticationManager) {
- this.authenticationManager = authenticationManager;
- }
+// public void setAuthenticationManager(
+// AuthenticationManager authenticationManager) {
+// this.authenticationManager = authenticationManager;
+// }
public void setTimeout(Long timeout) {
this.timeout = timeout;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.SlcException;
import org.argeo.slc.execution.ExecutionFlowDescriptor;
import org.argeo.slc.execution.ExecutionModulesManager;
import org.argeo.slc.execution.ExecutionStep;
import org.argeo.slc.execution.RealizedFlow;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
/** Thread of a single execution */
public class ExecutionThread extends Thread {
public void run() {
// authenticate thread
- Authentication authentication = getProcessThreadGroup()
- .getAuthentication();
- if (authentication == null)
- throw new SlcException("Can only execute authenticated threads");
- SecurityContextHolder.getContext().setAuthentication(authentication);
+// Authentication authentication = getProcessThreadGroup()
+// .getAuthentication();
+// if (authentication == null)
+// throw new SlcException("Can only execute authenticated threads");
+// SecurityContextHolder.getContext().setAuthentication(authentication);
// Retrieve execution flow descriptor
ExecutionFlowDescriptor executionFlowDescriptor = realizedFlow
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.SlcException;
import org.argeo.slc.execution.ExecutionModulesManager;
import org.argeo.slc.execution.ExecutionProcess;
import org.argeo.slc.execution.ExecutionStep;
import org.argeo.slc.execution.RealizedFlow;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
/**
* Main thread coordinating an {@link ExecutionProcess}, launching parallel or
public final void run() {
// authenticate thread
- Authentication authentication = getProcessThreadGroup()
- .getAuthentication();
- if (authentication == null)
- throw new SlcException("Can only execute authenticated threads");
- SecurityContextHolder.getContext().setAuthentication(authentication);
+// Authentication authentication = getProcessThreadGroup()
+// .getAuthentication();
+// if (authentication == null)
+// throw new SlcException("Can only execute authenticated threads");
+// SecurityContextHolder.getContext().setAuthentication(authentication);
log.info("\n##\n## SLC Process #" + process.getUuid()
+ " STARTED\n##\n");
import org.argeo.slc.execution.ExecutionProcess;
import org.argeo.slc.execution.ExecutionStep;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
/** The thread group attached to a given {@link SlcExecution}. */
public class ProcessThreadGroup extends ThreadGroup {
- // private final ExecutionModulesManager executionModulesManager;
- // private final ProcessThread processThread;
- private final Authentication authentication;
+// private final Authentication authentication;
private final static Integer STEPS_BUFFER_CAPACITY = 5000;
private BlockingQueue<ExecutionStep> steps = new ArrayBlockingQueue<ExecutionStep>(
public ProcessThreadGroup(ExecutionProcess executionProcess) {
super("SLC Process #" + executionProcess.getUuid() + " thread group");
- // this.executionModulesManager = executionModulesManager;
- // this.processThread = processThread;
- this.authentication = SecurityContextHolder.getContext()
- .getAuthentication();
+// this.authentication = SecurityContextHolder.getContext()
+// .getAuthentication();
}
- public Authentication getAuthentication() {
- return authentication;
- }
+// public Authentication getAuthentication() {
+// return authentication;
+// }
public void dispatchAddStep(ExecutionStep step) {
// ExecutionProcess slcProcess = processThread.getProcess();
import org.argeo.slc.test.TestResult;
import org.argeo.slc.test.TestStatus;
import org.springframework.core.io.Resource;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
/** Execute an OS specific system call. */
public class SystemCall implements Runnable {
private Boolean exceptionOnFailed = true;
private Boolean mergeEnvironmentVariables = true;
- private Authentication authentication;
+// private Authentication authentication;
private String osConsole = null;
private String generateScript = null;
/** Executes the system call. */
public void run() {
- authentication = SecurityContextHolder.getContext().getAuthentication();
+// authentication = SecurityContextHolder.getContext().getAuthentication();
// Manage streams
Writer stdOutWriter = null;
/** Log from the underlying streams. */
protected void log(String logLevel, String line) {
// TODO optimize
- if (SecurityContextHolder.getContext().getAuthentication() == null) {
- SecurityContextHolder.getContext()
- .setAuthentication(authentication);
- }
+// if (SecurityContextHolder.getContext().getAuthentication() == null) {
+// SecurityContextHolder.getContext()
+// .setAuthentication(authentication);
+// }
if ("ERROR".equals(logLevel))
log.error(line);
<reference id="nodeRepository" interface="javax.jcr.Repository"\r
filter="(argeo.jcr.repository.alias=node)" />\r
\r
- <reference id="authenticationManager"\r
- interface="org.springframework.security.authentication.AuthenticationManager" />\r
+<!-- <reference id="authenticationManager" -->\r
+<!-- interface="org.springframework.security.authentication.AuthenticationManager" /> -->\r
\r
<!-- SERVICES -->\r
<service ref="jcrRepository" interface="javax.jcr.Repository">\r
<bean
class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
<description><![CDATA[Executes initialization with a system authentication]]></description>
- <property name="authenticationManager" ref="authenticationManager" />
+<!-- <property name="authenticationManager" ref="authenticationManager" /> -->
</bean>
</beans>
\ No newline at end of file
<parent>
<groupId>org.argeo.commons</groupId>
<artifactId>argeo-commons</artifactId>
- <version>2.1.29-SNAPSHOT</version>
+ <version>2.1.31-SNAPSHOT</version>
</parent>
<groupId>org.argeo.slc</groupId>
<artifactId>argeo-slc</artifactId>
<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
<version.slc>2.1.1-SNAPSHOT</version.slc>
<!-- Libraries versions -->
- <version.argeo-tp-extras>2.1.5</version.argeo-tp-extras>
+ <version.argeo-tp-extras>2.1.7</version.argeo-tp-extras>
</properties>
<modules>
<!-- Runtime -->