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
log4j.logger.org.apache.directory.server.core.partition=ERROR
log4j.logger.org.apache.directory.server.core.schema.bootstrap.BootstrapAttributeTypeRegistry=ERROR
-log4j.logger.org.apache.jackrabbit=WARN
+log4j.logger.org.apache.jackrabbit=INFO
log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR
## Appenders
<plugin id="com.springsource.org.antlr"/>
<plugin id="com.springsource.org.aopalliance"/>
<plugin id="com.springsource.org.apache.bsf"/>
+ <plugin id="com.springsource.org.apache.catalina"/>
<plugin id="com.springsource.org.apache.commons.beanutils"/>
<plugin id="com.springsource.org.apache.commons.codec"/>
<plugin id="com.springsource.org.apache.commons.collections"/>
<plugin id="com.springsource.org.apache.commons.net"/>
<plugin id="com.springsource.org.apache.commons.pool"/>
<plugin id="com.springsource.org.apache.commons.vfs"/>
+ <plugin id="com.springsource.org.apache.coyote" fragment="true"/>
<plugin id="com.springsource.org.apache.derby"/>
<plugin id="com.springsource.org.apache.directory.server.changepw"/>
<plugin id="com.springsource.org.apache.directory.server.core" fragment="true"/>
<plugin id="com.springsource.org.apache.directory.server.protocol.shared"/>
<plugin id="com.springsource.org.apache.directory.shared.asn1"/>
<plugin id="com.springsource.org.apache.directory.shared.ldap"/>
+ <plugin id="com.springsource.org.apache.el"/>
+ <plugin id="com.springsource.org.apache.jasper" fragment="true"/>
+ <plugin id="com.springsource.org.apache.jasper.org.eclipse.jdt"/>
+ <plugin id="com.springsource.org.apache.juli.extras"/>
<plugin id="com.springsource.org.apache.log4j"/>
<plugin id="com.springsource.org.apache.lucene"/>
<plugin id="com.springsource.org.apache.mina"/>
<plugin id="org.argeo.dep.osgi.aether"/>
<plugin id="org.argeo.dep.osgi.boilerpipe"/>
<plugin id="org.argeo.dep.osgi.bouncycastle.jdk15"/>
+ <plugin id="org.argeo.dep.osgi.catalina.start"/>
<plugin id="org.argeo.dep.osgi.commons.cli"/>
<plugin id="org.argeo.dep.osgi.commons.exec"/>
<plugin id="org.argeo.dep.osgi.directory.shared.asn.codec" fragment="true"/>
<plugin id="org.argeo.security.ui.application"/>
<plugin id="org.argeo.server.ads"/>
<plugin id="org.argeo.server.ads.server"/>
+ <plugin id="org.argeo.server.catalina" fragment="true"/>
<plugin id="org.argeo.server.core"/>
<plugin id="org.argeo.server.ext.jackrabbit" fragment="true"/>
<plugin id="org.argeo.server.jackrabbit"/>
+ <plugin id="org.argeo.server.jackrabbit.webapp"/>
<plugin id="org.argeo.server.jcr"/>
<plugin id="org.argeo.server.jdbc" fragment="true"/>
<plugin id="org.argeo.server.json"/>
<plugin id="org.argeo.server.tika.jackrabbit" fragment="true"/>
+ <plugin id="org.argeo.server.tomcat" fragment="true"/>
+ <plugin id="org.argeo.server.webextender" fragment="true"/>
<plugin id="org.argeo.slc.agent"/>
<plugin id="org.argeo.slc.agent.ext.bsf" fragment="true"/>
<plugin id="org.argeo.slc.agent.ext.jdbc" fragment="true"/>
<plugin id="org.argeo.slc.client.agent"/>
<plugin id="org.argeo.slc.client.commons"/>
<plugin id="org.argeo.slc.client.core"/>
- <plugin id="org.argeo.slc.client.gis"/>
+ <plugin id="org.argeo.slc.client.gis" fragment=""/>
<plugin id="org.argeo.slc.client.hibernate"/>
<plugin id="org.argeo.slc.client.oxm"/>
<plugin id="org.argeo.slc.client.rcp"/>
<plugin id="org.argeo.slc.support.maven"/>
<plugin id="org.argeo.slc.support.osgi"/>
<plugin id="org.argeo.slc.support.simple"/>
+ <plugin id="org.argeo.slc.ui.gis"/>
+ <plugin id="org.argeo.slc.ui.gis.rcp"/>
<plugin id="org.eclipse.core.commands"/>
<plugin id="org.eclipse.core.contenttype"/>
<plugin id="org.eclipse.core.databinding"/>
<plugin id="org.springframework.osgi.core"/>
<plugin id="org.springframework.osgi.extender"/>
<plugin id="org.springframework.osgi.io"/>
+ <plugin id="org.springframework.osgi.web"/>
+ <plugin id="org.springframework.osgi.web.extender"/>
<plugin id="org.springframework.oxm"/>
<plugin id="org.springframework.security.acls" fragment="true"/>
<plugin id="org.springframework.security.core"/>
</plugins>
<configurations>
+ <plugin id="org.argeo.dep.osgi.catalina.start" autoStart="true" startLevel="0" />
<plugin id="org.argeo.security.equinox" autoStart="true" startLevel="0" />
<plugin id="org.argeo.security.manager.ldap" autoStart="true" startLevel="0" />
<plugin id="org.argeo.security.services" autoStart="true" startLevel="0" />
<plugin id="org.argeo.server.ads.server" autoStart="true" startLevel="0" />
+ <plugin id="org.argeo.server.jackrabbit.webapp" autoStart="true" startLevel="0" />
<plugin id="org.argeo.slc.agent" autoStart="true" startLevel="0" />
<plugin id="org.argeo.slc.client.agent" autoStart="true" startLevel="0" />
<plugin id="org.argeo.slc.client.commons" autoStart="true" startLevel="0" />
<plugin id="org.argeo.slc.server.jackrabbit.pgsql" autoStart="true" startLevel="0" />
<plugin id="org.argeo.slc.server.services" autoStart="true" startLevel="0" />
<plugin id="org.springframework.osgi.extender" autoStart="true" startLevel="0" />
+ <plugin id="org.springframework.osgi.web.extender" autoStart="true" startLevel="0" />
</configurations>
</product>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>sdkWithModules</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.argeo.slc.modules</groupId>
+ <artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
+ <version>${version.slc}</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>sdkWithoutModules</id>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>sdkWithModules</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.argeo.slc.modules</groupId>
- <artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
- <version>${version.slc}</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.argeo.slc.modules</groupId>
- <artifactId>org.argeo.slc.modules.server.bundles</artifactId>
- <version>${version.slc}</version>
- <type>pom</type>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>sdkWithoutModules</id>
- </profile>
- <profile>
- <id>release</id>
- <properties>
- <argeo.p2.repository>/srv/projects/slc/www/sdk</argeo.p2.repository>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.argeo.slc.modules</groupId>
- <artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
- <version>${version.slc}</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.argeo.slc.modules</groupId>
- <artifactId>org.argeo.slc.modules.server.bundles</artifactId>
- <version>${version.slc}</version>
- <type>pom</type>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
\ No newline at end of file
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>sdkWithModules</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.argeo.slc.modules</groupId>
+ <artifactId>org.argeo.slc.modules.gis.bundles</artifactId>
+ <version>${version.slc}</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>sdkWithoutModules</id>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
<profile>
<id>sdkWithoutModules</id>
</profile>
- <profile>
- <id>release</id>
- <properties>
- <argeo.p2.repository>/srv/projects/slc/www/sdk</argeo.p2.repository>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.argeo.slc.eclipse</groupId>
- <artifactId>org.argeo.slc.eclipse.modules.bundles</artifactId>
- <version>${version.slc}</version>
- <type>pom</type>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
\ No newline at end of file
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>sdkWithModules</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.argeo.slc.modules</groupId>
+ <artifactId>org.argeo.slc.modules.server.bundles</artifactId>
+ <version>${version.slc}</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>sdkWithoutModules</id>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
http://www.springframework.org/schema/beans \r
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
\r
+ <service ref="shapeFileDataStore" interface="org.geotools.data.DataStore" />\r
<service ref="postGisDataStore" interface="org.geotools.data.DataStore" />\r
<service ref="backend" interface="org.argeo.slc.geotools.Backend" />\r
</beans:beans>
\ No newline at end of file
<property name="jaiImageIoClassLoader" ref="jai.imageio.bdClassLoader" />\r
</bean>\r
\r
+ <bean id="shapeFileDataStore" class="org.geotools.data.FileDataStoreFinder"\r
+ factory-method="getDataStore">\r
+ <constructor-arg\r
+ value="file:///home/mbaudier/gis/data/providers/naturalearth/1.3.0/10m_cultural/10m_admin_0_countries.shp" />\r
+ </bean>\r
\r
<bean id="postGisDataStore" factory-bean="postGisDataStoreFactory"\r
factory-method="createDataStore">\r
--- /dev/null
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.argeo.slc</groupId>
+ <artifactId>modules</artifactId>
+ <version>0.13.1-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <groupId>org.argeo.slc.modules</groupId>
+ <artifactId>gis</artifactId>
+ <packaging>bundles</packaging>
+ <name>SLC Modules GIS</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.argeo.maven.plugins</groupId>
+ <artifactId>maven-argeo-osgi-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <bundlesPomArtifactId>org.argeo.slc.modules.gis.bundles</bundlesPomArtifactId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
<modules>
<module>agent</module>
<module>server</module>
+ <module>gis</module>
</modules>
</project>
http://www.springframework.org/schema/beans \r
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
\r
- <service ref="jcrRepository" interface="javax.jcr.Repository"/>\r
+ <service ref="jcrRepository" interface="javax.jcr.Repository">\r
+ <service-properties>\r
+ <beans:entry key="argeo.jcr.repository.name" value="repo" />\r
+ </service-properties>\r
+ </service>\r
\r
</beans:beans>
\ No newline at end of file
<AccessManager
class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
</AccessManager>
- <!-- <LoginModule -->
- <!-- class="org.springframework.security.providers.jaas.SecurityContextLoginModule"> -->
- <!-- </LoginModule> -->
- <LoginModule
- class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">
- <param name="anonymousId" value="anonymous" />
- <param name="adminId" value="admin" />
- </LoginModule>
+ <LoginModule
+ class="org.springframework.security.providers.jaas.SecurityContextLoginModule">
+ </LoginModule>
+<!-- <LoginModule-->
+<!-- class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">-->
+<!-- <param name="anonymousId" value="anonymous" />-->
+<!-- <param name="adminId" value="admin" />-->
+<!-- </LoginModule>-->
</Security>
</Repository>
\ No newline at end of file
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>
- SpringSource Enterprise Bundle Repository - External
- Bundle
- Releases
- </name>
- <url>
- http://repository.springsource.com/maven/bundles/external
- </url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- </repository>
- </repositories>
</project>
\ No newline at end of file
--- /dev/null
+package org.argeo.slc.geotools.map;
+
+import com.vividsolutions.jts.geom.Point;
+
+public interface OverlayLocationReceiver {
+ public void receiveOverlayLocation(Point point, Boolean stale);
+}
--- /dev/null
+package org.argeo.slc.jts;
+
+import java.util.List;
+
+import org.argeo.slc.geotools.map.OverlayLocationReceiver;
+import org.argeo.slc.gis.model.FieldPosition;
+
+public class PositionUpdater implements Runnable {
+ private PositionProvider positionProvider;
+ private List<OverlayLocationReceiver> positionReceivers;
+ /** in s */
+ private Integer positionRefreshPeriod = 1;
+
+ private Thread thread;
+ private Boolean running = false;
+
+ private FieldPosition currentPosition = null;
+
+ public void run() {
+ while (running) {
+ FieldPosition position = positionProvider.currentPosition();
+
+ for (OverlayLocationReceiver receiver : positionReceivers) {
+ if (position != null) {
+ currentPosition = position;
+ receiver.receiveOverlayLocation(
+ currentPosition.getLocation(), false);
+ } else {
+ receiver.receiveOverlayLocation(
+ currentPosition.getLocation(), true);
+ }
+ }
+
+ try {
+ Thread.sleep(positionRefreshPeriod * 1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public void start() {
+ running = true;
+ thread = new Thread(this, "Position Updater");
+ thread.start();
+ }
+
+ public void stop() {
+ running = false;
+ try {
+ thread.join();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void setPositionProvider(PositionProvider positionProvider) {
+ this.positionProvider = positionProvider;
+ }
+
+ public void setPositionRefreshPeriod(Integer positionRefreshPeriod) {
+ this.positionRefreshPeriod = positionRefreshPeriod;
+ }
+
+}
\ No newline at end of file