Merge branch 'AAD-79-legend'

deploy/pom.xml

@@ -110,6 +110,9 @@
 								<copy file="${project.build.directory}/classes/alfresco/alfresco-global.properties"
 									  todir="${rms.deploy.dir}/${rms.alfresco.context}/WEB-INF/classes"
 									  overwrite="true"/>
+								<copy file="${project.build.directory}/classes/alfresco/log4j.properties"
+									  todir="${rms.deploy.dir}/${rms.alfresco.context}/WEB-INF/classes"
+									  overwrite="true"/>
 							</tasks>
 						</configuration>
 						<goals>
@@ -158,7 +161,19 @@
 	<properties>
 		<rms.deploy.dir>${project.build.directory}/deploy</rms.deploy.dir>
 		<rms.alfresco.context>alfresco</rms.alfresco.context>
+		<rms.alfresco.logdir>/var/log/tomcat6/alfresco</rms.alfresco.logdir>
 		<rms.map.context>map</rms.map.context>
+		<rms.cmis.username>admin</rms.cmis.username>
+		<rms.cmis.password>admin</rms.cmis.password>
+		<rms.cmis.db.username>alfresco</rms.cmis.db.username>
+		<rms.cmis.db.password>alfresco</rms.cmis.db.password>
+		<!--  different port to run on tomcat, cannot run in same jetty -->
+		<rms.cmis.url.server>http://localhost:8080/alfresco/</rms.cmis.url.server>
+		<rms.cmis.url.browse>http://localhost:8080/alfresco/</rms.cmis.url.browse>
+		<rms.cmis.repository>Main Repository</rms.cmis.repository>
+		<rms.cmis.folder>ktunaxa</rms.cmis.folder>
+		<rms.cmis.data>/var/data/alfresco</rms.cmis.data>
+
 	</properties>
 
 </project>

deploy/src/main/resources/alfresco/log4j.properties

