Merge feature/REPO-3378_simplify_project into master (#32)

* REPO-3378: Integrate zip module into full-distribution module
   Rena,e full-distribution module to distribution.
   Remove zip module
   Remove zip module from the superPom

distribution/pom.xml

@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>alfresco-content-services-community-full-distribution</artifactId>
+    <artifactId>alfresco-content-services-community-distribution</artifactId>
-    <name>Alfresco Content Services Community Full Distribution zip</name>
+    <name>Alfresco Content Services Community Distribution zip</name>
     <packaging>jar</packaging>
 
     <parent>
@@ -12,18 +12,50 @@
     </parent>
 
     <dependencies>
+        <!-- WAR files -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-content-services-community-distribution</artifactId>
+            <artifactId>content-services-community</artifactId>
             <version>${project.version}</version>
-            <type>zip</type>
+            <type>war</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-repository</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-data-model</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-server-root</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-mmt</artifactId>
+        </dependency>
+        <!-- 3rd party libs -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${dependency.postgresql.version}</version>
+        </dependency>
+        <!-- Alfresco Pdf Renderer -->
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-pdf-renderer</artifactId>
+            <classifier>linux</classifier>
+            <type>tgz</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-pdf-renderer</artifactId>
+            <classifier>win64</classifier>
+            <type>tgz</type>
+        </dependency>
+        <!-- SOLR Distribution -->
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-solr4-distribution</artifactId>
@@ -35,6 +67,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- SHARE Distribution -->
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-content-services-share-distribution</artifactId>
@@ -49,7 +82,7 @@
     </dependencies>
 
     <build>
-        <finalName>${project.artifactId}-${installer.version.name}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -68,11 +101,13 @@
                         </goals>
                         <configuration>
                             <artifactItems>
+                                <!-- Extract keystore from alfresco-repository -->
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-content-services-community-distribution</artifactId>
+                                    <artifactId>alfresco-repository</artifactId>
-                                    <type>zip</type>
+                                    <includes>alfresco/keystore/**</includes>
                                 </artifactItem>
+
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-solr4-distribution</artifactId>
@@ -87,6 +122,43 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>extract-jlan-dll</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-jlan-embed</artifactId>
+                                    <classifier>windll</classifier>
+                                    <includes>*.dll</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+
+                    <!-- Copy ROOT.war -->
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-server-root</artifactId>
+                                    <type>war</type>
+                                    <outputDirectory>${project.build.outputDirectory}/web-server/webapps</outputDirectory>
+                                    <destFileName>ROOT.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
 
@@ -102,7 +174,7 @@
                         <configuration>
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>
-                                <descriptor>src/assembly/full-distribution.xml</descriptor>
+                                <descriptor>src/assembly/distribution.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>

distribution/src/assembly/distribution.xml

@@ -1,6 +1,8 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>warinstallation</id>
+    <id>distribution</id>
+
+
     <formats>
         <format>zip</format>
     </formats>
@@ -29,14 +31,37 @@
                 <include>*.dll</include>
             </includes>
         </fileSet>
-        <!-- Empty endorsed folder -->
+
+        <!-- Solr4 Distribution -->
         <fileSet>
-            <directory>src/assembly</directory>
+            <directory>${project.build.directory}/dependency/solr4</directory>
-            <outputDirectory>web-server/endorsed</outputDirectory>
+            <outputDirectory>solr4</outputDirectory>
             <excludes>
-                <exclude>*</exclude>
+                <exclude>solr4.war</exclude>
             </excludes>
         </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/dependency/solr4</directory>
+            <outputDirectory>web-server/webapps</outputDirectory>
+            <includes>
+                <include>solr4.war</include>
+            </includes>
+        </fileSet>
+
+        <!-- Share -->
+        <fileSet>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>
+            <outputDirectory/>
+            <includes>
+                <include>web-server/**</include>
+                <include>modules/**</include>
+                <include>amps/**</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
+            <outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
+        </fileSet>
     </fileSets>
 
     <dependencySets>

distribution/src/assembly/full-distribution.xml

@@ -1,56 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>distribution</id>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <fileSets>
-        <!-- Local resources: README, etc. -->
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory></outputDirectory>
-        </fileSet>
-
-        <!-- Platform Community Distribution -->
-        <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-community-distribution-${project.version}</directory>
-            <outputDirectory/>
-        </fileSet>
-
-        <!-- Solr4 Distribution -->
-        <fileSet>
-            <directory>${project.build.directory}/dependency/solr4</directory>
-            <outputDirectory>solr4</outputDirectory>
-            <excludes>
-                <exclude>solr4.war</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/dependency/solr4</directory>
-            <outputDirectory>web-server/webapps</outputDirectory>
-            <includes>
-                <include>solr4.war</include>
-            </includes>
-        </fileSet>
-
-        <!-- Share -->
-        <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>
-            <outputDirectory/>
-            <includes>
-                <include>web-server/**</include>
-		<include>modules/**</include>
-		<include>amps/**</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
-            <outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-</assembly>

distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt

@@ -107,4 +107,4 @@ To apply the ImageMagick License to your work, attach the following boilerplate
    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
    License for the specific language governing permissions and limitations
-   under the License.
+   under the License.

pom.xml

@@ -32,7 +32,6 @@
             </activation>
             <modules>
                 <module>war</module>
-                <module>zip</module>
                 <module>distribution</module>
                 <module>public-javadoc</module>
                 <module>docker-alfresco</module>

zip/pom.xml

@@ -1,155 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>alfresco-content-services-community-distribution</artifactId>
-    <name>Alfresco Content Services Community zip (WAR Installation)</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>org.alfresco</groupId>
-        <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.5-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <dependencies>
-        <!-- WAR files -->
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community</artifactId>
-            <version>${project.version}</version>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-repository</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-data-model</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-server-root</artifactId>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-mmt</artifactId>
-        </dependency>
-        <!-- 3rd party libs -->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>${dependency.postgresql.version}</version>
-        </dependency>
-        <!-- Alfresco Pdf Renderer -->
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-pdf-renderer</artifactId>
-            <classifier>linux</classifier>
-            <type>tgz</type>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-pdf-renderer</artifactId>
-            <classifier>win64</classifier>
-            <type>tgz</type>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}-${project.version}</finalName>
-        <!-- Filtering is required to make maven substitute variables in resources -->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <!-- Extract keystore from alfresco-repository -->
-                    <execution>
-                        <id>extract-keystore</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-repository</artifactId>
-                                    <includes>alfresco/keystore/**</includes>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-
-                    <!-- Extract JLAN DLLs -->
-                    <execution>
-                        <id>extract-jlan-dll</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-jlan-embed</artifactId>
-                                    <classifier>windll</classifier>
-                                    <includes>*.dll</includes>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-
-                    <!-- Copy ROOT.war -->
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-server-root</artifactId>
-                                    <type>war</type>
-                                    <outputDirectory>${project.build.outputDirectory}/web-server/webapps</outputDirectory>
-                                    <destFileName>ROOT.war</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptors>
-                        <descriptor>src/assemblies/distribution.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-</project>

zip/src/main/resources/README.txt

@@ -1,6 +0,0 @@
-Alfresco Content Services Community ${project.version}
-======================
-
-For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm.
-
-