inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-08-07 17:49:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

POM cleanup, updated to latest available artifacts versions, removed obsolete stuff, life, universe and everything. Changed an exact multiple of 42 characters.

Browse Source 
git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@332 04253f4f-3451-0410-a141-5562f1e59037
This commit is contained in:
skuro
2011-08-05 07:42:29 +00:00
parent ea49f96271
commit 9e30f49e8d
16 changed files with 176 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml
View File

@@ -27,20 +27,14 @@
</parent>
<description>
This archetype developed aims to provide a standardized approach to development, release and deployment of Alfresco extensions (as opposed to
AMP builds, to be released as a different artifact ). 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 this website. 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 Section (or directly and to README-m2.txt of the generated project).
AMP builds, to be released as a different artifact ).
</description>
<build>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
<version>2.0-alpha-2</version>
<version>2.0</version>
</extension>
<!--
Unreleased version of webdav wagon plugin which fixes a boring

2
maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/README-m2.txt
View File

@@ -65,7 +65,7 @@ Lifecycle HOWTO - Usage
--- Fast one shot build and embedded jetty run-war|run-exploded [and restore bootstrap] [and customize webappName] [and integrate LDAP]:
' MAVEN_OPTS="-Xms256m -Xmx512m -XX:PermSize=128m mvn integration-test [-Denv=yourEnv] [-DrestoreVersion=versionToRestore] [-DwebappName=yourCustomWebappName] [-Denterprise] '
' MAVEN_OPTS="-Xms256m -Xmx512m -XX:PermSize=128m mvn integration-test" [-Denv=yourEnv] [-DrestoreVersion=versionToRestore] [-DwebappName=yourCustomWebappName] [-Denterprise] '
(default env=src/main/properties/local/application.properties)

6
maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/build.xml
View File

@@ -15,11 +15,11 @@
<property name="alfresco.dir" value=""/>
-->
<!-- By default loads src/main/properties/local/application.properties -->
<!-- By default loads src/main/properties/local/alfresco-global.properties -->
<property name="env" value="local"/>
<property name="webapp.name" value="alfresco" />
<property file="${properties.dir}/${env}/application.properties" />
<property file="${properties.dir}/${env}/alfresco-global.properties" />
<!-- Import tomcat utility tasks -->
<import file="${tools.dir}/ant/tasks/tomcat-tasks.xml"/>
@@ -51,7 +51,7 @@
<exclude name="**/restore-context.xml" />
</fileset>
</copy>
<copy file="${properties.dir}/${env}/application.properties" tofile="${build.dir}/classes/alfresco/extension/application.properties"></copy>
<copy file="${properties.dir}/${env}/alfresco-global.properties" tofile="${build.dir}/classes/alfresco-global.properties"></copy>
</target>

4
maven-alfresco-archetypes/maven-alfresco-share-archetype/pom.xml
View File

@@ -17,13 +17,13 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
<version>2.0-alpha-4</version>
<version>2.0</version>
</extension>
</extensions>
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
<version>2.0-alpha-4</version>
<version>2.0</version>
<extensions>true</extensions>
</plugin>
</plugins>

2
maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/pom.xml
View File

@@ -22,7 +22,7 @@
<!-- Configuration point for the build time properties -->
<properties>
<env>local</env>
<alfresco.version>3.2r</alfresco.version>
<alfresco.version>3.4.a</alfresco.version>
<share.log.level>info</share.log.level>
<share.servlet.port>8081</share.servlet.port>
</properties>

4
maven-alfresco-archetypes/maven-alfresco-share-module-archetype/pom.xml
View File

@@ -18,13 +18,13 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
<version>2.0-alpha-4</version>
<version>2.0</version>
</extension>
</extensions>
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
<version>2.0-alpha-4</version>
<version>2.0</version>
<extensions>true</extensions>
</plugin>
</plugins>

3
maven-alfresco-archetypes/pom.xml
View File

@@ -29,12 +29,13 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-shared</artifactId>
<version>1.0-beta-6-patched</version>
<version>1.0</version>
</extension>
</extensions>
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
<version>2.0</version>
<extensions>true</extensions>
</plugin>
</plugins>

7
plugins/maven-amp-plugin-test/pom.xml
View File