@@ -0,0 +1,248 @@
+# Set root logger level to error
+log4j.rootLogger=error, Console, File
+
+###### Console appender definition #######
+
+# All outputs currently set to be a ConsoleAppender.
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
+log4j.appender.Console.layout=org.apache.log4j.PatternLayout
+
+# use log4j NDC to replace %x with tenant domain / username
+log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %x %-5p [%c{3}] %m%n
+#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
+
+###### File appender definition #######
+log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.File.File=${rms.alfresco.logdir}/alfresco.log
+log4j.appender.File.Append=true
+log4j.appender.File.DatePattern='.'yyyy-MM-dd
+log4j.appender.File.layout=org.apache.log4j.PatternLayout
+log4j.appender.File.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
+
+###### Hibernate specific appender definition #######
+#log4j.appender.file=org.apache.log4j.FileAppender
+#log4j.appender.file.File=hibernate.log
+#log4j.appender.file.layout=org.apache.log4j.PatternLayout
+#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+
+###### Log level overrides #######
+
+# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
+# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
+# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
+# Log4j addLoggerMBean as long as the logger exists and has been loaded.
+
+# Hibernate
+log4j.logger.org.hibernate=error
+log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal
+log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal
+log4j.logger.org.hibernate.type=warn
+log4j.logger.org.hibernate.cfg.SettingsFactory=warn
+
+# Spring
+log4j.logger.org.springframework=warn
+# Turn off Spring remoting warnings that should really be info or debug.
+log4j.logger.org.springframework.remoting.support=error
+log4j.logger.org.springframework.util=error
+
+# Axis/WSS4J
+log4j.logger.org.apache.axis=info
+log4j.logger.org.apache.ws=info
+
+# CXF
+log4j.logger.org.apache.cxf=error
+
+# MyFaces
+log4j.logger.org.apache.myfaces.util.DebugUtils=info
+log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
+log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
+log4j.logger.org.apache.myfaces.taglib=error
+
+# OpenOfficeConnection
+log4j.logger.net.sf.jooreports.openoffice.connection=fatal
+
+# log prepared statement cache activity ###
+log4j.logger.org.hibernate.ps.PreparedStatementCache=info
+
+# Alfresco
+log4j.logger.org.alfresco=error
+log4j.logger.org.alfresco.repo.admin=info
+log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn
+log4j.logger.org.alfresco.repo.model.filefolder=info
+log4j.logger.org.alfresco.repo.tenant=info
+log4j.logger.org.alfresco.repo.avm=info
+log4j.logger.org.alfresco.config=info
+log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
+log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn
+log4j.logger.org.alfresco.repo.management.subsystems=info
+log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn
+log4j.logger.org.alfresco.repo.security.sync=info
+log4j.logger.org.alfresco.repo.security.person=info
+
+log4j.logger.org.alfresco.sample=info
+log4j.logger.org.alfresco.web=info
+#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug
+#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug
+#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug
+#log4j.logger.org.alfresco.web.bean.clipboard=debug
+log4j.logger.org.alfresco.repo.webservice=info
+log4j.logger.org.alfresco.service.descriptor.DescriptorService=info
+#log4j.logger.org.alfresco.web.page=debug
+
+log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error
+#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
+
+log4j.logger.org.alfresco.web.ui.common.Utils=error
+#log4j.logger.org.alfresco.web.ui.common.Utils=info
+
+log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info
+log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info
+
+# Specific patches
+log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info
+log4j.logger.org.alfresco.repo.version.VersionMigrator=info
+log4j.logger.org.alfresco.repo.admin.patch.impl.ResetWCMToGroupBasedPermissionsPatch=info
+
+log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info
+log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info
+log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info
+log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn
+log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn
+log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info
+log4j.logger.org.alfresco.repo.node.index.AVMFullIndexRecoveryComponent=info
+log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info
+log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn
+log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn
+log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn
+log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn
+log4j.logger.org.alfresco.repo.jgroups.AlfrescoJGroupsChannelFactory=info
+log4j.logger.org.alfresco.enterprise.repo.cache.jgroups.JGroupsKeepAliveHeartbeatReceiver=info
+log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn
+
+#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug
+#log4j.logger.org.alfresco.repo.cache.EhCacheTracerJob=debug
+
+log4j.logger.org.alfresco.repo.workflow=error
+#log4j.logger.org.alfresco.repo.workflow=info
+
+# CIFS server debugging
+log4j.logger.org.alfresco.smb.protocol=error
+#log4j.logger.org.alfresco.smb.protocol.auth=debug
+#log4j.logger.org.alfresco.acegi=debug
+
+# FTP server debugging
+log4j.logger.org.alfresco.ftp.protocol=error
+#log4j.logger.org.alfresco.ftp.server=debug
+
+# WebDAV debugging
+#log4j.logger.org.alfresco.webdav.protocol=debug
+log4j.logger.org.alfresco.webdav.protocol=error
+
+# NTLM servlet filters
+#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
+#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
+
+# Kerberos servlet filters
+#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
+#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
+
+# File servers
+log4j.logger.org.alfresco.fileserver=warn
+
+# Repo filesystem debug logging
+#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
+
+# AVM filesystem debug logging
+#log4j.logger.org.alfresco.filesys.avm.AVMDiskDriver=debug
+
+# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
+log4j.logger.org.alfresco.repo.node.integrity=ERROR
+
+# Indexer debugging
+log4j.logger.org.alfresco.repo.search.Indexer=error
+#log4j.logger.org.alfresco.repo.search.Indexer=debug
+
+log4j.logger.org.alfresco.repo.search.impl.lucene.index=error
+#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG
+
+# Audit debugging
+# log4j.logger.org.alfresco.repo.audit=DEBUG
+# log4j.logger.org.alfresco.repo.audit.model=DEBUG
+
+# Forms debugging
+# log4j.logger.org.alfresco.web.forms=debug
+# log4j.logger.org.chiba.xml.xforms=debug
+log4j.logger.org.alfresco.web.forms.xforms.XFormsBean=error
+log4j.logger.org.alfresco.web.forms.XSLTRenderingEngine=error
+
+# Property sheet and modelling debugging
+# change to error to hide the warnings about missing properties and associations
+log4j.logger.alfresco.missingProperties=warn
+log4j.logger.org.alfresco.web.ui.repo.component.property.UIChildAssociation=warn
+log4j.logger.org.alfresco.web.ui.repo.component.property.UIAssociation=warn
+#log4j.logger.org.alfresco.web.ui.repo.component.property=debug
+
+# Dictionary/Model debugging
+log4j.logger.org.alfresco.repo.dictionary=warn
+log4j.logger.org.alfresco.repo.dictionary.types.period=warn
+
+# Virtualization Server Registry
+log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error
+
+# Spring context runtime property setter
+log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info
+
+# Debugging options for clustering
+log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error
+log4j.logger.org.alfresco.repo.content.replication=error
+
+#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
+
+# Activity service
+log4j.logger.org.alfresco.repo.activities=info
+
+# User usage tracking
+log4j.logger.org.alfresco.repo.usage=info
+
+# Sharepoint
+log4j.logger.org.alfresco.module.vti=info
+
+# Forms Engine
+log4j.logger.org.alfresco.repo.forms=info
+log4j.logger.org.alfresco.web.config.forms=info
+log4j.logger.org.alfresco.web.scripts.forms=info
+
+# CMIS
+log4j.logger.org.alfresco.cmis=error
+log4j.logger.org.alfresco.cmis.dictionary=warn
+
+# IMAP
+log4j.logger.org.alfresco.repo.imap=info
+
+# JBPM
+# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler 
+log4j.logger.org.jbpm.graph.def.GraphElement=fatal
+
+#log4j.logger.org.alfresco.repo.googledocs=debug
+
+###### Scripting #######
+
+# Web Framework
+log4j.logger.org.springframework.extensions.webscripts=info
+log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
+log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
+
+# Repository
+log4j.logger.org.alfresco.repo.web.scripts=warn
+log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info
+log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off
+log4j.logger.org.alfresco.repo.jscript=error
+log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn
+log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info
+
+log4j.logger.org.alfresco.repo.avm.actions=info
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+log4j.logger.freemarker.runtime=
+

