diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml index 6e880e4d..c6bfc822 100644 --- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml +++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml @@ -28,11 +28,11 @@ minutes to have a compatible AMP module built and its lifecycle supported by Maven, in a fully transparent way also with open source available AMPs. - ${project.artifactId} com.sourcesense.alfresco maven-alfresco-archetypes 1.9.0 + ../pom.xml diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/changes/changes.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/changes/changes.xml index 716be90e..c62d714a 100644 --- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/changes/changes.xml +++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/changes/changes.xml @@ -4,6 +4,14 @@ Gabriele Columbro + + + Updated to Alfresco 3.2r artifacts + + + Updated to new Sourcesense repository + + Added full AMP lifecycle management diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml index 719a37bc..36843a13 100644 --- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml @@ -45,7 +45,7 @@ - ss-public + ss-public-mirror http://repository.sourcesense.com/nexus/content/groups/public @@ -99,9 +99,9 @@ org.alfresco alfresco-repository - 3.0Stable + 3.2r provided - labs + community org.springframework @@ -273,7 +273,7 @@ org.alfresco.maven.plugin maven-amp-plugin - 2.0.0 + 3.0.1-SNAPSHOT @@ -412,9 +412,9 @@ org.alfresco alfresco - 3.0Stable + 3.2r war - labs + community diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/index.apt.vm b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/index.apt.vm index c18c859b..6693ba95 100644 --- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/index.apt.vm +++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/index.apt.vm @@ -23,7 +23,7 @@ Quick Start (maven2) For a quick start you can a maven alfresco AMP project created by just running <<(maven 2.0.6+ required)>>: -------------------------------------------- -mvn archetype:generate -DarchetypeCatalog=http://repository.sourcesense.com/maven2/archetype-catalog.xml +mvn archetype:generate -DarchetypeCatalog=http://repository.sourcesense.com/nexus/content/repositories/alfresco.public.releases/archetype-catalog.xml -------------------------------------------- and then choose the option 'maven-alfresco-amp-archetype' diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/resources/maven-base.css b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/resources/maven-base.css new file mode 100644 index 00000000..b1ea3713 --- /dev/null +++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/resources/maven-base.css @@ -0,0 +1 @@ +.maven {} diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/site.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/site.xml index bec51a1f..230cf833 100644 --- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/site.xml +++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/site.xml @@ -28,8 +28,8 @@ - - + + diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml index 3bf464db..4152f9d2 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml @@ -1,31 +1,29 @@ - + 4.0.0 maven-alfresco-extension-archetype maven-archetype Maven alfresco Extension archetype - ${project.artifactId} com.sourcesense.alfresco maven-alfresco-archetypes 1.9.0 + ../pom.xml This archetype developed aims to provide a standardized approach to development, release and deployment of Alfresco extensions (as opposed to @@ -44,9 +42,11 @@ archetype-packaging 2.0-alpha-2 - - + diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/changes/changes.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/changes/changes.xml index a088a928..80848004 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/changes/changes.xml +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/changes/changes.xml @@ -4,6 +4,14 @@ Gabriele Columbro + + + Updated to Alfresco 3.2r artifacts + + + Updated to new Sourcesense repository + + Added full AMP lifecycle management. diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index 3f895eba..f3dd84f8 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -6,6 +6,13 @@ **/*.java + + src/main/webapp + + **/*.xml + **/*.txt + + src/main/properties diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype.xml index 0657ad18..6bb384b7 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype.xml +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype.xml @@ -34,6 +34,7 @@ src/main/resources/alfresco/extension/web-client-config-custom.xml src/main/resources/alfresco/extension/webclient.properties src/main/resources/log4j.properties + src/main/webapp/WEB-INF/web.xml src/main/webapp/WEB-INF/README-WEB-INF.txt src/main/webapp/WEB-INF/faces-config-custom.xml tools/ant/tasks/tomcat-tasks.properties 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 efa90cda..4a622bd9 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 @@ -27,7 +27,11 @@ Alfresco extension org.alfresco.filesys.repo.desk @@ -101,7 +105,7 @@ - ss-public + ss-public-mirror http://repository.sourcesense.com/nexus/content/groups/public @@ -130,7 +134,7 @@ alfresco ${alfresco.version} war - labs + community @@ -138,28 +142,28 @@ alfresco-web-client ${alfresco.version} provided - labs + community org.alfresco alfresco-core ${alfresco.version} provided - labs + community org.alfresco alfresco-repository ${alfresco.version} provided - labs + community org.alfresco alfresco-remote-api ${alfresco.version} provided - labs + community @@ -431,13 +436,13 @@ | Enable this repo in case of publicly redistributable artifacts (Sourcesense public repositories via ssh + public key ) | - ss-public - scp://repository.sourcesense.com/var/www/demo.sourcesense.com/maven2 + yourcompany + scp://yourcompany/var/maven2 - ss-site-public - scp://repository.sourcesense.com/var/www/demo.sourcesense.com/maven2-sites + yourcompany-site + scp://yourcompany/var/maven2-sites --> + + 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 diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm index f3cf465d..5496a147 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm @@ -22,13 +22,16 @@ Full documentation You can also download the full application manual {{{books/pdf/manual/manual.pdf} PDF}} or {{{books/rtf/manual/manual.rtf} RTF}} format. + Quick Start (maven2) + Prerequisite: Mysql running locally with empty db.name = alf_jetty and permissions for user alfresco/alfresco. + For a quick start you can a run alfresco extension project by just running <<(maven 2.0.6+ required)>>: -------------------------------------------- -mvn jetty:run-exploded +mvn integration-test -------------------------------------------- diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/index.apt.vm b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/index.apt.vm index 39852b06..d09b5230 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/index.apt.vm +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/index.apt.vm @@ -23,7 +23,7 @@ Quick Start (maven2) For a quick start you can a maven alfresco extension project created by just running <<(maven 2.0.6+ required)>>: -------------------------------------------- -mvn archetype:generate -DarchetypeCatalog=http://repository.sourcesense.com/maven2/archetype-catalog.xml +mvn archetype:generate -DarchetypeCatalog=http://repository.sourcesense.com/nexus/content/repositories/alfresco.public.releases/archetype-catalog.xml -------------------------------------------- and then choose the option 'maven-alfresco-extension-archetype' diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/resources/maven-base.css b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/resources/maven-base.css new file mode 100644 index 00000000..b1ea3713 --- /dev/null +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/resources/maven-base.css @@ -0,0 +1 @@ +.maven {} diff --git a/maven-alfresco-archetypes/pom.xml b/maven-alfresco-archetypes/pom.xml index b4593037..3e4d7d3b 100644 --- a/maven-alfresco-archetypes/pom.xml +++ b/maven-alfresco-archetypes/pom.xml @@ -8,22 +8,33 @@ This project is meant to gather all commons configurations and settings between the two maven-alfresco-*-archetypes, i.e. maven-alfresco-extension-archetype and maven-alfresco-amp-archetype - ${project.artifactId} org.alfresco maven-alfresco-lifecycle 1.0.0 + ../pom.xml + + Sourcesense + http://www.sourcesense.com + maven-alfresco-amp-archetype maven-alfresco-extension-archetype + + + org.apache.maven.wagon + wagon-http-shared + 1.0-beta-6-patched + + maven-archetype-plugin true - + diff --git a/maven-alfresco-archetypes/src/site/fml/faq.fml b/maven-alfresco-archetypes/src/site/fml/faq.fml new file mode 100644 index 00000000..2503a0c1 --- /dev/null +++ b/maven-alfresco-archetypes/src/site/fml/faq.fml @@ -0,0 +1,24 @@ + + + + Backward compatibility + + I'm lost in versions and repositories. Which one I should use? + +
    +
  • As the introduction of the parent project maven-alfresco-lifecycle you can refer to it as the latest working version of the full support
    • +
  • You might (optionally) want to tweak specific modules versions (archetypes, plugins) in order to match the latest features
    • +