@@ -25,7 +25,7 @@
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<alfresco.version>3.3-SNAPSHOT</alfresco.version>
<alfresco.version>3.4.a</alfresco.version>
<spring.version>3.0.0.RELEASE</spring.version>
<amp-plugin.version>3.0.3-SNAPSHOT</amp-plugin.version>
<alfresco.module.id>${project.artifactId}</alfresco.module.id>
@@ -39,6 +39,11 @@
<scope>provided</scope>
<classifier>community</classifier>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>3.0.3.RELEASE</version>
</dependency>
</dependencies>
<build>
<plugins>

53
plugins/maven-amp-plugin/pom.xml
View File

@@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.alfresco.maven.plugin</groupId>
<artifactId>maven-amp-plugin</artifactId>
@@ -12,18 +13,22 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<description>
This plugin defines a lifecycle for Alfresco ECM Modules packaging (.amp), handles AMP transitive dependencies from AMP and WAR projects,
providing a more enterprise oriented support alternative to the Alfresco MMT (module management tool) usage. It is used by
maven-alfresco-amp-archetype in order to package and test run an AMP and by the maven-alfresco-extension-archetype to depend transitively upon
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
This plugin defines a lifecycle for Alfresco ECM Modules packaging (.amp), handles AMP transitive dependencies
from AMP and WAR projects,
providing a more enterprise oriented support alternative to the Alfresco MMT (module management tool) usage. It
is used by
maven-alfresco-amp-archetype in order to package and test run an AMP and by the
maven-alfresco-extension-archetype to depend transitively upon
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
</description>
<properties>
<site_pom_description>${pom.description}</site_pom_description>
<site_pom_url>${pom.url}</site_pom_url>
<site_pom_groupId>${pom.groupId}</site_pom_groupId>
<site_pom_artifactId>${pom.artifactId}</site_pom_artifactId>
<site_pom_version>${pom.version}</site_pom_version>
<site_pom_description>${project.description}</site_pom_description>
<site_pom_url>${project.url}</site_pom_url>
<site_pom_groupId>${project.groupId}</site_pom_groupId>
<site_pom_artifactId>${project.artifactId}</site_pom_artifactId>
<site_pom_version>${project.version}</site_pom_version>
<site_tags_url>${svn.tags.url}</site_tags_url>
</properties>
<developers>
@@ -47,38 +52,48 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0.6</version>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>3.0-alpha-4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0.6</version>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>3.0-alpha-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>2.2</version>
<version>2.4.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.4.7</version>
<artifactId>plexus-interpolation</artifactId>
<version>1.13</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.2.2</version>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>1.1</version>
<version>2.0-alpha-1</version>
<scope>test</scope>
</dependency>
</dependencies>

4
plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AbstractAmpMojo.java
View File

@@ -282,7 +282,7 @@ public abstract class AbstractAmpMojo extends AbstractMojo
/**
* The Jar archiver needed for archiving classes directory into jar file under WEB-INF/lib.
*
* @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
* @component role="${component.org.codehaus.plexus.archiver.Archiver#jar}"
* @required
*/
private JarArchiver mJarArchiver;
@@ -374,7 +374,7 @@ public abstract class AbstractAmpMojo extends AbstractMojo
/**
* To look up Archiver/UnArchiver implementations
*
* @parameter expression="${component.org.codehaus.plexus.archiver.manager.ArchiverManager}"
* @component role="${component.org.codehaus.plexus.archiver.manager.ArchiverManager}"
* @required
*/
protected ArchiverManager mArchiverManager;

7
plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/AmpMojo.java
View File

@@ -28,7 +28,6 @@ import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProjectHelper;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.ManifestException;
import org.codehaus.plexus.archiver.zip.ZipArchiver;
import java.io.File;
import java.io.IOException;
@@ -229,8 +228,8 @@ public class AmpMojo extends AbstractAmpMojo
* composes the full file name for the AMP and gets a file handle for that file
* TODO: what happens when nulls are passed in
* TODO: what does a null response mean?
* @param pBaseDir Base directory for AMP
* @param pFileName Final Name of AMP
* @param pBasedir Base directory for AMP
* @param pFinalName Final Name of AMP
* @param pClassifier TODO: fill this in
*/
protected static File getAmpFile( File pBasedir, String pFinalName, String pClassifier )
@@ -334,7 +333,7 @@ public class AmpMojo extends AbstractAmpMojo
/**
* The AMP archiver.
* @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#amp}"
* @component role="${component.org.codehaus.plexus.archiver.Archiver}" roleHint="amp"
* @required
*/
private AmpArchiver mAmpArchiver;

5
plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/AbstractAmpPackagingTask.java
View File

