log4j.logger.org.springframework=WARN
#log4j.logger.org.springframework.web=DEBUG
#log4j.logger.org.springframework.jms=WARN
-#log4j.logger.org.springframework.security=DEBUG
+log4j.logger.org.springframework.security=DEBUG
#log4j.logger.org.springframework.ldap=TRACE
#log4j.logger.org.springframework.osgi.web=TRACE
<plugin id="org.argeo.eclipse.ui"/>
<plugin id="org.argeo.eclipse.ui.jcr"/>
<plugin id="org.argeo.eclipse.ui.rcp"/>
+ <plugin id="org.argeo.infra.core"/>
+ <plugin id="org.argeo.infra.security.services" fragment="true"/>
+ <plugin id="org.argeo.jcr.ui.explorer"/>
<plugin id="org.argeo.security.activemq"/>
<plugin id="org.argeo.security.core"/>
<plugin id="org.argeo.security.equinox"/>
<plugin id="org.argeo.slc.agent.ext.jdbc" fragment="true"/>
<plugin id="org.argeo.slc.agent.ext.xalan" fragment="true"/>
<plugin id="org.argeo.slc.client.agent"/>
- <plugin id="org.argeo.slc.client.commons" fragment=""/>
<plugin id="org.argeo.slc.client.core"/>
<plugin id="org.argeo.slc.client.hibernate"/>
<plugin id="org.argeo.slc.client.oxm"/>
argeo.osgi.start=\
org.springframework.osgi.extender,\
+org.argeo.server.ads.server,\
+org.argeo.node.repo.jackrabbit,\
+org.argeo.slc.server.h2,\
+org.argeo.slc.server.castor,\
+org.argeo.slc.server.hibernate,\
+org.argeo.security.manager.ldap,\
+org.argeo.security.services,\
+org.argeo.slc.server.services,\
com.springsource.javax.servlet,\
+org.argeo.security.equinox,\
org.eclipse.core.runtime,\
org.eclipse.equinox.common,\
-org.eclipse.equinox.http.jetty,\
-org.eclipse.equinox.http.registry,\
org.eclipse.equinox.launcher,\
-org.mortbay.jetty.server,\
-org.argeo.security.equinox,\
-org.argeo.security.manager.ldap,\
-org.argeo.security.services,\
-org.argeo.server.ads.server,\
+org.springframework.osgi.web.extender,\
+org.argeo.dep.osgi.catalina.start,\
+org.argeo.jackrabbit.webapp,\
+org.eclipse.equinox.http.registry,\
+org.argeo.server.osgi.webapp,\
org.argeo.slc.agent,\
org.argeo.slc.client.agent,\
-org.argeo.slc.client.commons,\
org.argeo.slc.client.core,\
org.argeo.slc.client.hibernate,\
org.argeo.slc.client.oxm,\
org.argeo.slc.client.ui,\
org.argeo.slc.demo.ant,\
org.argeo.slc.demo.basic,\
-org.argeo.slc.demo.ant,\
-org.argeo.slc.server.castor,\
-org.argeo.slc.server.h2,\
-org.argeo.slc.server.hibernate,\
-org.argeo.slc.server.services,\
-org.argeo.slc.gis.position.backend,\
-org.argeo.node.repo.jackrabbit,\
org.argeo.slc.ui.gis.rap,\
eclipse.ignoreApp=true
log4j.configuration=file:../../log4j.properties
-org.eclipse.equinox.http.jetty.log.stderr.threshold=debug
-org.osgi.service.http.port=9090
+argeo.node.repo.home=~/.argeo/server_noderepo
+argeo.node.repo.dburl=jdbc:h2:file:~/.argeo/h2/server_noderepo_db
# LDAP
</plugins>
</build>
<dependencies>
+ <!-- Perspectives -->
<dependency>
<groupId>org.argeo.slc.eclipse</groupId>
- <artifactId>org.argeo.slc.client.rap</artifactId>
+ <artifactId>org.argeo.slc.client.ui</artifactId>
+ <version>${version.slc}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.argeo.slc.eclipse</groupId>
+ <artifactId>org.argeo.slc.client.ui.dist</artifactId>
<version>${version.slc}</version>
</dependency>
+ <!-- Secure Application -->
<dependency>
<groupId>org.argeo.commons.security</groupId>
<artifactId>org.argeo.security.ui.rap</artifactId>
<version>${version.argeo-commons}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.argeo.slc.eclipse</groupId>
+ <artifactId>org.argeo.slc.client.rap</artifactId>
+ <version>${version.slc}</version>
+ </dependency>
+ <!-- Back-end Dependencies -->
<dependency>
<groupId>org.argeo.slc.dep</groupId>
- <artifactId>org.argeo.slc.dep.sdk.rcp</artifactId>
+ <artifactId>org.argeo.slc.dep.backend</artifactId>
<version>${version.slc}</version>
- <exclusions>
- <exclusion>
- <groupId>org.argeo.commons.eclipse</groupId>
- <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.argeo.slc.eclipse</groupId>
- <artifactId>org.argeo.slc.client.rcp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.argeo.commons.eclipse</groupId>
- <artifactId>org.argeo.eclipse.ui.rcp</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
\ No newline at end of file
</plugins>
</build>
<dependencies>
+ <!-- Perspectives -->
<dependency>
<groupId>org.argeo.slc.eclipse</groupId>
<artifactId>org.argeo.slc.client.ui</artifactId>
<!-- Secure Application -->
<dependency>
<groupId>org.argeo.commons.security</groupId>
- <artifactId>org.argeo.security.ui.application</artifactId>
+ <artifactId>org.argeo.security.ui.rcp</artifactId>
<version>${version.argeo-commons}</version>
</dependency>
-
<dependency>
<groupId>org.argeo.slc.eclipse</groupId>
<artifactId>org.argeo.slc.client.rcp</artifactId>
<version>${version.slc}</version>
</dependency>
-
<!-- Back-end Dependencies -->
<dependency>
<groupId>org.argeo.slc.dep</groupId>
Bundle-ActivationPolicy: lazy
Import-Package: javax.servlet;version="2.4.0",
javax.servlet.http;version="2.4.0",
- org.argeo.security.ui.application,
- org.argeo.slc.client.ui.perspectives
+ org.argeo.security.ui.rap
package org.argeo.slc.client.rap;
-import org.argeo.security.ui.application.RapSecureWorkbenchWindowAdvisor;
+import org.argeo.security.ui.rap.RapSecureWorkbenchWindowAdvisor;
import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
/**
package org.argeo.slc.client.rap;
-import org.argeo.security.ui.application.SecureRap;
-import org.argeo.security.ui.application.SecureWorkbenchAdvisor;
+import org.argeo.security.ui.rap.SecureEntryPoint;
+import org.argeo.security.ui.rap.SecureWorkbenchAdvisor;
import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
import org.eclipse.ui.application.WorkbenchAdvisor;
import org.eclipse.ui.application.WorkbenchWindowAdvisor;
* This class controls all aspects of the application's execution and is
* contributed through the plugin.xml.
*/
-public class SlcSecureRap extends SecureRap {
+public class SlcSecureRap extends SecureEntryPoint {
@Override
org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.argeo.slc.client.ui.perspectives,
+Import-Package: org.argeo.security.ui.rcp,
+ org.argeo.slc.client.ui.perspectives,
org.argeo.slc.core.test.tree,
org.argeo.slc.execution,
org.argeo.slc.process,
org.argeo.slc.runtime,
- org.argeo.security.ui.application,
org.argeo.slc.services,
org.argeo.slc.services.impl
<!-- Argeo common distribution for Secured UI -->
<dependency>
<groupId>org.argeo.commons.security</groupId>
- <artifactId>org.argeo.security.ui.application</artifactId>
+ <artifactId>org.argeo.security.ui.rcp</artifactId>
<version>${version.argeo-commons}</version>
</dependency>
package org.argeo.slc.client.rcp;
-import org.argeo.security.ui.application.SecureRcp;
+import org.argeo.security.ui.rcp.SecureRcp;
import org.eclipse.ui.application.WorkbenchAdvisor;
/**
package org.argeo.slc.client.rcp;
-import org.argeo.security.ui.application.SecureWorkbenchWindowAdvisor;
+import org.argeo.security.ui.rcp.SecureWorkbenchWindowAdvisor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.Executor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
private final SlcAgentDescriptorDao slcAgentDescriptorDao;
private final SlcAgentFactory agentFactory;
- private ArgeoSecurityService securityService;
+ private Executor securityService;
private Long pingCycle = 20000l;
// if (pingCycle > 0)
// new PingThread().start();
if (pingCycle > 0) {
- Thread authenticatedThread = new Thread(securityService
- .wrapWithSystemAuthentication(new AgentsPing()),
- "SLC Agents Ping");
+ Thread authenticatedThread = new Thread("SLC Agents Ping") {
+ public void run() {
+ securityService.execute(new AgentsPing());
+ }
+ };
authenticatedThread.start();
}
this.pingCycle = pingCycle;
}
- public void setSecurityService(ArgeoSecurityService securityService) {
+ public void setSecurityService(Executor securityService) {
this.securityService = securityService;
}
</plugins>
</build>
<dependencies>
+ <!-- Commons -->
+ <dependency>
+ <groupId>org.argeo.commons.basic</groupId>
+ <artifactId>org.argeo.basic.nodeps</artifactId>
+ <version>${version.argeo-commons}</version>
+ </dependency>
+
<!-- SLC -->
<dependency>
<groupId>org.argeo.slc.runtime</groupId>
<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
</dependency>
+ <!-- Spring -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.orm</artifactId>
+ </dependency>
+
<!-- GIS -->
<dependency>
<groupId>org.argeo.dep.osgi</groupId>
<artifactId>org.argeo.dep.osgi.jai.imageio</artifactId>
</dependency>
+ <!-- TEST -->
+ <dependency>
+ <groupId>org.argeo.slc.runtime</groupId>
+ <artifactId>org.argeo.slc.unit</artifactId>
+ <scope>test</scope>
+ <version>${version.slc}</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
\r
package org.argeo.slc.gpx.hibernate;\r
\r
-import java.io.File;\r
-import java.io.FileInputStream;\r
\r
-import org.apache.commons.io.IOUtils;\r
-import org.argeo.slc.gpx.TrackDao;\r
-import org.argeo.slc.hibernate.unit.HibernateTestCase;\r
-import org.hibernatespatial.HBSpatialExtension;\r
-import org.hibernatespatial.cfg.HSConfiguration;\r
-\r
-public class HibernateTrackDaoTestCase extends HibernateTestCase {\r
- static {\r
- HSConfiguration config = new HSConfiguration();\r
- config.setDefaultDialect("org.hibernatespatial.postgis.PostgisDialect");\r
- \r
- HBSpatialExtension.setConfiguration(config);\r
- }\r
-\r
- public void testImport() throws Exception {\r
- String sensor = "mbaudier";\r
- File dir = new File("/home/mbaudier/ArgeoOffice/perso/gps/trips/2010");\r
-\r
- TrackDao trackDao = getBean(TrackDao.class);\r
- long begin = System.currentTimeMillis();\r
- for (File file : dir.listFiles()) {\r
- if (!file.getName().endsWith(".gpx"))\r
- continue;\r
- FileInputStream in = null;\r
- try {\r
- in = new FileInputStream(file);\r
- trackDao.importTrackPoints(sensor, in);\r
- } catch (Exception e) {\r
- log.warn("Could not import " + file + ": " + e.getMessage());\r
- throw e;\r
- } finally {\r
- IOUtils.closeQuietly(in);\r
- }\r
- }\r
- double duration = System.currentTimeMillis() - begin;\r
- if (log.isDebugEnabled())\r
- log.debug("Imported files from " + dir + " in "\r
- + (duration / 1000 / 60) + " min");\r
- }\r
+public class HibernateTrackDaoTestCase {//extends HibernateTestCase {\r
+// static {\r
+// HSConfiguration config = new HSConfiguration();\r
+// config.setDefaultDialect("org.hibernatespatial.postgis.PostgisDialect");\r
+// \r
+// HBSpatialExtension.setConfiguration(config);\r
+// }\r
+//\r
+// public void testImport() throws Exception {\r
+// String sensor = "mbaudier";\r
+// File dir = new File("/home/mbaudier/ArgeoOffice/perso/gps/trips/2010");\r
+//\r
+// TrackDao trackDao = getBean(TrackDao.class);\r
+// long begin = System.currentTimeMillis();\r
+// for (File file : dir.listFiles()) {\r
+// if (!file.getName().endsWith(".gpx"))\r
+// continue;\r
+// FileInputStream in = null;\r
+// try {\r
+// in = new FileInputStream(file);\r
+// trackDao.importTrackPoints(sensor, in);\r
+// } catch (Exception e) {\r
+// log.warn("Could not import " + file + ": " + e.getMessage());\r
+// throw e;\r
+// } finally {\r
+// IOUtils.closeQuietly(in);\r
+// }\r
+// }\r
+// double duration = System.currentTimeMillis() - begin;\r
+// if (log.isDebugEnabled())\r
+// log.debug("Imported files from " + dir + " in "\r
+// + (duration / 1000 / 60) + " min");\r
+// }\r
}\r