diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt index b319edb1..d9a07f41 100644 --- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt +++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt @@ -18,12 +18,11 @@ limitations under the License. --------------------------------------- Archetype Release: Archetype - maven-amp-archetype -Author: g.columbro@sourcesense.com +Author: gabriele.columbro@alfresco.com http://forge.alfresco.com/m2alfresco Contacts: -- alfresco-dev@lists.sourcesense.com (developer) -- alfresco@sourcesense.com (commercial) +- maven-alfresco@googlegroups.com (developer) See Also: http://wiki.alfresco.com/wiki/Module_Management_Tool 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 e247cd9c..d5ecc096 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 @@ -50,11 +50,11 @@ alfresco-public - http://maven.alfresco.com/nexus/content/groups/public + http://maven.alfresco.com/nexus/content/groups/public alfresco-public-snapshots - http://repository.sourcesense.com/nexus/content/groups/public-snapshots + http://maven.alfresco.com/nexus/content/groups/public-snapshots true daily @@ -217,7 +217,7 @@ org.alfresco.maven.plugin maven-amp-plugin - 3.0.4-SNAPSHOT + 3.0.4 true @@ -345,7 +345,7 @@ org.alfresco.maven.plugin maven-amp-plugin - 3.0.4-SNAPSHOT + 3.0.4 @@ -410,7 +410,7 @@ org.alfresco.maven.plugin maven-amp-plugin - 3.0.4-SNAPSHOT + 3.0.4 diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/layout.apt.vm b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/layout.apt.vm index dc5b871b..af370d5c 100644 --- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/layout.apt.vm +++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/layout.apt.vm @@ -15,17 +15,17 @@ What do I have when I created the project? src --------------------------------------------------------> (source folder) | - |__ main ___ __ resources --------------------------> mapped in the classpath. Add here classpath resources - | | - | |__ config----- alfresco module config goes here. - | | | Get's copied (by best practice) by build into package alfresco/module/groupId.artifactId. - | | | This convention is used by the archetype and by the AMP unpacker. - | | |__ ex: alfresco/module/org.alfresco.mymodule ---> Example Alfresco module config - | | - | | - | |__ java -------------------------------> customization java classes - | | - | |__ webapp -----------------------------> AMP overlay folder - this folder is overlayed (so may overwrite other dependent AMPs) + |__ main __ resources --------------------------> mapped in the classpath. Add here classpath resources + | | + | |__ config----- alfresco module config goes here. + | | | Get's copied (by best practice) by build into package alfresco/module/groupId.artifactId. + | | | This convention is used by the archetype and by the AMP unpacker. + | | |__ ex: alfresco/module/org.alfresco.mymodule ---> Example Alfresco module config + | | + | | + | |__ java -------------------------------> customization java classes + | | + | |__ webapp -----------------------------> AMP overlay folder - this folder is overlayed (so may overwrite other dependent AMPs) | |__ test __ __ resources _ diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/readme.apt.vm b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/readme.apt.vm index a16f3532..da5734a3 100644 --- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/readme.apt.vm +++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/readme.apt.vm @@ -44,7 +44,7 @@ FEATURES: * Install/deployment of Alfresco compatible AMPs on a m2 repo <<< mvn install / deploy [ params ] >>> - * using the {{{http://repository.sourcesense.com/maven2-sites/maven-amp-plugin} maven-amp-plugin}} WAR can depend on AMP artifacts and have them overlayed within the maven lifecycle, avoiding the boring MMT run. + * using the {{{../maven-amp-plugin} maven-amp-plugin}} WAR can depend on AMP artifacts and have them overlayed within the maven lifecycle, avoiding the boring MMT run. * AMP dependencies management: <<>> can take care of overlay AMP deps 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 854add37..57b2ff7d 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 @@ -1,12 +1,31 @@ - - org.apache.maven.skins - maven-stylus-skin - 1.0 - + + org.apache.maven.skins + maven-fluido-skin + 1.2.1 + + + + true + true + + Maven Alfresco Lifecycle + Maven Alfresco Lifecycle + /img/Alfresco-lofo-transparent.gir + /index.html + + + mindthegabz + true + true + + + + + - + @@ -24,8 +43,8 @@ - - + + diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/README.txt b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/README.txt index 005114ef..6ae3fc22 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/README.txt +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/README.txt @@ -24,26 +24,18 @@ What is an Alfresco extension? We define an "Alfresco extension" (or customization) a custom build of Alfresco which does not impact on Alfresco source code (while depends on binary releases of the libraries and webapp). This is realized overriding (and in certain particular cases overwriting) Alfresco default configuration using Convention over Configuration hooks (e.g. classpath:alfresco/extension/*-context.xml autoloading), in order to ease integration in enterprise environments and to simplify full lifecycle management (from scratch-start to release and deploy) also for non experienced developers, resulting in a less error prone controlled process. Alternative to an "Alfresco extension" is the "Alfresco Module" (or AMP) which is meant to be deployed on an existing Alfresco instance and above all to coexist with other modules on top of this instance: as a general rule of thumb an extension is an exclusive customization while a module is one of many customizations which have a separate lifecycle (and owner). -For an maven2 archetype of AMP Alfresco build please have a look at: - -https://dev.sourcesense.com/cargo/maven2-sites/maven-alfresco-extension-archetype Quick Start: ------------ Wanna skip all the discussion (or you know already the thing) and want a zero conf maven2 alfresco customization project generation? -Just run: - -mvn org.apache.maven.plugins:maven-archetype-plugin:1.0-alpha-7:create -DarchetypeGroupId=${pom.groupId} -DarchetypeArtifactId=${pom.artifactId} -DarchetypeVersion=${pom.version} \ - -DgroupId=mycompany.com -DartifactId=my-alfresco-customization -Dversion=0.1-SNAPSHOT - -DremoteRepositories=http://repository.sourcesense.com/maven2 (archetype is deployed there) - -DpomRemoteRepositories=http://repository.sourcesense.com/maven2 (wagon-dav ssh version patched is here) +Just see https://wiki.alfresco.com/wiki/Maven_For_Dummies Introduction: ------------- -This archetype developed within Sourcesense (http://www.sourcesense.com) aims to provide a standardized approach to development, release and deployment of Alfresco extensions (as opposed to AMP builds). Using standard m2 lifecycle commands (mvn compile package deploy) and generally available plugins (cargo, release, assembly) we are able to cover a very high percentage of Alfresco lifecycle common use cases. +This archetype was originally developed within Sourcesense (http://www.sourcesense.com) aims to provide a standardized approach to development, release and deployment of Alfresco extensions (as opposed to AMP builds). Using standard m2 lifecycle commands (mvn compile package deploy) and generally available plugins (cargo, release, assembly) we are able to cover a very high percentage of Alfresco lifecycle common use cases. It can be used both with Maven2 and Ant build systems, but it must be clear that *only* the Maven2 approach provides all the automation features we will describe in the next paragraphs. In addition to that the m2 approach provides a zero-conf approach while ant requires (as usual) manual gathering and selection of required alfresco libraries and webapp (please refer to README-ant.txt for further info about the Ant build). Last but not the least, m2 build is more likely to be maintained and improved (especially in the likely case Alfresco moves to maven2). For more details on the m2 apprach please refer instead to README-m2.txt. @@ -78,7 +70,7 @@ Using cargo we're able to provide (local) Jboss and (local/remote) Tomcat deploy -- Zero conf startup -Community artifacts (alfresco 2.x) artifacts are available on Sourcesense public repository (http://repository.sourcesense.com/maven2) and allow all the default dependencies specified in this POM to be successfully retrieved with no additional configuration. If you want to use instead enterprise dependencies you either need to have a private access to Sourcesense private repositories or push alfresco for releasing this artifacts on public Alfresco maven repositories +Community artifacts (alfresco 2.x) artifacts are available on Alfresco public repository (http://maven.alfresco.com) and allow all the default dependencies specified in this POM to be successfully retrieved with no additional configuration. --- Configurable log location and easy database setup By editing the POM property in the appropriate profile you can have the setting applied where it makes sense (jboss configures everything centrally). 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 97786100..adbd6ac5 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 @@ -318,7 +318,7 @@ org.alfresco.maven.plugin maven-amp-plugin - 3.0.4-SNAPSHOT + 3.0.4 @@ -448,10 +448,6 @@ yourcompany-site scp://yourcompany/var/maven2-sites --> - (source folder) | |__ main ___ __ resources --------------------------> mapped in the classpath - | | | - | | |__ alfresco/extension ---> alfresco overriding Spring contexts - | | - | |__ properties -------------------------> environment aware application properties files - | | | - | | |__ local -------------> default application.properties - | | - | |__ java -------------------------------> customization java classes - | | - | |__ webapp -----------------------------> alfresco webapp overlay folder - this folder is overlayed (so may overwrite alfresco war) + | | | + | | |__ alfresco/extension ---> alfresco overriding Spring contexts + | | + | |__ properties -------------------------> environment aware application properties files + | | | + | | |__ local -------------> default application.properties + | | + | |__ java -------------------------------> customization java classes + | | + | |__ webapp -----------------------------> alfresco webapp overlay folder - this folder is overlayed (so may overwrite alfresco war) | | | |__ WEB-INF ----------------> drop in this folder WEB-INF custom / overwriting files (e.g. faces-config-custom.xml / web.xml) | diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/readme.apt.vm b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/readme.apt.vm index 8a3ccbdc..7ad23666 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/readme.apt.vm +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/readme.apt.vm @@ -15,7 +15,7 @@ Introduction: It aims to provide a standardized approach to development, release and deployment of Alfresco extensions (as opposed to AMP builds). Using standard m2 lifecycle commands (mvn compile package deploy) and generally available plugins (cargo, release, assembly) we are able to cover a very high percentage of Alfresco lifecycle common use cases. \ It can be used both with Maven2 and Ant build systems, but it must be clear that *only* the Maven2 approach provides all the automation features we will describe in the next paragraphs. \ In addition to that the m2 approach provides a zero-conf approach while ant requires (as usual) manual gathering and selection of required alfresco libraries and webapp (please refer to README-ant.txt for further info about the Ant build). Last but not the least, m2 build is more likely to be maintained and improved (especially in the likely case Alfresco moves to maven2). \ - For more details on the Ant apprach please refer instead to {{{${site_tags_url}/${site_pom_artifactId}-${site_pom_version}Úsrc/main/resources/archetype-resources/readme-ANT.txt} Ant Readme}}. + For more details on the Ant apprach please refer instead to {{{${site_tags_url}/${site_pom_artifactId}-${site_pom_version}�src/main/resources/archetype-resources/readme-ANT.txt} Ant Readme}}. Features (maven2 only): @@ -47,8 +47,8 @@ Features (maven2 only): For additional configuration please refer to maven-cargo-plugin configuration and fine tune your $M2_HOME/conf/settings.xml (for system level settings) or ~/.m2/settings.xml (for user level settings) in order to match your host/credentials configuration * <> \ - Community artifacts (alfresco 2.x) artifacts are available on Sourcesense public repository (http://repository.sourcesense.com/maven2) and allow all the default dependencies specified in this POM to be successfully retrieved with no additional configuration. \ - If you want to use instead enterprise dependencies you either need to have a private access to Sourcesense private repositories or push alfresco for releasing this artifacts on public Alfresco maven repositories. + Community artifacts (alfresco 2.x) artifacts are available on Sourcesense public repository (http://maven.alfresco.com/maven2) and allow all the default dependencies specified in this POM to be successfully retrieved with no additional configuration. \ + * <> \ By editing the POM property in the appropriate profile you can have the setting applied where it makes sense (jboss configures everything centrally). diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/site.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/site.xml index df82700c..bf405b7e 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/site.xml +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/site.xml @@ -1,9 +1,28 @@ - - org.apache.maven.skins - maven-stylus-skin - 1.0 - + + org.apache.maven.skins + maven-fluido-skin + 1.2.1 + + + + true + true + + Maven Alfresco Lifecycle + Maven Alfresco Lifecycle + /img/Alfresco-lofo-transparent.gir + /index.html + + + mindthegabz + true + true + + + + + - - + + diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/src/site/apt/index.apt.vm b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/src/site/apt/index.apt.vm index aa0f430f..495a0767 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/src/site/apt/index.apt.vm +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/src/site/apt/index.apt.vm @@ -42,8 +42,8 @@ References ------------------------------------------ - ss-public - http://repository.sourcesense.com/maven2 + alfresco-public + http://maven.alfresco.com/nexus/content/groups/public ------------------------------------------- @@ -51,5 +51,5 @@ References Quick usage - Create a project using the maven-alfresco-amp-archetype (see {{ http://repository.sourcesense.com/maven2-sites/maven-alfresco-amp-archetype }} ). + See {{https://wiki.alfresco.com/wiki/Maven_For_Dummies}} \ No newline at end of file diff --git a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/site/site.xml b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/site/site.xml index 4af9a39a..23185be5 100644 --- a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/site/site.xml +++ b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/site/site.xml @@ -1,9 +1,29 @@ - - org.apache.maven.skins - maven-stylus-skin - 1.0 - + + org.apache.maven.skins + maven-fluido-skin + 1.2.1 + + + + true + true + + Maven Alfresco Lifecycle + Maven Alfresco Lifecycle + /img/Alfresco-lofo-transparent.gir + /index.html + + + mindthegabz + true + true + + + + + + - - org.apache.maven.skins - maven-stylus-skin - 1.0 - + + org.apache.maven.skins + maven-fluido-skin + 1.2.1 + + + + true + true + + Maven Alfresco Lifecycle + Maven Alfresco Lifecycle + /img/Alfresco-lofo-transparent.gir + /index.html + + + mindthegabz + true + true + + + + + diff --git a/pom.xml b/pom.xml index ed5ecdad..216d364e 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ community contexts. GoogleCode - http://code.google.com/p/maven-alfresco-archetypes/issues + http://code.google.com/p/maven-alfresco-archetypes/issues/detail Alfresco @@ -163,7 +163,7 @@ community contexts. clean package - deploy + deploy site-deploy ${svn.tags.url} false @@ -227,7 +227,7 @@ community contexts. alfresco-docs - dav:http://maven.alfresco.com/nexus/content/repositories/alfresco-docs/maven-alfresco-lifecycle/${project.version} + dav:http://maven.alfresco.com/nexus/content/repositories/alfresco-docs/maven-alfresco-lifecycle/latest diff --git a/src/site/site.xml b/src/site/site.xml index 35d252c5..cb61b9eb 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,9 +1,28 @@ org.apache.maven.skins - maven-stylus-skin - 1.0 + maven-fluido-skin + 1.2.1 + + + true + true + + Maven Alfresco Lifecycle + Maven Alfresco Lifecycle + /img/Alfresco-lofo-transparent.gir + /index.html + + + mindthegabz + true + true + + + + + - Maven alfresco Extension archetype - v. ${project.version} + Maven Alfresco Lifecycle - v. ${project.version} http://www.alfresco.com - images/Alfresco-logo-transparent.gif + img/Alfresco-logo-transparent.gif + - - + + - - - + + + + + - - - + +