+ + + + I see many project aroud Maven and Alfresco (m2alfresco, maven4alfresco, this project). Is there a reference one? + +

+ The maven-alfresco-lifecycle project gathers all efforts made in previous projects and gather them + under a common application lifecycle management suite. +

+ + + + \ No newline at end of file diff --git a/maven-alfresco-archetypes/src/site/resources/css/maven-base.css b/maven-alfresco-archetypes/src/site/resources/css/maven-base.css new file mode 100644 index 00000000..b1ea3713 --- /dev/null +++ b/maven-alfresco-archetypes/src/site/resources/css/maven-base.css @@ -0,0 +1 @@ +.maven {} diff --git a/maven-alfresco-archetypes/src/site/resources/css/site.css b/maven-alfresco-archetypes/src/site/resources/css/site.css new file mode 100644 index 00000000..b1ea3713 --- /dev/null +++ b/maven-alfresco-archetypes/src/site/resources/css/site.css @@ -0,0 +1 @@ +.maven {} diff --git a/plugins/maven-amp-plugin/pom.xml b/plugins/maven-amp-plugin/pom.xml index ee156671..fb769385 100644 --- a/plugins/maven-amp-plugin/pom.xml +++ b/plugins/maven-amp-plugin/pom.xml @@ -18,7 +18,6 @@ AMPs and WARs. It is a modification of the org.apache.maven.plugins:maven-war-plugin of which it uses the whole core infrastructure. See ${site.url} for more info - ${project.artifactId} ${pom.description} ${pom.url} diff --git a/plugins/maven-amp-plugin/src/changes/changes.xml b/plugins/maven-amp-plugin/src/changes/changes.xml index 0d7b89d4..2976cb5d 100644 --- a/plugins/maven-amp-plugin/src/changes/changes.xml +++ b/plugins/maven-amp-plugin/src/changes/changes.xml @@ -3,6 +3,9 @@ Maven AMP plugin + + + diff --git a/plugins/maven-amp-plugin/src/site/apt/index.apt.vm b/plugins/maven-amp-plugin/src/site/apt/index.apt.vm index aa0f430f..ad79c924 100644 --- a/plugins/maven-amp-plugin/src/site/apt/index.apt.vm +++ b/plugins/maven-amp-plugin/src/site/apt/index.apt.vm @@ -36,20 +36,19 @@ References ------------------------------------------- - using repository (either in POM or settings.xml) : + using this pluginRepository (either in POM or settings.xml) : ------------------------------------------ - + ss-public - http://repository.sourcesense.com/maven2 - + http://repository.sourcesense.com/nexus/content/groups/public + ------------------------------------------- Quick usage - Create a project using the maven-alfresco-amp-archetype (see {{ http://repository.sourcesense.com/maven2-sites/maven-alfresco-amp-archetype }} ). - \ No newline at end of file + Create a project using the maven-alfresco-amp-archetype (see {{ http://repository.sourcesense.com/nexus/content/repositories/alfresco.public.sites/maven-alfresco-lifecycle/maven-alfresco-archetypes/maven-alfresco-amp-archetype/index.html }} ). \ No newline at end of file diff --git a/plugins/maven-amp-plugin/src/site/site.xml b/plugins/maven-amp-plugin/src/site/site.xml index 2ae769fd..4618a78e 100644 --- a/plugins/maven-amp-plugin/src/site/site.xml +++ b/plugins/maven-amp-plugin/src/site/site.xml @@ -25,11 +25,11 @@ - + - + diff --git a/plugins/maven-nosnapshot-plugin/pom.xml b/plugins/maven-nosnapshot-plugin/pom.xml index 2efec78f..8ab82f50 100644 --- a/plugins/maven-nosnapshot-plugin/pom.xml +++ b/plugins/maven-nosnapshot-plugin/pom.xml @@ -6,7 +6,6 @@ 0.0.5 Custom version manipulator Maven Plugin It's non invasive and puts modified versions in configurable pom properties - ${project.artifactId} org.alfresco maven-alfresco-lifecycle diff --git a/plugins/maven-nosnapshot-plugin/src/test/java/com/sourcesense/maven/plugins/test/StripTest.java b/plugins/maven-nosnapshot-plugin/src/test/java/com/sourcesense/maven/plugins/test/StripTest.java deleted file mode 100644 index 20c9f588..00000000 --- a/plugins/maven-nosnapshot-plugin/src/test/java/com/sourcesense/maven/plugins/test/StripTest.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.sourcesense.maven.plugins.test; - - -import java.io.File; - -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.project.MavenProject; - -import com.sourcesense.maven.StripMojo; - -public class StripTest extends org.apache.maven.plugin.testing.AbstractMojoTestCase { - - File testPom; - MavenProject project = new MavenProject(); - - protected void setUp() throws Exception { - // required for mojo lookups to work - super.setUp(); - - } - - /** - * tests the proper discovery and configuration of the mojo - * - * @throws Exception - */ - public void testMojoDefaultEnvironment() throws Exception { - testPom = new File( getBasedir(), "target/test-classes/snapshot-pom.xml" ); - StripMojo mojo = (StripMojo) lookupMojo ("strip", testPom ); - assertNotNull( mojo ); - - } - - public void testSnapshotVersion() throws Exception { - testPom = new File( getBasedir(), "target/test-classes/snapshot-pom.xml" ); - StripMojo mojo = (StripMojo) lookupMojo ("strip", testPom ); - setVariableValueToObject(mojo, "version", "3.0.0-SNAPSHOT"); - setVariableValueToObject(mojo, "project", project); - try { - mojo.execute(); - } catch (MojoExecutionException e) { - fail("Mojo execution exception" + e); - } - assertEquals("3.0.0", mojo.getProject().getProperties().getProperty( - mojo.getPropertyName())); - } - - public void testReleaseCandidateVersion() throws Exception { - testPom = new File( getBasedir(), "target/test-classes/relcandidate-pom.xml" ); - StripMojo mojo = (StripMojo) lookupMojo ("strip", testPom ); - setVariableValueToObject(mojo, "version", "3.0.0-RC1"); - setVariableValueToObject(mojo, "project", project); - try { - mojo.execute(); - } catch (MojoExecutionException e) { - fail("Mojo execution exception" + e); - } - assertEquals("3.0.0", mojo.getProject().getProperties().getProperty( - mojo.getPropertyName())); - } - - public void testIdempotent() throws Exception { - testPom = new File( getBasedir(), "target/test-classes/snapshot-pom.xml" ); - StripMojo mojo = (StripMojo) lookupMojo ("strip", testPom ); - setVariableValueToObject(mojo, "version", "3.0.0"); - setVariableValueToObject(mojo, "project", project); - try { - mojo.execute(); - } catch (MojoExecutionException e) { - fail("Mojo execution exception" + e); - } - assertEquals("3.0.0", mojo.getProject().getProperties().getProperty( - mojo.getPropertyName())); - } - - public void testUnderscore() throws Exception { - testPom = new File( getBasedir(), "target/test-classes/underscore-pom.xml" ); - StripMojo mojo = (StripMojo) lookupMojo ("strip", testPom ); - setVariableValueToObject(mojo, "version", "3.0.0_RC1"); - setVariableValueToObject(mojo, "project", project); - try { - mojo.execute(); - } catch (MojoExecutionException e) { - fail("Mojo execution exception" + e); - } - assertEquals("3.0.0", mojo.getProject().getProperties().getProperty( - mojo.getPropertyName())); - } - - public void testCustomPropName() throws Exception { - testPom = new File( getBasedir(), "target/test-classes/customprop-pom.xml" ); - StripMojo mojo = (StripMojo) lookupMojo ("strip", testPom ); - setVariableValueToObject(mojo, "version", "3.0.0-RC1"); - setVariableValueToObject(mojo, "project", project); - try { - mojo.execute(); - } catch (MojoExecutionException e) { - fail("Mojo execution exception" + e); - } - assertEquals("3.0.0", mojo.getProject().getProperties().getProperty( - "foobar")); - } - -} diff --git a/pom.xml b/pom.xml index 24992f46..a0fe9f43 100644 --- a/pom.xml +++ b/pom.xml @@ -5,22 +5,19 @@ pom 1.0.0 Maven Alfresco Lifecycle support base project - - com.sourcesense.maven - maven-calm - 1.0-beta-21 - + http://repository.sourcesense.com/nexus/content/repositories/alfresco.public.sites/maven-alfresco-lifecycle - This project is meant to gather all commons configurations, plugins and archetypes - for the full Maven Alfresco lifecycle support +This project is meant to gather all commons configurations, plugins and archetypes for the full Maven Alfresco lifecycle support. +It gathers the latest stable versions of the different components that are used to support Alfresco development on Maven in enterprise and +community contexts. Google Code http://code.google.com/p/maven-alfresco-archetypes/issues/list - Sourcesense - http://www.sourcesense.com + Alfresco + http://www.alfresco.com maven-alfresco-archetypes @@ -31,18 +28,17 @@ https://maven-alfresco-archetypes.googlecode.com/svn ${svn.base.url}/trunk ${svn.base.url}/tags - http://repository.sourcesense.com/nexus/content/repositories/alfresco.public.sites/${pom.artifactId} ${pom.description} - ${pom.organization.url} - ${pom.groupId} - ${pom.artifactId} - ${pom.version} + ${project.url} + ${project.groupId} + ${project.artifactId} + ${project.version} ${svn.tags.url} - ${site.url} + ${project.url} scm:svn:https://maven-alfresco-archetypes.googlecode.com/svn/tags/maven-alfresco-lifecycle-1.0.0 @@ -112,23 +108,24 @@ + + maven-compiler-plugin + + 1.5 + 1.5 + + + + maven-site-plugin + 2.0.1 + org.apache.maven.plugins maven-changes-plugin - - - - announcement-generate - - announcement-generate - - - - announcement-mail - - announcement-mail - - + + 2.2-patched + + announcements + + true ${smtp.server} ${smtp.port} - columbro@gmail.com + maven-alfresco@googlegroups.com + announce@maven.apache.org + alfresco-dev@lists.sourcesense.com ${smtp.username} ${smtp.password} + ${smtp.sslMode} columbro + ${project.url}/index.html @@ -154,13 +159,19 @@ clean package - deploy site-deploy changes:announcement-generate - changes:announcement-mail site-deploy + deploy site-deploy changes:announcement-generate changes:announcement-mail ${svn.tags.url} false + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 1.0-beta-6 + + @@ -198,10 +209,6 @@ - - org.codehaus.mojo - changelog-maven-plugin - @@ -215,7 +222,7 @@ ss-public-sites - dav:http://repository.sourcesense.com/nexus/content/repositories/alfresco.public.sites/${project.artifactId} + dav:http://repository.sourcesense.com/nexus/content/repositories/alfresco.public.sites/maven-alfresco-lifecycle diff --git a/src/changes/changes.xml b/src/changes/changes.xml index a8bc5422..604d931a 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -1,10 +1,13 @@ - Maven Alfresco Extension archetype - Gabriele Columbro + Maven Alfresco Lifecycle + Gabriele Columbro - + + + Linked all sub modules. + Added this wrapper project to group all Maven Alfresco plugins and archetype useful for the Maven Alfresco Lifecycle support diff --git a/src/main/resources/announcements/custom-announcement.vm b/src/main/resources/announcements/custom-announcement.vm new file mode 100644 index 00000000..f98b24d3 --- /dev/null +++ b/src/main/resources/announcements/custom-announcement.vm @@ -0,0 +1,131 @@ +## Licensed to the Apache Software Foundation (ASF) under one +## or more contributor license agreements. See the NOTICE file +## distributed with this work for additional information +## regarding copyright ownership. The ASF licenses this file +## to you under the Apache License, Version 2.0 (the +## "License"); you may not use this file except in compliance +## with the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, +## software distributed under the License is distributed on an +## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +## KIND, either express or implied. See the License for the +## specific language governing permissions and limitations +## under the License. +The ${developmentTeam} is pleased to announce the ${finalName} release! + +${introduction} + +See all the different components at the following links: +- maven-alfresco-archetypes: ${project.url}/maven-alfresco-archetypes/index.html +- maven-amp-plugin: ${project.url}/plugins/maven-amp-plugin/index.html +- maven-nosnpashot-plugin: ${project.url}/plugins/maven-nosnapshot-plugin/index.html + + +#if ($release.getActions().size() == 0) +No changes defined in this version. +#else +Changes in this version include: + +#if ($release.getActions('add').size() !=0) +New features: +#foreach($actionItem in $release.getActions('add')) +#set($action=$actionItem.getAction()) +#if ($actionItem.getIssue()) +#set($issue=$actionItem.getIssue()) +#else +#set($issue="") +#end +#if ($actionItem.getDueTo()) +#set($dueto=$actionItem.getDueTo()) +#else +#set($dueto="") +#end +o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end + +#set($issue="") +#set($dueto="") +#end +#end + +#if ($release.getActions('fix').size() !=0) +Fixed Bugs: +#foreach($actionItem in $release.getActions('fix')) +#set($action=$actionItem.getAction()) +#if ($actionItem.getIssue()) +#set($issue=$actionItem.getIssue()) +#else +#set($issue="") +#end +#if ($actionItem.getDueTo()) +#set($dueto=$actionItem.getDueTo()) +#else +#set($dueto="") +#end +o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end + +#set($issue="") +#set($dueto="") +#end +#end + +#if ($release.getActions('update').size() !=0) +Changes: +#foreach($actionItem in $release.getActions('update')) +#set($action=$actionItem.getAction()) +#if ($actionItem.getIssue()) +#set($issue=$actionItem.getIssue()) +#else +#set($issue="") +#end +#if ($actionItem.getDueTo()) +#set($dueto=$actionItem.getDueTo()) +#else +#set($dueto="") +#end +o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end + +#set($issue="") +#set($dueto="") +#end +#end + +#if ($release.getActions('remove').size() !=0) +Removed: +#foreach($actionItem in $release.getActions('remove')) +#set($action=$actionItem.getAction()) +#if ($actionItem.getIssue()) +#set($issue=$actionItem.getIssue()) +#else +#set($issue="") +#end +#if ($actionItem.getDueTo()) +#set($dueto=$actionItem.getDueTo()) +#else +#set($dueto="") +#end +o ${action} #if($!issue != "") Issue: $issue. #end#if($!dueto != "")Thanks to $dueto. #end + +#set($issue="") +#set($dueto="") +#end +#end +## End of main loop +#end +See also specific modules changes for the latest release: + +maven-alfresco-amp-archetype: ${project.url}/maven-alfresco-archetypes/maven-alfresco-amp-archetype/changes-report.html +maven-alfresco-extension-archetype: ${project.url}/maven-alfresco-archetypes/maven-alfresco-extension-archetype/changes-report.html +maven-amp-plugin: ${project.url}/plugins/maven-amp-plugin/changes-report.html + +#if ($urlDownload) + +For a manual installation, you can download the ${finalName} here: +${urlDownload} +#end +(due to some issues with the sites repo, if you experience issues in accessing pages with Firefox you might just need to reload the page) + +Have fun! +-${developmentTeam} diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css new file mode 100644 index 00000000..5845334f --- /dev/null +++ b/src/site/resources/css/site.css @@ -0,0 +1 @@ +.pippo {} diff --git a/src/site/site.xml b/src/site/site.xml index 250b1a5a..5bfd0235 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,31 +1,46 @@ - org.apache.maven.skins - maven-stylus-skin - 1.0 + org.apache.maven.skins + maven-stylus-skin + 1.0 - - + + - - - Maven Alfresco Lifecycle support - v. ${project.version} - ${site_site_url} - images/logo_noclaim.png - - - - - - - - + + + Maven Alfresco Lifecycle Support - v. ${project.version} + ${site_site_url} + images/logo_noclaim.png + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + +