Commit 1d947a20 authored by mindthegab's avatar mindthegab
Browse files

-- last fixes and updates to archetypes before release 

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

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

+5 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
	</repositories>

	<pluginRepositories>

		<pluginRepository>

			<id>ss-public</id>

			<id>ss-public-mirror</id>

			<url>http://repository.sourcesense.com/nexus/content/groups/public</url>

		</pluginRepository>

		<pluginRepository>
@@ -101,7 +101,7 @@ 
			<artifactId>alfresco-repository</artifactId>

			<version>3.2r</version>

			<scope>provided</scope>

			<classifier>labs</classifier>

			<classifier>community</classifier>

		</dependency>

		<dependency>

			<groupId>org.springframework</groupId>
@@ -273,7 +273,7 @@ 
							<dependency>

								<groupId>org.alfresco.maven.plugin</groupId>

								<artifactId>maven-amp-plugin</artifactId>

								<version>2.0.0</version>

								<version>3.0.1-SNAPSHOT</version>

							</dependency>

						</dependencies>

					</plugin>
@@ -412,9 +412,9 @@ 
				<dependency>

					<groupId>org.alfresco</groupId>

					<artifactId>alfresco</artifactId>

					<version>3.0r</version>

					<version>3.2r</version>

					<type>war</type>

					<classifier>labs</classifier>

					<classifier>community</classifier>

				</dependency>

			</dependencies>

		</profile>

maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

+7 −0
Original line number Diff line number Diff line
@@ -6,6 +6,13 @@ 
        <include>**/*.java</include>

      </includes>

    </fileSet>

    <fileSet filtered="true" encoding="UTF-8">

      <directory>src/main/webapp</directory>

      <includes>

        <include>**/*.xml</include>

        <include>**/*.txt</include>

      </includes>

    </fileSet>

    <fileSet filtered="true" encoding="UTF-8">

      <directory>src/main/properties</directory>

      <includes>

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

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
		<resource>src/main/resources/alfresco/extension/web-client-config-custom.xml</resource>

		<resource>src/main/resources/alfresco/extension/webclient.properties</resource>

		<resource>src/main/resources/log4j.properties</resource>

		<resource>src/main/webapp/WEB-INF/web.xml</resource>

		<resource>src/main/webapp/WEB-INF/README-WEB-INF.txt</resource>

		<resource>src/main/webapp/WEB-INF/faces-config-custom.xml</resource>

		<resource>tools/ant/tasks/tomcat-tasks.properties</resource>

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

+18 −13
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ 
	<description>Alfresco extension</description>

	<!--

		|

		| Prerequisite:

		| - Mysql local instance running and db alf_jetty created with permissions for alfresco/alfresco user.

		|

		| How it works:

		| By default the project is overlayed to the alfresco war which depends upon and deployed as a WAR (local development and testing purposes)

		| Available properties:

		|
@@ -101,7 +105,7 @@ 
	</repositories>

	<pluginRepositories>

		<pluginRepository>

			<id>ss-public</id>

			<id>ss-public-mirror</id>

			<url>http://repository.sourcesense.com/nexus/content/groups/public</url>

		</pluginRepository>

		<pluginRepository>
@@ -130,7 +134,7 @@ 
			<artifactId>alfresco</artifactId>

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

			<type>war</type>

			<classifier>labs</classifier>

			<classifier>community</classifier>

		</dependency>

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

		<dependency>
@@ -138,28 +142,28 @@ 
			<artifactId>alfresco-web-client</artifactId>

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

			<scope>provided</scope>

			<classifier>labs</classifier>

			<classifier>community</classifier>

		</dependency>

		<dependency>

			<groupId>org.alfresco</groupId>

			<artifactId>alfresco-core</artifactId>

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

			<scope>provided</scope>

			<classifier>labs</classifier>

			<classifier>community</classifier>

		</dependency>

		<dependency>

			<groupId>org.alfresco</groupId>

			<artifactId>alfresco-repository</artifactId>

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

			<scope>provided</scope>

			<classifier>labs</classifier>

			<classifier>community</classifier>

		</dependency>

		<dependency>

			<groupId>org.alfresco</groupId>

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

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

			<scope>provided</scope>

			<classifier>labs</classifier>

			<classifier>community</classifier>

		</dependency>



		<!-- Sample of AMP dependency that will be properly uncompressed in the Alfresco WAR (no more need for AMP):
@@ -229,7 +233,7 @@ 
				<filtering>true</filtering>

			</resource>

			<resource>

				<directory>tools/mysql</directory>

				<directory>${project.basedire}tools/mysql</directory>

				<includes>

					<include>*.sql</include>

				</includes>
@@ -287,7 +291,7 @@ 
					<dependency>

						<groupId>org.alfresco.maven.plugin</groupId>

						<artifactId>maven-amp-plugin</artifactId>

						<version>2.0.0</version>

						<version>3.0.1-SNAPSHOT</version>

					</dependency>

				</dependencies>

			</plugin>
@@ -306,6 +310,7 @@ 
			<plugin>

				<groupId>org.mortbay.jetty</groupId>

				<artifactId>maven-jetty-plugin</artifactId>

				<version>6.1.21</version>

				<executions>

					<!-- Runs jetty when 'integration-test' phase is called -->

					<execution>
@@ -431,12 +436,12 @@ 
			| Enable this repo in case of publicly redistributable artifacts (Sourcesense public repositories via ssh + public key )

			|

			<repository>

			<id>ss-public</id>

			<id>yourcompany</id>

			<url>scp://yourcompany/var/maven2</url>

			</repository>

			<distributionManagement>

			<site>

			<id>ss-site-public</id>

			<id>yourcompany-site</id>

			<url>scp://yourcompany/var/maven2-sites</url>

			</site>

		-->

maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml

0 → 100644
+645 −0

File added.

Preview size limit exceeded, changes collapsed.