map/pom.xml

@@ -24,7 +24,6 @@
 		<artifactId>ktunaxa-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
-	<groupId>org.ktunaxa.referral</groupId>
 	<artifactId>ktunaxa-map</artifactId>
 	<packaging>war</packaging>
 	<name>Mapping dashboard</name>
@@ -166,11 +165,17 @@
 			<artifactId>geomajas-testdata</artifactId>
 		</dependency>
 
+		<dependency>
+		  <groupId>org.geomajas.widget</groupId>
+		  <artifactId>geomajas-widget-layer-gwt</artifactId>
+		</dependency>
+
 		<!-- Hibernate layer can be removed if not needed, but the "Road" class needs the Hibernate stuff -->
 		<dependency>
 			<groupId>org.geomajas.plugin</groupId>
 			<artifactId>geomajas-layer-hibernate</artifactId>
 		</dependency>
+
 		<!-- uncomment if you want to use Hibernate with postgis, for another db you will need similar dependencies -->
 		<dependency>
 			<groupId>org.hibernatespatial</groupId>
@@ -282,13 +287,23 @@
 				<filtering>true</filtering>
 				<includes>
 					<include>META-INF/geomajasContext.xml</include>
-				</includes>
+					<include>spring/security.xml</include>
+					<include>spring/cmis.xml</include>
+					<include>spring/bpm.xml</include>
+					<include>spring/mail.xml</include>
+					<include>spring/dispatcher.xml</include>
+				</includes>				
 			</resource>
 			<resource>
 				<directory>src/main/resources</directory>
 				<filtering>false</filtering>
 				<excludes>
 					<exclude>META-INF/geomajasContext.xml</exclude>
+					<exclude>spring/security.xml</exclude>
+					<exclude>spring/cmis.xml</exclude>
+					<exclude>spring/bpm.xml</exclude>
+					<exclude>spring/mail.xml</exclude>
+					<exclude>spring/dispatcher.xml</exclude>
 					<exclude>developer-context.xml</exclude>
 					<exclude>developer-webContext.xml</exclude>
 				</excludes>
@@ -402,16 +417,7 @@
 				<configuration>
 					<webResources>
 						<resource>
-							<filtering>true</filtering>
 							<directory>src/main/webapp</directory>
-							<includes>
-								<include>WEB-INF/security.xml</include>
-								<include>WEB-INF/cmis.xml</include>
-								<include>WEB-INF/bpm.xml</include>
-								<include>WEB-INF/mail.xml</include>
-								<include>WEB-INF/dispatcher.xml</include>
-								<!-- include any other file types you want to filter -->
-							</includes>
 						</resource>
 					</webResources>
 				</configuration>
@@ -800,7 +806,7 @@
 		<rms.cmis.url.browse>http://localhost:8080/alfresco/</rms.cmis.url.browse>
 		<rms.cmis.repository>Main Repository</rms.cmis.repository>
 		<rms.cmis.folder>ktunaxa</rms.cmis.folder>
-		<rms.cmis.data>${project.basedir}/var/data/alfresco</rms.cmis.data>
+		<rms.cmis.data>/var/data/alfresco</rms.cmis.data>
 		<rms.local.dispatcher.url>/d/</rms.local.dispatcher.url>
 
 		<gwt.compiler.skip>false</gwt.compiler.skip>

map/src/main/java/org/ktunaxa/referral/KtunaxaEntryPoint.gwt.xml

@@ -22,6 +22,7 @@
     <inherits name="org.geomajas.gwt.GeomajasClient"/>
 	<inherits name="org.geomajas.widget.searchandfilter.SearchAndFilter" />
 	<inherits name="org.geomajas.widget.utility.gwt.GwtUtilityWidgets" />
+	<inherits name="org.geomajas.widget.layer.Layer" />
 	<inherits name="org.geomajas.plugin.geocoder.Geocoder" />
 	<inherits name="org.geomajas.plugin.printing.Printing" />
 	<inherits name="org.geomajas.plugin.staticsecurity.StaticSecurity" />
@@ -55,7 +56,7 @@
 
 	<!-- set target browser to compile for, use this to limit to the browser used for testing -->
 	<!-- where value = "ie6/opera/gecko1_8/safari/gecko" , "gecko1_8" is FireFox 3 -->
-	<!-- set-property name="user.agent" value="gecko1_8" /> -->
-
+<!-- 	<set-property name="user.agent" value="gecko1_8" />
+ -->
     <entry-point class="org.ktunaxa.referral.client.KtunaxaEntryPoint"/>
 </module>