Commit a0c8e3e8 authored by mindthegab's avatar mindthegab
Browse files

Fixes issue #164, merged pull request #216 

- -Penterprise is now added and SDK will run against latest alfresco
enterprise
- currently Alfresco INTERNAL only (no Enterprise SNAPSHOTs published)
- tested with latest Enterprise HEAD and also aligned artifactId to new
naming (alfresco-enterprise|share-enterprise)
- updated docs


Merge remote-tracking branch 'origin/enterprise-profile'

Conflicts:
	archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
	archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
	archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml
	poms/alfresco-sdk-parent/pom.xml
	poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm
	src/site/apt/prerequisites.apt.vm
parents c75a137a 17350c43

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

+3 −3
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ 
            | Defines the groupId for the Alfresco Artifacts to work against. As of 4.2 the only allowed value is: org.alfresco

            | NOTE: See http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html for details

        -->

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

        <!-- <alfresco.groupId>${alfresco_target_groupId}</alfresco.groupId> -->

        <!-- Defines the Alfresco version to work against.

             Community versions are typically identified by major.minor.character (4.2.a) while Enterprise versions are identified by major.minor.digit (4.2.0) 

        -->

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

        <!--<alfresco.version>${alfresco_target_version}</alfresco.version>-->

        <!-- This control the root logging level for all apps -->

        <app.log.root.level>WARN</app.log.root.level>

        <!-- This controls the default data location for dir.root -->

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

+5 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    <dependencies>

        <dependency>

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

            <artifactId>alfresco</artifactId>

            <artifactId>${alfresco.repo.artifactId}</artifactId>

            <type>war</type>

        </dependency>

        <!-- Demonstrating the dependency / installation of the repo AMP developed in the 'repo-amp' module -->
@@ -63,7 +63,7 @@ 
                        <!-- The Alfresco WAR -->

                        <overlay>

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

                            <artifactId>alfresco</artifactId>

                            <artifactId>${alfresco.repo.artifactId}</artifactId>

                            <type>war</type>

                            <!-- To allow inclusion of META-INF -->

                            <excludes/>
@@ -140,15 +140,16 @@ 
                    </plugin>

                </plugins>

            </build>

            <!-- Needed to fix http://code.google.com/p/maven-alfresco-archetypes/issues/detail?id=150 -->

            <!-- Needed to fix http://code.google.com/p/maven-alfresco-archetypes/issues/detail?id=150. 

                 Only for community, scope controlled by dependencyManagement via sdk-parent -->

            <dependencies>

                <dependency>

                    <groupId>org.slf4j</groupId>

                    <artifactId>jcl-over-slf4j</artifactId>

                    <version>1.5.11</version>

                </dependency>

            </dependencies>

        </profile>

        <!-- Installs the needed runtime artifact for an RM (Records Management) project -->

        <profile>

            <id>rm</id>

             <properties>

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

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
    <dependencies>

        <dependency>

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

            <artifactId>share</artifactId>

            <artifactId>${alfresco.share.artifactId}</artifactId>

            <type>war</type>

        </dependency>

        <!-- Demonstrating the dependency / installation of the share AMP developed in the 'share-amp' module -->
@@ -44,7 +44,7 @@ 
                        <!-- The Share WAR -->

                        <overlay>

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

                            <artifactId>share</artifactId>

                            <artifactId>${alfresco.share.artifactId}</artifactId>

                            <type>war</type>

                            <!-- To allow inclusion of META-INF -->

                            <excludes/>
@@ -61,6 +61,7 @@ 
        </plugins>

    </build>

    <profiles>

    	<!-- Installs the needed runtime component for an Alfresco RM (Records Management) project -->

        <profile>

            <id>rm</id>

             <properties>

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

+0 −9
Original line number Diff line number Diff line
@@ -12,15 +12,6 @@ 
    <requiredProperty key="alfresco_target_version">

      <defaultValue>5.0.a</defaultValue>

    </requiredProperty>

    <requiredProperty key="alfresco_target_amp_client_war">

      <defaultValue>alfresco</defaultValue>

    </requiredProperty>

    <requiredProperty key="alfresco_target_amp_client_war_groupId">

      <defaultValue>org.alfresco</defaultValue>

    </requiredProperty>

    <requiredProperty key="alfresco_target_amp_client_war_version">

      <defaultValue>5.0.a</defaultValue>

    </requiredProperty>

    <requiredProperty key="package">

      <defaultValue>(not used)</defaultValue>

    </requiredProperty>

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

+13 −9
Original line number Diff line number Diff line
@@ -25,22 +25,26 @@ 
            | Defines the groupId for the Alfresco Artifacts to work against. As of 4.2 the only allowed value is: org.alfresco

            | NOTE: See http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html for details

        -->

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

        <!-- <alfresco.groupId>${alfresco_target_groupId}</alfresco.groupId> -->

        <!-- Defines the Alfresco version to work against.

             Community versions are typically identified by major.minor.character (4.2.a) while Enterprise versions are identified by major.minor.digit (4.2.0)  -->

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

        <!-- <alfresco.version>${alfresco_target_version}</alfresco.version>-->

        <app.log.root.level>WARN</app.log.root.level>

        <alfresco.data.location>alf_data_dev</alfresco.data.location>

        <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war switch

        .    | Allowed values: alfresco | share. Defaults to a repository AMP, but could point to your foundation WAR -->

        <alfresco.client.war>${alfresco_target_amp_client_war}</alfresco.client.war>

        <!-- This controls which properties will be picked in src/test/properties for embedded run -->

        <env>local</env>

        <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war profile

             | Defaults to a vanilla repository AMP, but could point to your foundation / aggregator WAR 

        .    | Allowed values for Community: alfresco | share

             | Allowed values for Enterprise: alfresco-enterprise | share-enterprise

        <!-- <alfresco.client.war>${alfresco.repo.artifactId}</alfresco.client.war> -->

        

        <!-- Defines the target WAR groupId to run this amp, only used with the -Pamp-to-war switch

        .    | Could be org.alfresco or your corporate groupId -->

        <alfresco.client.war.groupId>${alfresco_target_amp_client_war_groupId}</alfresco.client.war.groupId>

        <!-- <alfresco.client.war.groupId>${alfresco.groupId}</alfresco.client.war.groupId> -->

        

        <!-- Defines the target WAR version to run this amp, only used with the -Pamp-to-war switch -->

        <alfresco.client.war.version>${alfresco_target_amp_client_war_version}</alfresco.client.war.version>

        <!-- This controls which properties will be picked in src/test/properties for embedded run -->

        <env>local</env>

        <!-- <alfresco.client.war.version>${alfresco.version}</alfresco.client.war.version>-->

    </properties>



    <!-- Here we realize the connection with the Alfresco selected platform