@@ -263,11 +263,6 @@ public abstract class AbstractAmpPackagingTask
unArchiver.setOverwrite( true );
unArchiver.extract();
}
catch ( IOException e )
{
throw new MojoExecutionException( "Error unpacking file[" + file.getAbsolutePath() + "]" + "to[" +
unpackDirectory.getAbsolutePath() + "]", e );
}
catch ( ArchiverException e )
{
throw new MojoExecutionException( "Error unpacking file[" + file.getAbsolutePath() + "]" + "to[" +

22
plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/util/MappingUtils.java
View File

@@ -20,10 +20,12 @@ package org.alfresco.maven.plugin.amp.util;
*/
import org.apache.maven.artifact.Artifact;
import org.codehaus.plexus.util.interpolation.ObjectBasedValueSource;
import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator;
import org.codehaus.plexus.util.interpolation.ValueSource;
import org.codehaus.plexus.interpolation.InterpolationException;
import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
import org.codehaus.plexus.interpolation.ValueSource;
import java.util.List;
import java.util.Properties;
/**
@@ -68,7 +70,11 @@ public class MappingUtils
interpolator.addValueSource( new PropertiesInterpolationValueSource( classifierMask ) );
try {
value = interpolator.interpolate( value, "__artifact" );
} catch (InterpolationException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
return value;
}
@@ -90,6 +96,16 @@ public class MappingUtils
return properties.getProperty( key );
}
@Override
public List getFeedback() {
return null; //To change body of implemented methods use File | Settings | File Templates.
}
@Override
public void clearFeedback() {
//To change body of implemented methods use File | Settings | File Templates.
}
}
}

2
plugins/maven-amp-plugin/src/main/java/org/alfresco/plexus/archiver/AmpUnArchiver.java
View File

@@ -61,7 +61,7 @@ public class AmpUnArchiver extends AbstractZipUnArchiver {
@Override
protected void execute()
throws ArchiverException, IOException
throws ArchiverException
{
getLogger().info( "Expanding: " + getSourceFile() + " into " + getDestDirectory() );

10
plugins/maven-nosnapshot-plugin/pom.xml
View File

@@ -16,23 +16,23 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.0.9</version>
<version>3.0-alpha-2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>1.0-beta-1</version>
<version>2.0-alpha-1</version>
<scope>test</scope>
</dependency>
</dependencies>

31
pom.xml
View File

@@ -32,13 +32,14 @@ community contexts.
These redundancies are due to filtering issues of Maven. See here
http://maven.apache.org/plugins/maven-site-plugin/usage.html
-->
<site_pom_description>${pom.description}</site_pom_description>
<site_pom_description>${project.description}</site_pom_description>
<site_pom_url>${project.url}</site_pom_url>
<site_pom_groupId>${project.groupId}</site_pom_groupId>
<site_pom_artifactId>${project.artifactId}</site_pom_artifactId>
<site_pom_version>${project.version}</site_pom_version>
<site_tags_url>${svn.tags.url}</site_tags_url>
<site_site_url>${project.url}</site_site_url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<scm>
<connection>scm:svn:https://maven-alfresco-archetypes.googlecode.com/svn/trunk</connection>
@@ -122,22 +123,20 @@ community contexts.
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>2.0.1</version>
<version>3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<!-- Using patched version to overcome multimodule limitations during release
See: http://jira.codehaus.org/browse/MCHANGES-145
-->
<version>2.2-patched</version>
<version>2.6</version>
<!--
Automatically notifies the list when release is done. Please supply
username and password in the command line
@@ -149,8 +148,6 @@ community contexts.
<configuration>
<template>custom-announcement.vm</template>
<templateDirectory>announcements</templateDirectory>
<!-- To have the announcement sent only for the root module (otherwise it breaks, workaround for http://jira.codehaus.org/browse/MCHANGES-145) -->
<aggregate>true</aggregate>
<smtpHost>${smtp.server}</smtpHost>
<smtpPort implementation="java.lang.Integer">${smtp.port}</smtpPort>
<toAddresses>
@@ -181,7 +178,7 @@ community contexts.
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
<version>1.0-beta-6</version>
<version>1.0</version>
</extension>
</extensions>
</build>
@@ -189,13 +186,15 @@ community contexts.
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
<reportSets>
<reportSet>
<reports>
@@ -206,13 +205,11 @@ community contexts.
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
<version>2.8</version>
</plugin>
<plugin>
<artifactId>maven-changes-plugin</artifactId>
<version>2.6</version>
<reportSets>
<reportSet>
<reports>