fixing the released packages

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@279 04253f4f-3451-0410-a141-5562f1e59037

maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml

@@ -45,7 +45,7 @@
 		<repository>
 			<id>alfresco-public</id>
       <url>http://maven.alfresco.com/nexus/content/groups/public</url>
-s		</repository>
+		</repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>

maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml

@@ -1,52 +1,93 @@
-#set( $symbol_pound = '#' )
+<alfresco-config>
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-<beans>
    
-   <!-- Custom application properties loading -->
 
-	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+   <config evaluator="string-compare" condition="Server">
-		<property name="ignoreResourceNotFound" value="true" />
+      <server>
-		<property name="locations">
+         <!-- Enable and adjust the following settings to allow for external access URLs to the
-			<list>
+              WebScript Framework - to return an externally accessable address for absolute url generation.
-				<value>classpath:alfresco/web-extension/application.properties</value>
-			</list>
-		</property>
-	</bean>
-
-   <!-- uncomment this section (or override bean def in custom app context) for remote component deploy -->
-   <!-- Override WebScripts searchpath - to include remote store -->
-   <!--
-   
-	<bean id="webframework.searchpath" class="org.alfresco.web.scripts.SearchPath">
-      <property name="searchPath">
-         <list>
-            <ref bean="webframework.remotestore.webscripts" />
-            <ref bean="webframework.store.webscripts.custom" />
-            <ref bean="webframework.store.webscripts" />
-            <ref bean="webscripts.store" />
-         </list>
-      </property>
-   </bean>
               -->
+         <scheme>${share.server.scheme}</scheme>
+         <hostname>${share.server.name}</hostname>
+         <port>${share.server.port}</port>
+      </server>
+   </config>
 
-   <!-- uncomment this section (or override bean def in custom app context) for remote component deploy -->
+
-   <!-- Override Templates and Scripts searchpath - to include remote store -->
+   <!-- Overriding endpoints to reference a remote Alfresco server -->
-   <!--
+   
-   <bean id="webframework.templates.searchpath" class="org.alfresco.web.scripts.SearchPath">
+   <config evaluator="string-compare" condition="Remote">
-      <property name="searchPath">
+    <remote>
-         <list>
+
-            <ref bean="webframework.remotestore.webscripts" />
+      <!-- Endpoints -->
-            <ref bean="webframework.store.webscripts.custom" />
+      <!-- Example of a 'declared' identity endpoint configuration
-            <ref bean="webframework.store.system-templates" />
+      <endpoint>
-            <ref bean="webframework.store.templates" />
+        <id>alfresco-system</id>
-            <ref bean="webframework.store.webscripts" />
+        <name>Alfresco - System access</name>
-         </list>
+        <description>System account access to Alfresco</description>
-      </property>
+        <connector-id>alfresco</connector-id>
-   </bean>
+        <endpoint-url>http://localhost:8080/alfresco/s</endpoint-url>
+        <identity>declared</identity>
+        <username>admin</username>
+        <password>admin</password>
+        <unsecure>true</unsecure>
+      </endpoint> -->
+
+      <endpoint>
+        <id>alfresco-noauth</id>
+        <name>Alfresco - unauthenticated access</name>
+        <description>Access to Alfresco Repository WebScripts that do not require authentication</description>
+        <connector-id>alfresco</connector-id>
+        <endpoint-url>${alfresco.server.scheme}://${alfresco.server.name}:${alfresco.server.port}/${alfresco.webapp.name}/s</endpoint-url>
+        <identity>none</identity>
+      </endpoint>
+
+      <endpoint>
+        <id>alfresco</id>
+        <name>Alfresco - user access</name>
+        <description>Access to Alfresco Repository WebScripts that require user authentication</description>
+        <connector-id>alfresco</connector-id>
+        <endpoint-url>${alfresco.server.scheme}://${alfresco.server.name}:${alfresco.server.port}/${alfresco.webapp.name}/s</endpoint-url>
+        <identity>user</identity>
+      </endpoint>
+
+    </remote>
+  </config>
+  
+  
+  
+   <!-- Overriding endpoints to reference an Alfresco server with external SSO or NTLM enabled -->
+   <!-- NOTE: For NTLM, the NTLM Authentication Filter must also be enabled in share web.xml -->
+   <!-- NOTE: if utilising a load balancer between web-tier and repository cluster, the "sticky -->
+   <!--       sessions" feature of your load balancer must be used -->
+   <!-- Uses SSL client certificate + trusted CAs. Optionally used to authenticate share to an external SSO system such as CAS
+   <config evaluator="string-compare" condition="Remote">
+        <remote>
+            <keystore>
+                <path>alfresco/web-extension/alfresco-system.p12</path>
+                <type>pkcs12</type>
+                <password>alfresco-system</password>
+            </keystore>
+         
+            <connector>
+                <id>alfrescoCookie</id>
+                <name>Alfresco Connector</name>
+                <description>Connects to an Alfresco instance using cookie-based authentication</description>
+                <class>org.alfresco.connector.AlfrescoConnector</class>
+            </connector>
+
+            <endpoint>
+                <id>alfresco</id>
+                <name>Alfresco - user access</name>
+                <description>Access to Alfresco Repository WebScripts that require user authentication</description>
+                <connector-id>alfrescoCookie</connector-id>
+                <endpoint-url>http://localhost/alfresco/wcs</endpoint-url>
+                <identity>user</identity>
+                <external-auth>true</external-auth>
+            </endpoint>
+        </remote>
+                
+    </config>
     -->
         
 
