Commit 5c56d668 authored by ohej's avatar ohej
Browse files

Bump to 4.3.0-SNAPSHOT 

 - Fix Solr re-packaging for all-in-one
 - Remove config artifacts
 - Initial Share AMP archetype 


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

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
      <defaultValue>org.alfresco</defaultValue>

    </requiredProperty>

    <requiredProperty key="alfresco_target_version">

      <defaultValue>4.2.e</defaultValue>

      <defaultValue>4.3.0-SNAPSHOT</defaultValue>

    </requiredProperty>

    <requiredProperty key="package">

      <defaultValue>(not used)</defaultValue>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml

+19 −17
Original line number Diff line number Diff line
@@ -32,34 +32,33 @@ 
                                <artifactItem>

                                    <artifactId>alfresco-solr</artifactId>

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

                                    <classifier>config</classifier>

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

                                    <type>zip</type>

                                    <type>jar</type>

                                </artifactItem>

                            </artifactItems>

                        </configuration>

                    </execution>

                </executions>

            </plugin>

            <plugin>

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

                <artifactId>maven-antrun-plugin</artifactId>

                <version>1.7</version>

                <executions>

                    <execution>

                        <id>overlay-solr-war</id>

                        <id>copy-alfresco-solr</id>

                        <goals><goal>unpack</goal></goals>

                        <phase>generate-resources</phase>

                        <goals>

                            <goal>run</goal>

                        </goals>

                        <configuration>

                            <tasks>

                                <echo message="Unpacking Apache Solr for web.xml overlay" />

                                <unzip src="${alfresco.solr.dir}/apache-solr-1.4.1.war" dest="${alfresco.solr.war.overlay}" />

                            </tasks>

                            <outputDirectory>${alfresco.solr.war.overlay}</outputDirectory>

                            <artifactItems>

                                <artifactItem>

                                    <artifactId>alfresco-solr</artifactId>

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

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

                                    <type>war</type>

                                </artifactItem>

                            </artifactItems>

                        </configuration>

                    </execution>



                </executions>

            </plugin>

            

            <plugin>

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

                <artifactId>maven-resources-plugin</artifactId>
@@ -110,6 +109,7 @@ 
                    </replacements>

                </configuration>

            </plugin>

            

            <plugin>

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

                <artifactId>maven-antrun-plugin</artifactId>
@@ -130,6 +130,7 @@ 
                    </execution>

                </executions>

            </plugin>

            

            <plugin>

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

                <artifactId>maven-resources-plugin</artifactId>
@@ -163,8 +164,9 @@ 
        <dependency>

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

            <artifactId>alfresco-solr</artifactId>

            <classifier>config</classifier>

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

            <type>zip</type>

            <type>jar</type>

        </dependency>

    </dependencies>

archetypes/alfresco-allinone-archetype/src/test/resources/projects/it-4.2.e/archetype.properties→archetypes/alfresco-allinone-archetype/src/test/resources/projects/it/archetype.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ version=0.1-SNAPSHOT 
groupId=archetype.it

artifactId=allInOneTest

alfresco_target_groupId=org.alfresco

alfresco_target_version=4.2.e
 
alfresco_target_version=4.3.0-SNAPSHOT

archetypes/alfresco-allinone-archetype/src/test/resources/projects/it-4.2.e/goal.txt→archetypes/alfresco-allinone-archetype/src/test/resources/projects/it/goal.txt

+0 −0

File moved.

View file

archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-4.2.e/archetype.properties→archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/archetype.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ version=0.1-SNAPSHOT 
groupId=archetype.it

artifactId=allInOneTest

alfresco_target_groupId=org.alfresco

alfresco_target_version=4.2.e
 
alfresco_target_version=4.3.0-SNAPSHOT