Commit 4d8ab7d2 authored by mindthegab's avatar mindthegab
Browse files

preparing updated release 

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@161 04253f4f-3451-0410-a141-5562f1e59037
parent b0d3b564

maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
	<parent>

		<groupId>com.sourcesense.alfresco</groupId>

		<artifactId>maven-alfresco-archetypes</artifactId>

		<version>1.0.0</version>

		<version>1.0.1-SNAPSHOT</version>

	</parent>

	<build>

		<extensions>

maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml

+8 −6
Original line number Diff line number Diff line
@@ -83,10 +83,11 @@ 
	-->

	<dependencies>

		<dependency>

			<groupId>alfresco.community</groupId>

			<groupId>org.alfresco</groupId>

			<artifactId>alfresco-repository</artifactId>

			<version>2.1.0</version>

			<version>3.0Stable</version>

			<scope>provided</scope>

			<classifier>labs</classifier>

		</dependency>

		<dependency>

			<groupId>org.springframework</groupId>
@@ -103,7 +104,7 @@ 
		-->

		<!-- Example AMP dependency:  will be properly overlayed in the  WAR produced by the integration-test phase in profile 'webapp'

		<dependency>

			<groupId>org.alfresco.community</groupId>

			<groupId>org.alfresco</groupId>

			<artifactId>recordsmanagement</artifactId>

			<version>2.1.0</version>

			<type>amp</type>
@@ -163,7 +164,7 @@ 
					<overlays>

						<!-- This sample adds records management module in the finally built AMP

						<overlay>

							<groupId>org.alfresco.community</groupId>

							<groupId>org.org.alfresco</groupId>

							<artifactId>recordsmanagement</artifactId>

							<version>2.1.0</version>

							<type>amp</type>
@@ -350,10 +351,11 @@ 
			<dependencies>

				<!-- This is the alfresco version you're testing the AMP against. Don't remove if you want jetty to be able to deploy a WAR :) -->

				<dependency>

					<groupId>alfresco.community</groupId>

					<groupId>org.alfresco</groupId>

					<artifactId>alfresco</artifactId>

					<version>2.1.0</version>

					<version>3.0Stable</version>

					<type>war</type>

					<classifier>labs</classifier>

				</dependency>

			</dependencies>

		</profile>

maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/index.apt.vm

+3 −5
Original line number Diff line number Diff line
@@ -23,9 +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  org.apache.maven.plugins:maven-archetype-plugin:1.0-alpha-7:create  -DarchetypeGroupId=${site_pom_groupId} -DarchetypeVersion=${site_pom_version} \

			-DarchetypeArtifactId=${site_pom_artifactId} \

			-DgroupId=mycompany.com  -DartifactId=mymodule -Dversion=0.1-SNAPSHOT \

			-DremoteRepositories=http://repository.sourcesense.com/maven2 \

			-DpomRemoteRepositories=http://repository.sourcesense.com/maven2

mvn archetype:generate -DarchetypeCatalog=http://repository.sourcesense.com/maven2/archetype-catalog.xml

--------------------------------------------



and then choose the option 'maven-alfresco-amp-archetype'

maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
	<parent>

		<groupId>com.sourcesense.alfresco</groupId>

		<artifactId>maven-alfresco-archetypes</artifactId>

		<version>1.0.0</version>

		<version>1.0.1-SNAPSHOT</version>

	</parent>

	<description>

		This archetype developed aims to provide a standardized approach to development, release and deployment of Alfresco extensions (as opposed to

maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml

+12 −14
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
		<alfresco.db.name>alf_jetty</alfresco.db.name>

		<alfresco.db.username>alfresco</alfresco.db.username>

		<alfresco.db.password>alfresco</alfresco.db.password>

		<alfresco.version>2.1.0</alfresco.version>

		<alfresco.version>3.0Stable</alfresco.version>

		<!-- Used for 2.1.0 -->

		<desktop.action.package>org.alfresco.filesys.smb.server.repo.desk</desktop.action.package>

		<!-- Used for 2.9.0+ -->
@@ -130,35 +130,40 @@ 
			| Jboss alfresco build (e.g. no log4j.properties and fix for myFaces) 

		-->

		<dependency>

			<groupId>alfresco.community</groupId>

			<groupId>org.alfresco</groupId>

			<artifactId>alfresco</artifactId>

			<version>${alfresco.version}</version>

			<type>war</type>

			<classifier>labs</classifier>

		</dependency>

		<!-- All provided libs (as contained in the war dependency) but useful for development (e.g. IDE configuration) -->

		<dependency>

			<groupId>alfresco.community</groupId>

			<groupId>org.alfresco</groupId>

			<artifactId>alfresco-web-client</artifactId>

			<version>${alfresco.version}</version>

			<scope>provided</scope>

			<classifier>labs</classifier>

		</dependency>

		<dependency>

			<groupId>alfresco.community</groupId>

			<groupId>org.alfresco</groupId>

			<artifactId>alfresco-core</artifactId>

			<version>${alfresco.version}</version>

			<scope>provided</scope>

			<classifier>labs</classifier>

		</dependency>

		<dependency>

			<groupId>alfresco.community</groupId>

			<groupId>org.alfresco</groupId>

			<artifactId>alfresco-repository</artifactId>

			<version>${alfresco.version}</version>

			<scope>provided</scope>

			<classifier>labs</classifier>

		</dependency>

		<dependency>

			<groupId>alfresco.community</groupId>

			<groupId>org.alfresco</groupId>

			<artifactId>alfresco-remote-api</artifactId>

			<version>${alfresco.version}</version>

			<scope>provided</scope>

			<classifier>labs</classifier>

		</dependency>



		<!-- Sample of AMP dependency that will be properly uncompressed in the Alfresco WAR (no more need for AMP):
@@ -170,7 +175,7 @@ 
			<type>amp</type>

			<artifactId>recordsmanagement</artifactId>

			<version>${alfresco.version}</version>

			<groupId>org.alfresco.community</groupId>

			<groupId>org.alfresco</groupId>

			</dependency>

		-->
@@ -192,13 +197,6 @@ 
		<!-- Customize here your webapp name - default: alfresco.war -->

		<finalName>${webapp.name}</finalName>

		<!-- Used to access Sourcesense repository for writing. Public version not available, see README.txt -->

		<extensions>

			<extension>

				<groupId>org.apache.maven.wagon</groupId>

				<artifactId>wagon-webdav</artifactId>

				<version>1.0-beta-3</version>

			</extension>

		</extensions>

		<!-- In certain cases we do build time filtering with the single sourcing application.properties -->

		<filters>

			<filter>src/main/properties/${env}/application.properties</filter>