-</beans>
+</alfresco-config>

maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/webscript-framework-config-custom.xml

@@ -1,6 +1,3 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
 <alfresco-config>
    
 
@@ -9,9 +6,9 @@
          <!-- Enable and adjust the following settings to allow for external access URLs to the
               WebScript Framework - to return an externally accessable address for absolute url generation.
               -->
-         <scheme>${symbol_dollar}{share.server.scheme}</scheme>
+         <scheme>${share.server.scheme}</scheme>
-         <hostname>${symbol_dollar}{share.server.name}</hostname>
+         <hostname>${share.server.name}</hostname>
-         <port>${symbol_dollar}{share.server.port}</port>
+         <port>${share.server.port}</port>
       </server>
    </config>
 
@@ -40,7 +37,7 @@
         <name>Alfresco - unauthenticated access</name>
         <description>Access to Alfresco Repository WebScripts that do not require authentication</description>
         <connector-id>alfresco</connector-id>
-        <endpoint-url>${symbol_dollar}{alfresco.server.scheme}://${symbol_dollar}{alfresco.server.name}:${symbol_dollar}{alfresco.server.port}/${symbol_dollar}{alfresco.webapp.name}/s</endpoint-url>
+        <endpoint-url>${alfresco.server.scheme}://${alfresco.server.name}:${alfresco.server.port}/${alfresco.webapp.name}/s</endpoint-url>
         <identity>none</identity>
       </endpoint>
 
@@ -49,7 +46,7 @@
         <name>Alfresco - user access</name>
         <description>Access to Alfresco Repository WebScripts that require user authentication</description>
         <connector-id>alfresco</connector-id>
-        <endpoint-url>${symbol_dollar}{alfresco.server.scheme}://${symbol_dollar}{alfresco.server.name}:${symbol_dollar}{alfresco.server.port}/${symbol_dollar}{alfresco.webapp.name}/s</endpoint-url>
+        <endpoint-url>${alfresco.server.scheme}://${alfresco.server.name}:${alfresco.server.port}/${alfresco.webapp.name}/s</endpoint-url>
         <identity>user</identity>
       </endpoint>
 

maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties

