From 6c3977a52a8927cb652875821ade8bc99fd8f37f Mon Sep 17 00:00:00 2001 From: mindthegab Date: Mon, 4 Nov 2013 16:05:51 +0000 Subject: [PATCH] fixed all-in-one run, disabled testing in amp-to-war git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@717 04253f4f-3451-0410-a141-5562f1e59037 --- .../archetype-resources/alfresco/pom.xml | 58 ++ .../alfresco/src/main/webapp/WEB-INF/web.xml | 911 ------------------ poms/alfresco-sdk-parent/pom.xml | 34 +- 3 files changed, 88 insertions(+), 915 deletions(-) delete mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/web.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml index d1555a43..2f27ad1b 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml @@ -84,4 +84,62 @@ + + + + run + + + + maven-war-plugin + + + prepare-exploded-war + + exploded + + prepare-package + + + default-war + + ${project.build.directory}/${project.build.finalName}-nossl/WEB-INF/web.xml + + + + + + + com.google.code.maven-replacer-plugin + replacer + + + disable-securecomms + prepare-package + + replace + + + + + true + ${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml + ${project.build.directory}/${project.build.finalName}-nossl/WEB-INF/ + false + + + ]]> + + + + ]]> + ]]> + + + + + + + + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/web.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 4372b3c1..00000000 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,911 +0,0 @@ - - - - - - Alfresco Web Client - - Alfresco Web Client - - - org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL - true - - - - javax.faces.STATE_SAVING_METHOD - server - - - - javax.faces.PARTIAL_STATE_SAVING_METHOD - false - - - - javax.faces.CONFIG_FILES - /WEB-INF/faces-config-app.xml,/WEB-INF/faces-config-beans.xml,/WEB-INF/faces-config-navigation.xml,/WEB-INF/faces-config-common.xml,/WEB-INF/faces-config-repo.xml,/WEB-INF/faces-config-wcm.xml,/WEB-INF/faces-config-custom.xml - - - - org.apache.myfaces.ALLOW_JAVASCRIPT - true - - - - org.apache.myfaces.DETECT_JAVASCRIPT - false - This is an EXPERIMENTAL feature, so leave it off for now! - - - - org.apache.myfaces.SERIALIZE_STATE_IN_SESSION - false - Stop MyFaces from Serializing the state to the session - - - - - org.apache.myfaces.PRETTY_HTML - true - - If true, rendered HTML code will be formatted, so that it is "human readable". - i.e. additional line separators and whitespace will be written, that do not - influence the HTML code. - Default: "true" - - - - - org.apache.myfaces.AUTO_SCROLL - false - - If true, a javascript function will be rendered that is able to restore the - former vertical scroll on every request. Convenient feature if you have pages - with long lists and you do not want the browser page to always jump to the top - if you trigger a link or button action that stays on the same page. - Default: "false" - - - - - - contextConfigLocation - /WEB-INF/web-application-context.xml - Spring config file location - - - - log4jExposeWebAppRoot - false - Do not try to resolve web app root as file - - - - - store - workspace://SpacesStore - - - rootPath - /app:company_home - - - - org.apache.myfaces.ERROR_HANDLING - false - - - - - - com.ibm.ws.jsf.loadExternalDtd - false - Sets "http://apache.org/xml/features/nonvalidating/load-external-dtd" feature on the SAXParser to false if this parameter is false - - - - Authentication Filter - Authentication filter mapped only to faces URLs. Other URLs generally use proprietary means to talk to the AuthenticationComponent - org.alfresco.repo.web.filter.beans.BeanProxyFilter - - beanName - AuthenticationFilter - - - - - Global Authentication Filter - Authentication filter mapped to all authenticated URLs. Mainly for SSO support - org.alfresco.repo.web.filter.beans.BeanProxyFilter - - beanName - GlobalAuthenticationFilter - - - - - WebScript Authentication Filter - Authentication filter mapped to web script URLs. Mainly for SSO support - org.alfresco.repo.web.filter.beans.BeanProxyFilter - - beanName - WebscriptAuthenticationFilter - - - - - WebDAV Authentication Filter - org.alfresco.repo.web.filter.beans.BeanProxyFilter - - beanName - WebDavAuthenticationFilter - - - - - Admin Authentication Filter - org.alfresco.web.app.servlet.AdminAuthenticationFilter - - - - CacheExpiresFilter - Set HTTP cache Expires header 30 days forward for a mapping. - org.alfresco.web.scripts.servlet.StaticAssetCacheFilter - - expires - 30 - Add an Expires Header 30 days forward - - - - - Global Localization Filter - Sets fallback default locale for ALL requests - org.alfresco.web.app.servlet.GlobalLocalizationFilter - - - - JSF Session Synchronized Filter - org.alfresco.repo.web.filter.beans.SessionSynchronizedFilter - - - - Global Localization Filter - /* - - - - Global Authentication Filter - /navigate/* - - - - Global Authentication Filter - /command/* - - - - Global Authentication Filter - /download/* - - - - Global Authentication Filter - /template/* - - - - Global Authentication Filter - /n/* - - - - Global Authentication Filter - /c/* - - - - Global Authentication Filter - /t/* - - - - Global Authentication Filter - /d/* - - - - - WebScript Authentication Filter - /wcservice/* - - - - WebScript Authentication Filter - /wcs/* - - - - Global Authentication Filter - /wcservice/* - - - - Global Authentication Filter - /wcs/* - - - - Global Authentication Filter - /ajax/* - - - - Global Authentication Filter - /faces/* - - - - Authentication Filter - /faces/* - - - - WebDAV Authentication Filter - /webdav/* - - - - Admin Authentication Filter - /faces/jsp/admin/* - - - - Admin Authentication Filter - /faces/jsp/categories/* - - - - Admin Authentication Filter - /faces/jsp/groups/* - - - - Admin Authentication Filter - /faces/jsp/users/delete-user.jsp - - - - Admin Authentication Filter - /faces/jsp/users/users.jsp - - - - Admin Authentication Filter - /faces/jsp/admin/system-info.jsp - - - - JSF Session Synchronized Filter - /faces/* - - - - CacheExpiresFilter - *.jpg - - - CacheExpiresFilter - *.png - - - CacheExpiresFilter - *.gif - - - CacheExpiresFilter - *.css - - - CacheExpiresFilter - *.js - - - - org.apache.myfaces.webapp.StartupServletContextListener - - - - org.springframework.web.util.Log4jConfigListener - - - - - org.alfresco.web.app.ContextLoaderListener - - - - - org.alfresco.web.app.ContextListener - - - - - org.alfresco.repo.webdav.WebDAVSessionListener - - - - - com.sun.xml.ws.transport.http.servlet.WSServletContextListener - - - - - - - - Faces Servlet - javax.faces.webapp.FacesServlet - 1 - - - - uploadFile - org.alfresco.web.app.servlet.UploadFileServlet - - - - uploadContent - org.alfresco.web.app.servlet.UploadContentServlet - - - - downloadContent - org.alfresco.web.app.servlet.DownloadContentServlet - - - - downloadRawContent - org.alfresco.web.app.servlet.DownloadRawContentServlet - - - - guestDownloadContent - org.alfresco.web.app.servlet.GuestDownloadContentServlet - - - - guestTemplateContent - org.alfresco.web.app.servlet.GuestTemplateContentServlet - - - - externalAccess - org.alfresco.web.app.servlet.ExternalAccessServlet - - - - templateContent - org.alfresco.web.app.servlet.TemplateContentServlet - - - - commandServlet - org.alfresco.web.app.servlet.CommandServlet - - - - ajaxServlet - org.alfresco.web.app.servlet.ajax.AjaxServlet - - - - axis - org.apache.axis.transport.http.AxisServlet - 5 - - - - CXFServlet - org.apache.cxf.transport.servlet.CXFServlet - 6 - - - - WebDAV - org.alfresco.repo.webdav.WebDAVServlet - 5 - - - - apiServlet - org.springframework.extensions.webscripts.servlet.WebScriptServlet - - authenticator - webscripts.authenticator.basic - - - - - wcapiServlet - org.springframework.extensions.webscripts.servlet.WebScriptServlet - - authenticator - webscripts.authenticator.webclient - - - - - portalapiServlet - org.springframework.extensions.webscripts.servlet.WebScriptServlet - - authenticator - webscripts.authenticator.webclient - - - - - facebookServlet - org.alfresco.repo.web.scripts.facebook.FacebookServlet - - authenticator - webscripts.authenticator.facebook - - - - - fbapiServlet - org.alfresco.repo.web.scripts.facebook.FacebookAPIServlet - - authenticator - webscripts.authenticator.facebook - - - - - proxyServlet - org.alfresco.web.app.servlet.HTTPProxyServlet - - - - workflowDefinitionImageServlet - org.alfresco.web.app.servlet.WorkflowDefinitionImageServlet - - - - JBPMDeployProcessServlet - org.alfresco.web.app.servlet.JBPMDeployProcessServlet - - - - CMISFileShareServlet - org.apache.chemistry.opencmis.browser.BrowseServlet - - auxroot - cmisfs/browser/ - - - allow - http.* - - - stylesheet:application/atomsvc+xml - /cmisfs/stylesheets/service.xsl - - - stylesheet:application/atom+xml;type=feed - /cmisfs/stylesheets/feed.xsl - - - stylesheet:application/cmistree+xml - /cmisfs/stylesheets/feed.xsl - - - stylesheet:application/atom+xml;type=entry - /cmisfs/stylesheets/entry.xsl - - - stylesheet:application/cmisallowableactions+xml - /cmisfs/stylesheets/actions.xsl - - - stylesheet:application/cmisacl+xml - /cmisfs/stylesheets/acl.xsl - - - override-stylesheet:renditions - /cmisfs/stylesheets/renditions.xsl - - - override-stylesheet:relationships - /cmisfs/stylesheets/relationships.xsl - - - override-stylesheet:thumbnails - /cmisfs/stylesheets/thumbnails.xsl - - - - - cmisws - com.sun.xml.ws.transport.http.servlet.WSServlet - 7 - - - - cmisatom - org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet - - callContextHandler - org.apache.chemistry.opencmis.server.shared.BasicAuthCallContextHandler - - 8 - - - - cmisbrowser - org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet - - callContextHandler - org.apache.chemistry.opencmis.server.shared.BasicAuthCallContextHandler - - 8 - - - - cmistck - org.apache.chemistry.opencmis.tck.runner.WebRunnerServlet - 8 - - - - authenticatorServlet - org.alfresco.repo.web.scripts.servlet.AuthenticatorServlet - - - - - - Faces Servlet - /faces/* - - - - uploadFile - /uploadFileServlet - - - - uploadContent - /upload/* - - - - downloadContent - /download/* - - - - downloadContent - /d/* - - - - downloadRawContent - /dr - - - - guestDownloadContent - /guestDownload/* - - - - guestDownloadContent - /gd/* - - - - templateContent - /template/* - - - - templateContent - /t/* - - - - guestTemplateContent - /guestTemplate/* - - - - guestTemplateContent - /gt/* - - - - externalAccess - /navigate/* - - - - externalAccess - /n/* - - - - commandServlet - /command/* - - - - commandServlet - /c/* - - - - ajaxServlet - /ajax/* - - - - axis - /api/* - - - - CXFServlet - /cmis/* - - - - WebDAV - /webdav/* - - - - apiServlet - /service/* - - - - apiServlet - /s/* - - - - wcapiServlet - /wcservice/* - - - - wcapiServlet - /wcs/* - - - - portalapiServlet - /168service/* - - - - portalapiServlet - /168s/* - - - - facebookServlet - /facebook/* - - - - facebookServlet - /fb/* - - - - fbapiServlet - /fbservice/* - - - - fbapiServlet - /fbs/* - - - - proxyServlet - /proxy - - - - JBPMDeployProcessServlet - /jbpm/deployprocess - - - - workflowDefinitionImageServlet - /workflowdefinitionimage/* - - - - CMISFileShareServlet - /cmisbrowse - - - - cmisws - /cmisws/* - - - - cmisatom - /cmisatom/* - - - - cmisbrowser - /cmisbrowser/* - - - - - - - - - 60 - - - - index.jsp - - - - java.lang.Exception - /jsp/error.jsp - - - - The Alfresco database connection - jdbc/dataSource - javax.sql.DataSource - Container - Unshareable - - - - - A flag that globally enables or disables startup of the major Alfresco subsystems. - properties/startup.enable - true - java.lang.Boolean - - - - The filesystem directory below which content and index data is stored. Should be on a shared disk - if this is a clustered installation. - properties/dir.root - - java.lang.String - - - - The fully qualified name of a org.hibernate.dialect.Dialect subclass that allows Hibernate to - generate SQL optimized for a particular relational database. Choose from org.hibernate.dialect.DerbyDialect, - org.hibernate.dialect.MySQLInnoDBDialect, - org.alfresco.repo.domain.hibernate.dialect.AlfrescoOracle9Dialect, - org.alfresco.repo.domain.hibernate.dialect.AlfrescoSybaseAnywhereDialect, - org.alfresco.repo.domain.hibernate.dialect.AlfrescoSQLServerDialect, org.hibernate.dialect.PostgreSQLDialect - properties/hibernate.dialect - - java.lang.String - - - - Mapping from tokens in Hibernate queries to SQL tokens. For PostgreSQL, set this to "true - TRUE, false FALSE". - properties/hibernate.query.substitutions - - java.lang.String - - - - Enable use of JDBC3 PreparedStatement.getGeneratedKeys() to retrieve natively generated keys - after insert. Requires JDBC3+ driver. Set to false if your driver has problems with the Hibernate identifier - generators. By default, tries to determine the driver capabilities using connection metadata. - properties/hibernate.jdbc.use_get_generated_keys - - java.lang.String - - - - Qualify unqualified table names with the given schema/tablespace in generated SQL. It may be - necessary to set this when the target database has more than one schema. - properties/hibernate.default_schema - - java.lang.String - - - \ No newline at end of file diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index eebab048..06ada210 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -419,7 +419,8 @@ process-test-resources copy-resources - ${app.amp.test.output.folder} + + ${project.build.testOutputDirectory} ${app.amp.folder}/config @@ -444,13 +445,18 @@ ${app.testing.jvm.args} - ${app.amp.test.output.folder} + + + junit-remote + com.tradeshift + 3 + com.h2database @@ -468,7 +474,8 @@ org.springframework spring-test 3.0.5.RELEASE - test + + amp-to-war + + true + @@ -550,7 +560,7 @@ - copy-tomcat-context + copy-tomcat-resources prepare-package copy-resources @@ -560,12 +570,28 @@ tomcat ${app.filtering.enabled} WEB-INF + + context.xml + + + + tomcat + ${app.filtering.enabled} + WEB-INF/classes/alfresco/extension + + rad-context.xml + src/test/properties/${env} ${app.filtering.enabled} WEB-INF/classes + + ${project.build.testOutputDirectory} + ${app.filtering.enabled} + WEB-INF/classes +