From 2b8511aea0e53ce3cb244e3efb191e709be6914b Mon Sep 17 00:00:00 2001 From: skuro Date: Thu, 4 Aug 2011 16:56:49 +0000 Subject: [PATCH] same as issue #49 git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@329 04253f4f-3451-0410-a141-5562f1e59037 --- .../archetype-resources/jetty/jetty-env.xml | 18 + .../resources/archetype-resources/pom.xml | 465 ++++++------- .../src/main/webapp/WEB-INF/web.xml | 645 ------------------ 3 files changed, 238 insertions(+), 890 deletions(-) create mode 100644 maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/jetty/jetty-env.xml delete mode 100644 maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/jetty/jetty-env.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/jetty/jetty-env.xml new file mode 100644 index 00000000..6d4d80fc --- /dev/null +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/jetty/jetty-env.xml @@ -0,0 +1,18 @@ + + + + + + + jdbc/dataSource + + + jdbc:h2:${alfresco.data.location}/h2_data/${alfresco.db.name} + ${alfresco.db.username} + ${alfresco.db.password} + + + + + diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml index f3544d4d..cd7eef1c 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml @@ -22,30 +22,30 @@ Alfresco extension war - Alfresco extension - + Alfresco extension + - + local alfresco org.alfresco.filesys.repo.desk @@ -79,17 +79,17 @@ Uncomment this property together with the maven-release-plugin section downwards ${svn.url}/tags - --> - - ${pom.description} - ${pom.organization.url} - ${pom.groupId} - ${pom.artifactId} - ${pom.version} - ${svn.tags.url} + --> + + ${project.description} + ${project.organization.url} + ${project.groupId} + ${project.artifactId} + ${project.version} + ${svn.tags.url} ${site.url} + --> alfresco-public @@ -126,8 +126,8 @@ actually tag the code scm:svn:${svn.url} ${svn.url} - --> - + --> + - - - - mysql - mysql-connector-java - 5.0.3 + community + + + javax.servlet servlet-api @@ -209,10 +203,10 @@ --> - src/main/properties/${env}/application.properties + src/main/properties/${env}/alfresco-global.properties src/main/properties/${env} - application.properties + alfresco-global.properties true - alfresco/extension src/main/resources log4j.properties - - alfresco/extension/file-servers-custom.xml true @@ -267,6 +255,7 @@ org.apache.maven.plugins maven-resources-plugin + 2.5 UTF-8 @@ -278,7 +267,7 @@ org.apache.maven.plugins maven-eclipse-plugin - 2.6 + 2.8 maven-site-plugin + 3.0 en - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-amps - process-resources - - unpack-dependencies - - - amp - ${build.directory}/${webapp.name} - META* - - - - - - - org.alfresco.maven.plugin - maven-amp-plugin - 3.0.1 - - - - - org.apache.maven.plugins - maven-war-plugin - - false - target/${webapp.name} - tools/** - - - - + + + org.apache.maven.plugins + maven-dependency-plugin + 2.3 + + + unpack-amps + process-resources + + unpack-dependencies + + + amp + ${build.directory}/${webapp.name} + META* + + + + + + + org.alfresco.maven.plugin + maven-amp-plugin + 3.0.1 + + + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + false + target/${webapp.name} + tools/** + + + + org.codehaus.cargo cargo-maven2-plugin - 0.3 + 1.1.1 org.apache.maven.plugins @@ -349,82 +341,88 @@ site:deploy - - - - org.apache.maven.doxia - doxia-maven-plugin - 1.0-alpha-10 - - - pre-site - - render-books - - - - - - target/site/books - - - src/site - src/books/manual.xml - - - xdoc - - - pdf - - - rtf - - - - - - + + + + org.apache.maven.doxia + doxia-maven-plugin + 1.2 + + + pre-site + + render-books + + + + + + target/site/books + + + src/site + src/books/manual.xml + + + xdoc + + + pdf + + + rtf + + + + + + - + maven-compiler-plugin + 2.3.2 - 1.5 - 1.5 + 1.6 + 1.6 maven-surefire-plugin + 2.9 maven-javadoc-plugin + 2.8 org.codehaus.mojo jxr-maven-plugin + 2.0-beta-1 maven-clover-plugin - - org.codehaus.mojo taglist-maven-plugin + 2.4 @@ -447,8 +445,8 @@ --> - - - ldap - - - enterprise - - - - package - - - src/main/resources - - **/ldap-*-context.xml - - - - - @@ -575,8 +550,8 @@ remote - ${pom.groupId} - ${pom.artifactId} + ${project.groupId} + ${project.artifactId} war @@ -587,6 +562,7 @@ org.apache.maven.plugins maven-war-plugin + 2.1.1 false target/${webapp.name} @@ -597,15 +573,15 @@ - tomcat - - org.gjt.mm.mysql.Driver - jdbc:mysql://localhost/ - ${alfresco.db.username} - ${alfresco.db.password} - - - - generate-resources - drop-db - - execute - - - - continue - drop database ${alfresco.db.name} - - - - generate-resources - create-db - - execute - - - - create database ${alfresco.db.name} - - - - maven-clean-plugin @@ -747,9 +679,30 @@ run + + + jetty + + jetty-env.xml + + + - - org.mortbay.jetty + + org.apache.maven.plugins + maven-war-plugin + + + + jetty + WEB-INF + true + + + + + + org.mortbay.jetty maven-jetty-plugin 6.1.21 @@ -762,7 +715,7 @@ /${webapp.name} - ${pom.build.directory}/${webapp.name} + ${project.build.directory}/${webapp.name} 10 @@ -776,7 +729,29 @@ - + + + com.h2database + h2 + 1.3.158 + + + org.hibernate + hibernate + 3.2.7.ga + + + net.sf.ehcache + ehcache + + + + + it.sk.alfresco + h2-support + 1.0 + + diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 99db260e..00000000 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,645 +0,0 @@ - - - - - - Alfresco Web Client - - Alfresco Web Client - - - org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL - true - - - - javax.faces.STATE_SAVING_METHOD - server - - - - 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 - - - contextClass - org.alfresco.config.JBossEnabledWebApplicationContext - Spring context class - - - log4jExposeWebAppRoot - false - Do not try to resolve web app root as file - - - - - store - workspace://SpacesStore - - - rootPath - /app:company_home - - - - - 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 (except web scripts). Mainly for NTLM support - org.alfresco.repo.web.filter.beans.BeanProxyFilter - - beanName - GlobalAuthenticationFilter - - - - - WebScript Authentication Filter - Authentication filter mapped to web script URLs. Mainly for NTLM 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 - - - - 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 - /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 - - - - - org.apache.myfaces.webapp.StartupServletContextListener - - - - org.springframework.web.util.Log4jConfigListener - - - - org.alfresco.web.app.ContextLoaderListener - - - - org.alfresco.web.app.ContextListener - - - - - 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.alfresco.web.scripts.servlet.WebScriptServlet - - authenticator - webscripts.authenticator.basic - - - - - wcapiServlet - org.alfresco.web.scripts.servlet.WebScriptServlet - - authenticator - webscripts.authenticator.webclient - - - - - portalapiServlet - org.alfresco.web.scripts.servlet.WebScriptServlet - - authenticator - webscripts.authenticator.webclient - - - - - facebookServlet - org.alfresco.web.scripts.facebook.FacebookServlet - - authenticator - webscripts.authenticator.facebook - - - - - fbapiServlet - org.alfresco.web.scripts.facebook.FacebookAPIServlet - - authenticator - webscripts.authenticator.facebook - - - - - proxyServlet - org.alfresco.web.scripts.servlet.HTTPProxyServlet - - - - workflowDefinitionImageServlet - org.alfresco.web.app.servlet.WorkflowDefinitionImageServlet - - - - JBPMDeployProcessServlet - org.alfresco.web.app.servlet.JBPMDeployProcessServlet - - - - 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/* - - - - 60 - - - - index.jsp - - - - java.lang.Exception - /jsp/error.jsp - - - - - - - - - - - - - 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