@@ -1,20 +1,17 @@
-#set( $symbol_pound = '#' )
+# Set root logger level to error
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound} Set root logger level to error
 log4j.rootLogger=error, Console, File
 
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound} Console appender definition ${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+###### Console appender definition #######
 
-${symbol_pound} All outputs currently set to be a ConsoleAppender.
+# All outputs currently set to be a ConsoleAppender.
 log4j.appender.Console=org.apache.log4j.ConsoleAppender
 log4j.appender.Console.layout=org.apache.log4j.PatternLayout
 
-${symbol_pound} use log4j NDC to replace %x with tenant domain / username
+# use log4j NDC to replace %x with tenant domain / username
 log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %x %-5p [%c{3}] %m%n
-${symbol_pound}log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
+#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
 
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound} File appender definition ${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+###### File appender definition #######
 log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.File.File=share.log
 log4j.appender.File.Append=true
@@ -22,52 +19,52 @@ 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
 
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound} Hibernate specific appender definition ${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+###### Hibernate specific appender definition #######
-${symbol_pound}log4j.appender.file=org.apache.log4j.FileAppender
+#log4j.appender.file=org.apache.log4j.FileAppender
-${symbol_pound}log4j.appender.file.File=hibernate.log
+#log4j.appender.file.File=hibernate.log
-${symbol_pound}log4j.appender.file.layout=org.apache.log4j.PatternLayout
+#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-${symbol_pound}log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound} Log level overrides ${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+###### Log level overrides #######
 
-${symbol_pound} Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
+# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
-${symbol_pound} Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
+# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
-${symbol_pound} control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
+# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
-${symbol_pound} Log4j addLoggerMBean as long as the logger exists and has been loaded.
+# Log4j addLoggerMBean as long as the logger exists and has been loaded.
 
-${symbol_pound} Hibernate
+# Hibernate
 log4j.logger.org.hibernate=error
 log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal
 log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal
-${symbol_pound}log4j.logger.org.hibernate.cache.EhCacheProvider=warn
+#log4j.logger.org.hibernate.cache.EhCacheProvider=warn
 log4j.logger.org.hibernate.type=warn
-${symbol_pound}log4j.logger.org.hibernate.persister.collection=DEBUG
+#log4j.logger.org.hibernate.persister.collection=DEBUG
 
-${symbol_pound} Spring
+# Spring
 log4j.logger.org.springframework=warn
-${symbol_pound} Turn off Spring remoting warnings that should really be info or debug.
+# Turn off Spring remoting warnings that should really be info or debug.
 log4j.logger.org.springframework.remoting.support=error
 
-${symbol_pound} Axis/WSS4J
+# Axis/WSS4J
 log4j.logger.org.apache.axis=info
 log4j.logger.org.apache.ws=info
 
-${symbol_pound} CXF
+# CXF
 log4j.logger.org.apache.cxf=error
 
-${symbol_pound} MyFaces
+# 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
 
-${symbol_pound} OpenOfficeConnection
+# OpenOfficeConnection
 log4j.logger.net.sf.jooreports.openoffice.connection=fatal
 
-${symbol_pound} log prepared statement cache activity ${symbol_pound}${symbol_pound}${symbol_pound}
+# log prepared statement cache activity ###
 log4j.logger.org.hibernate.ps.PreparedStatementCache=info
 
-${symbol_pound} Alfresco
+# Alfresco
 log4j.logger.org.alfresco=error
 log4j.logger.org.alfresco.repo.admin=info
 log4j.logger.org.alfresco.repo.model.filefolder=info
@@ -76,20 +73,20 @@ log4j.logger.org.alfresco.repo.avm=info
 log4j.logger.org.alfresco.config=info
 log4j.logger.org.alfresco.sample=info
 log4j.logger.org.alfresco.web=info
-${symbol_pound}log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug
+#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug
-${symbol_pound}log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug
+#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug
-${symbol_pound}log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug
+#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug
-${symbol_pound}log4j.logger.org.alfresco.web.bean.clipboard=debug
+#log4j.logger.org.alfresco.web.bean.clipboard=debug
 log4j.logger.org.alfresco.repo.webservice=info
 log4j.logger.org.alfresco.cmis.ws=info
 log4j.logger.org.alfresco.service.descriptor.DescriptorService=info
-${symbol_pound}log4j.logger.org.alfresco.web.page=debug
+#log4j.logger.org.alfresco.web.page=debug
 
 log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error
-${symbol_pound}log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
+#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
 
 log4j.logger.org.alfresco.web.ui.common.Utils=error
-${symbol_pound}log4j.logger.org.alfresco.web.ui.common.Utils=info
+#log4j.logger.org.alfresco.web.ui.common.Utils=info
 
 log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info
 log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info
@@ -105,90 +102,90 @@ log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=war
 log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn
 log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn
 
-${symbol_pound}log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug
+#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug
-${symbol_pound}log4j.logger.org.alfresco.repo.cache.EhCacheTracerJob=debug
+#log4j.logger.org.alfresco.repo.cache.EhCacheTracerJob=debug
 
 log4j.logger.org.alfresco.repo.workflow=error
-${symbol_pound}log4j.logger.org.alfresco.repo.workflow=info
+#log4j.logger.org.alfresco.repo.workflow=info
 
-${symbol_pound} CIFS server debugging
+# CIFS server debugging
 log4j.logger.org.alfresco.smb.protocol=error
-${symbol_pound}log4j.logger.org.alfresco.smb.protocol.auth=debug
+#log4j.logger.org.alfresco.smb.protocol.auth=debug
-${symbol_pound}log4j.logger.org.alfresco.acegi=debug
+#log4j.logger.org.alfresco.acegi=debug
 
-${symbol_pound} FTP server debugging
+# FTP server debugging
 log4j.logger.org.alfresco.ftp.protocol=error
-${symbol_pound}log4j.logger.org.alfresco.ftp.server=debug
+#log4j.logger.org.alfresco.ftp.server=debug
 
-${symbol_pound} WebDAV debugging
+# WebDAV debugging
-${symbol_pound}log4j.logger.org.alfresco.webdav.protocol=debug
+#log4j.logger.org.alfresco.webdav.protocol=debug
 log4j.logger.org.alfresco.webdav.protocol=error
 
-${symbol_pound} NTLM servlet filters
+# NTLM servlet filters
-${symbol_pound}log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
+#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
-${symbol_pound}log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
+#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
 
-${symbol_pound} Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
+# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
 log4j.logger.org.alfresco.repo.node.integrity=ERROR
 
-${symbol_pound} Indexer debugging
+# Indexer debugging
 log4j.logger.org.alfresco.repo.search.Indexer=error
-${symbol_pound}log4j.logger.org.alfresco.repo.search.Indexer=debug
+#log4j.logger.org.alfresco.repo.search.Indexer=debug
 
 log4j.logger.org.alfresco.repo.search.impl.lucene.index=error
-${symbol_pound}log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG
+#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG
 
-${symbol_pound} Audit debugging
+# Audit debugging
-${symbol_pound} log4j.logger.org.alfresco.repo.audit=DEBUG
+# log4j.logger.org.alfresco.repo.audit=DEBUG
-${symbol_pound} log4j.logger.org.alfresco.repo.audit.model=DEBUG
+# log4j.logger.org.alfresco.repo.audit.model=DEBUG
 
-${symbol_pound} Forms debugging
+# Forms debugging
-${symbol_pound} log4j.logger.org.alfresco.web.forms=debug
+# log4j.logger.org.alfresco.web.forms=debug
-${symbol_pound} log4j.logger.org.chiba.xml.xforms=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
 
-${symbol_pound} Property sheet and modelling debugging
+# Property sheet and modelling debugging
-${symbol_pound} change to error to hide the warnings about missing properties and associations
+# 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
-${symbol_pound}log4j.logger.org.alfresco.web.ui.repo.component.property=debug
+#log4j.logger.org.alfresco.web.ui.repo.component.property=debug
 
-${symbol_pound} Dictionary/Model debugging
+# Dictionary/Model debugging
 log4j.logger.org.alfresco.repo.dictionary.DictionaryDAO=error
-${symbol_pound}log4j.logger.org.alfresco.repo.dictionary.DictionaryDAO=info
+#log4j.logger.org.alfresco.repo.dictionary.DictionaryDAO=info
 
-${symbol_pound} Virtualization Server Registry
+# Virtualization Server Registry
 log4j.logger.org.alfresco.mbeans.VirtServerRegistry=warn
 
-${symbol_pound} Spring context runtime property setter
+# Spring context runtime property setter
 log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info
 
-${symbol_pound} Link Validation debugging
+# Link Validation debugging
 log4j.logger.org.alfresco.linkvalidation.LinkValidationServiceImpl=info
 log4j.logger.org.alfresco.linkvalidation.LinkValidationStoreCallbackHandler=warn
 
-${symbol_pound} Debugging options for clustering
+# Debugging options for clustering
 log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error
 log4j.logger.org.alfresco.repo.content.replication=error
 
-${symbol_pound}log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
+#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
 
-${symbol_pound} Activity service
+# Activity service
 log4j.logger.org.alfresco.repo.activities=info
 
-${symbol_pound} Sharepoint
+# Sharepoint
-${symbol_pound}log4j.logger.org.alfresco.module.vti=debug
+#log4j.logger.org.alfresco.module.vti=debug
 
-${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound} Scripting ${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
+###### Scripting #######
 
-${symbol_pound} Web Framework
+# Web Framework
-log4j.logger.org.alfresco.web.scripts=${symbol_dollar}{share.log.level}
+log4j.logger.org.alfresco.web.scripts=${share.log.level}
 log4j.logger.org.alfresco.web.scripts.AlfrescoScriptDebugger=off
 
-${symbol_pound} Repository
+# Repository
-log4j.logger.org.alfresco.repo.web.scripts=${symbol_dollar}{share.log.level}
+log4j.logger.org.alfresco.repo.web.scripts=${share.log.level}
 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