Commit b4da8199 authored by mindthegab's avatar mindthegab
Browse files

Merge branch 'master' of https://github.com/Alfresco/alfresco-sdk

parents 78711629 1020ea3e
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -67,6 +67,15 @@
                <maven.alfresco.includeWebResources>false</maven.alfresco.includeWebResources>
            </properties>
        </profile>
         <!-- RM profile, manually activated, automatically adds support for RM development (dependencies) and install the RM amps in the WARs -->
        <profile>
            <id>rm</id>
             <properties>
                <alfresco.rm.version>2.3.a.1</alfresco.rm.version>
                <app.rm.amps.location>${project.build.directory}/rm-amps</app.rm.amps.location>
                <app.rm.war.location>${project.build.directory}/${project.build.finalName}</app.rm.war.location>
                <app.rm.artifact>org.alfresco:${alfresco.rm.artifactId}:${alfresco.rm.version}:amp</app.rm.artifact>
             </properties>
        </profile>
    </profiles>
    
</project>
+15 −6
Original line number Diff line number Diff line
@@ -29,11 +29,20 @@
        <!-- 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 custom corporate Alfresco WAR -->
        <alfresco.client.war>alfresco</alfresco.client.war>
        <!-- Defines the target WAR groupId to run this amp, only used with the -Pamp-to-war profile
        .    | Could be org.alfresco or your corporate groupId -->
        <!-- <alfresco.client.war.groupId>org.alfresco</alfresco.client.war.groupId> -->
        <!-- Defines the target WAR version to run this amp, only used with the -Pamp-to-war profile -->
        <!-- <alfresco.client.war.version>${alfresco.version}</alfresco.client.war.version> -->
    </properties>
    
    <profiles>
        <!-- RM profile, manually activated, automatically adds support for RM development (dependencies) and install the RM amps in the WARs -->
        <profile>
            <id>rm</id>
            <dependencies>
                <dependency>
                    <groupId>${alfresco.groupId}</groupId>
                    <artifactId>alfresco-rm</artifactId>
                    <version>${alfresco.rm.version}</version>
                    <type>jar</type>
                    <classifier>classes</classifier>
                </dependency>
            </dependencies>
        </profile>
    </profiles>
</project>
+46 −0
Original line number Diff line number Diff line
@@ -149,5 +149,51 @@
                </dependency>
            </dependencies>
        </profile>
        <profile>
            <id>rm</id>
             <properties>
                <alfresco.rm.artifactId>alfresco-rm</alfresco.rm.artifactId>
            </properties>
            <build>
                <plugins>
                    <!-- Fetch Alfresco RM repo AMP -->
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-dependency-plugin</artifactId>
                        <executions>
                            <execution>
                                <id>get-rm-repo</id>
                                <phase>package</phase>
                                <goals>
                                    <goal>copy</goal>
                                </goals>
                                <configuration>
                                    <artifact>${app.rm.artifact}</artifact>
                                    <outputDirectory>${app.rm.amps.location}</outputDirectory>
                                </configuration>
                            </execution>
                        </executions>
                    </plugin>
                    <!-- The current AMP artifact is installed into the Alfresco folder using alfresco-maven-plugin -->
                    <plugin>
                        <groupId>org.alfresco.maven.plugin</groupId>
                        <artifactId>alfresco-maven-plugin</artifactId>
                        <executions>
                            <execution>
                                <id>install-rm-repo</id>
                                <phase>package</phase>
                                <goals>
                                    <goal>install</goal>
                                </goals>
                            </execution>
                        </executions>
                        <configuration>
                            <ampLocation>${app.rm.amps.location}</ampLocation>
                            <warLocation>${app.rm.war.location}</warLocation>
                        </configuration>
                    </plugin>
                </plugins>
            </build>
        </profile>
    </profiles>
</project>
+4 −11
Original line number Diff line number Diff line
@@ -227,18 +227,11 @@ alfresco.rmi.services.host=0.0.0.0
# upgrading to a new version, this can be disabled.
#db.schema.update=true


# File servers related properties
# For local builds we disable CIFS and FTP. Edit the following property to reenable them
smb.server.enabled=false
smb.server.name=CFS_SHARE_LOCAL
smb.server.domain=mycompany.com
smb.server.bindto=127.0.0.1
smb.tcpip.port=1445
netbios.session.port=1139
netbios.name.port=1137
netbios.datagram.port=1138
ftp.server.enabled=false
cifs.enabled=false

ftp.enabled=false
ftp.port=1121
ftp.authenticator=alfresco

+48 −0
Original line number Diff line number Diff line
@@ -60,4 +60,52 @@
            </plugin>
        </plugins>
    </build>
    <profiles>
        <profile>
            <id>rm</id>
             <properties>
                <alfresco.rm.artifactId>alfresco-rm-share</alfresco.rm.artifactId>
            </properties>
            <build>
                <plugins>
                    <!-- Fetch Alfresco RM repo AMP -->
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-dependency-plugin</artifactId>
                        <executions>
                            <execution>
                                <id>get-rm-share</id>
                                <phase>package</phase>
                                <goals>
                                    <goal>copy</goal>
                                </goals>
                                <configuration>
                                    <artifact>${app.rm.artifact}</artifact>
                                    <outputDirectory>${app.rm.amps.location}</outputDirectory>
                                </configuration>
                            </execution>
                        </executions>
                    </plugin>
                    <!-- The current AMP artifact is installed into the Alfresco folder using alfresco-maven-plugin -->
                    <plugin>
                        <groupId>org.alfresco.maven.plugin</groupId>
                        <artifactId>alfresco-maven-plugin</artifactId>
                        <executions>
                            <execution>
                                <id>install-rm-share</id>
                                <phase>package</phase>
                                <goals>
                                    <goal>install</goal>
                                </goals>
                            </execution>
                        </executions>
                        <configuration>
                            <ampLocation>${app.rm.amps.location}</ampLocation>
                            <warLocation>${app.rm.war.location}</warLocation>
                        </configuration>
                    </plugin>
                </plugins>
            </build>
        </profile>
    </profiles>
</project>
Loading