</dependency>
<dependency>
<groupId>org.argeo.tp.rap.e4</groupId>
- <artifactId>com.ibm.icu.base</artifactId>
+ <artifactId>com.ibm.icu</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.rap.e4</groupId>
</dependency>
<!-- CMS Dependencies -->
- <dependency>
- <groupId>org.argeo.tp.javax</groupId>
- <artifactId>javax.transaction</artifactId>
- </dependency>
<!-- TODO: not bitronix dependent -->
<dependency>
<groupId>org.argeo.tp.misc</groupId>
</dependency>
<dependency>
<groupId>org.argeo.tp.rap.platform</groupId>
- <artifactId>com.ibm.icu.base</artifactId>
+ <artifactId>com.ibm.icu</artifactId>
</dependency>
<dependency>
<groupId>org.argeo.tp.rap.platform</groupId>
<groupId>org.argeo.tp.rap.platform</groupId>
<artifactId>org.eclipse.rap.ui.workbench</artifactId>
</dependency>
-
- <!-- Eclipse 4 -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.rap.e4</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.emf.common</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.emf.ecore.change</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.emf.ecore.xmi</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.ui.workbench.renderers.swt</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.ui.di</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.core.di</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.ui.workbench.addons.swt</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.core.commands</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.ui.bindings</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.ui.workbench.swt</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.core.di.extensions.supplier</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.ui.model.workbench</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.emf.xpath</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.core.contexts</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.core.services</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.core.di.annotations</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.ui.services</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.rap.fileupload</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.core.di.extensions</artifactId> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
- <!-- <artifactId>org.eclipse.e4.ui.workbench</artifactId> -->
- <!-- </dependency> -->
-
</dependencies>
<dependencyManagement>
<dependencies>
Map<String, String> properties = new HashMap<String, String>();
properties.put(WebClient.PAGE_TITLE, pageTitle);
- E4ApplicationConfig config = new E4ApplicationConfig(e4Xmi, lifeCycleUri, null, false, true, true);
+ E4ApplicationConfig config = new E4ApplicationConfig(e4Xmi, lifeCycleUri, null, null, false, true, true);
addEntryPoint(application, config, properties);
}
public void shutdown() {
if (nodeHttp != null)
nodeHttp.destroy();
- if (deployConfig != null)
- deployConfig.save();
+ if (deployConfig != null) {
+ new Thread(() -> deployConfig.save(), "Save Argeo Deploy Config").start();
+ }
}
private void checkReadiness() {
private void initServices() {
// JTA
- String tmType = KernelUtils.getFrameworkProp(NodeConstants.TRANSACTION_MANAGER, NodeConstants.TRANSACTION_MANAGER_SIMPLE);
+ String tmType = KernelUtils.getFrameworkProp(NodeConstants.TRANSACTION_MANAGER,
+ NodeConstants.TRANSACTION_MANAGER_SIMPLE);
if (NodeConstants.TRANSACTION_MANAGER_SIMPLE.equals(tmType)) {
initSimpleTransactionManager();
} else if (NodeConstants.TRANSACTION_MANAGER_BITRONIX.equals(tmType)) {
if (kernelThread != null)
kernelThread.destroyAndJoin();
- applyStopHooks();
+ // In a different state in order to avois interruptions
+ new Thread(() -> applyStopHooks(), "Apply Argeo Stop Hooks").start();
+ // applyStopHooks();
long duration = ((System.currentTimeMillis() - availableSince) / 1000) / 60;
log.info("## ARGEO CMS STOPPED after " + (duration / 60) + "h " + (duration % 60) + "min uptime ##");
Thread[] threads = new Thread[rootThreadGroup.activeCount()];
rootThreadGroup.enumerate(threads, true);
for (Thread thread : threads) {
- if (thread.getName().equals("Gogo shell"))
+ if (thread.getName().equals("pipe-gosh --login --noshutdown"))
return thread;
}
return null;
package org.argeo.cms.internal.kernel;
+import java.awt.image.Kernel;
import java.io.File;
import java.lang.management.ManagementFactory;
import org.apache.commons.logging.LogFactory;
import org.apache.jackrabbit.api.stats.RepositoryStatistics;
import org.apache.jackrabbit.stats.RepositoryStatisticsImpl;
-import org.argeo.cms.CmsException;
import org.argeo.cms.internal.auth.CmsSessionImpl;
/**
* monitor/control other processes.
*/
class KernelThread extends Thread {
+ private final static Log log = LogFactory.getLog(KernelThread.class);
+
private RepositoryStatisticsImpl repoStats;
/** The smallest period of operation, in ms */
synchronized void destroyAndJoin() {
running = false;
notifyAll();
- interrupt();
- try {
- join(PERIOD * 2);
- } catch (InterruptedException e) {
- throw new CmsException("Kernel thread destruction was interrupted");
- }
+// interrupt();
+// try {
+// join(PERIOD * 2);
+// } catch (InterruptedException e) {
+// // throw new CmsException("Kernel thread destruction was interrupted");
+// log.error("Kernel thread destruction was interrupted", e);
+// }
}
}
* RESERVED ROLES
*/
String ROLES_BASEDN = "ou=roles,ou=node";
+ String TOKENS_BASEDN = "ou=tokens,ou=node";
String ROLE_ADMIN = "cn=admin," + ROLES_BASEDN;
String ROLE_USER_ADMIN = "cn=userAdmin," + ROLES_BASEDN;
String ROLE_DATA_ADMIN = "cn=dataAdmin," + ROLES_BASEDN;
String I18N_LOCALES = "argeo.i18n.locales";
// Node Security
String ROLES_URI = "argeo.node.roles.uri";
+ String TOKENS_URI = "argeo.node.tokens.uri";
/** URI to an LDIF file or LDAP server used as initialization or backend */
String USERADMIN_URIS = "argeo.node.useradmin.uris";
// Transaction manager
<!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
<properties>
<version.argeo-commons>2.1.76-SNAPSHOT</version.argeo-commons>
- <version.argeo-tp>2.1.20</version.argeo-tp>
+ <version.argeo-tp>2.1.21-SNAPSHOT</version.argeo-tp>
<!-- RPM -->
<argeo.rpm.release>7</argeo.rpm.release>
<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>