inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6393_Apply_RM_Enterprise_repo

Browse Source
This commit is contained in:
Rodica Sutu
2018-06-22 14:39:58 +03:00
parent d79b798fb6 f9f0069034
commit 3bbff09d83
8 changed files with 201 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pom.xml
View File

@@ -204,6 +204,13 @@
<goal>build</goal>
</goals>
</execution>
<execution>
<id>build-image-verify</id>
<phase>verify</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
@@ -235,7 +242,7 @@
<executions>
<execution>
<id>build-push-image</id>
<phase>install</phase>
<phase>deploy</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
@@ -279,7 +286,7 @@
<executions>
<execution>
<id>build-push-image</id>
<phase>install</phase>
<phase>deploy</phase>
<goals>
<goal>build</goal>
<goal>push</goal>

1
rm-community/rm-community-repo/.maven-dockerignore Normal file
View File

@@ -0,0 +1 @@
target/docker/**

6
rm-community/rm-community-repo/Dockerfile Normal file
View File

@@ -0,0 +1,6 @@
FROM alfresco/alfresco-content-repository-community:6.0.7-ga
COPY target/alfresco-rm-community-repo-*.amp /usr/local/tomcat/amps/
RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
/usr/local/tomcat/amps/alfresco-rm-community-repo-*.amp /usr/local/tomcat/webapps/alfresco -nobackup

59
rm-community/rm-community-repo/docker-compose.yml Normal file
View File

@@ -0,0 +1,59 @@
version: "3"
# For remote debug we need the CATALINA_OPTS and to expose port 8000.
services:
alfresco:
# acs repo community image with ags repo community amp applied
image: alfresco/ags-repo-community:latest
environment:
CATALINA_OPTS : "
-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n
"
JAVA_OPTS : "
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
-Ddb.password=alfresco
-Ddb.url=jdbc:postgresql://postgres:5432/alfresco
-Dsolr.host=solr6
-Dsolr.port=8983
-Dsolr.secureComms=none
-Dsolr.base.url=/solr
-Dindex.subsystem.name=solr6
-Dalfresco.restApi.basicAuthScheme=true
-Dimap.server.enabled=true
-Dftp.enabled=true
-Dftp.dataPortFrom=30000
-Dftp.dataPortTo=30099
-Dcifs.enabled=true
"
ports:
- 8080:8080
- 8000:8000
- 445:445
- 143:143
- "21:21"
- "30000-30099:30000-30099"
postgres:
image: library/postgres:10.1
environment:
- POSTGRES_PASSWORD=alfresco
- POSTGRES_USER=alfresco
- POSTGRES_DB=alfresco
ports:
- 5432:5432
solr6:
image: alfresco/alfresco-search-services:1.1.1
environment:
#Solr needs to know how to register itself with Alfresco
- SOLR_ALFRESCO_HOST=alfresco
- SOLR_ALFRESCO_PORT=8080
#Alfresco needs to know how to call solr
- SOLR_SOLR_HOST=solr6
- SOLR_SOLR_PORT=8983
#Create the default alfresco and archive cores
- SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
ports:
- 8083:8983 #Browser port

48
rm-community/rm-community-repo/pom.xml
View File

@@ -32,6 +32,8 @@
<dependency.alfresco-repository.version>6.51</dependency.alfresco-repository.version>
<dependency.alfresco-remote-api.version>6.35</dependency.alfresco-remote-api.version>
<alfresco.alfresco-share-services.version>6.0.0-rc5</alfresco.alfresco-share-services.version>
<image.name>alfresco/ags-repo-community</image.name>
</properties>
<build>
@@ -755,7 +757,6 @@
</plugins>
</build>
</profile>
<profile>
<id>wipeDB</id>
<build>
@@ -808,5 +809,50 @@
</plugins>
</build>
</profile>
<!--Docker profiles used to build specific docker images for community repo, defined in parent pom -->
<profile>
<id>buildDockerImage</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>internal</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>master</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

4
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/util/CustomDateTimeSerializer.java
View File

@@ -33,8 +33,8 @@ import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
/**
* Custom Date Time serializer for formatting org.joda.time.DateTime
@@ -45,7 +45,7 @@ import org.joda.time.format.DateTimeFormatter;
public class CustomDateTimeSerializer extends StdSerializer<DateTime>
{
/** Date time format */
private final static DateTimeFormatter DATE_TIME_FORMAT = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
private final static DateTimeFormatter DATE_TIME_FORMAT = ISODateTimeFormat.dateTime();
public CustomDateTimeSerializer()
{

74
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/util/CustomLocalDateDeserializer.java Normal file
View File

@@ -0,0 +1,74 @@
/*
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2018 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
* -
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* -
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
* -
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.rm.rest.api.util;
import java.io.IOException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import org.joda.time.LocalDate;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
/**
* Custom Local Date deserializer converting a string to org.joda.time.LocalDate when the time is optional;
*
* @author Rodica Sutu
* @since 3.0
*/
public class CustomLocalDateDeserializer extends StdDeserializer<LocalDate>
{
/** Date time format with time optional */
private final static DateTimeFormatter LOCAL_DATE_OPTIONAL_TIME_PARSER = ISODateTimeFormat.localDateOptionalTimeParser();
public CustomLocalDateDeserializer()
{
super(LocalDate.class);
}
/**
* Custom deserialize method to convert string to the org.joda.time.LocalDate type with LOCAL_DATE_OPTIONAL_TIME_PARSER
*
* @param jp local date value
* @param ctxt
* @throws IOException
*/
@Override
public LocalDate deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException
{
String str = jp.getText().trim();
if (str.length() == 0)
{
return null;
}
return LOCAL_DATE_OPTIONAL_TIME_PARSER.parseLocalDate(str);
}
}

6
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/util/CustomLocalDateSerializer.java
View File

@@ -33,8 +33,8 @@ import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import org.joda.time.LocalDate;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
/**
* Custom Local Date serializer for formatting org.joda.time.LocalDate
@@ -44,8 +44,8 @@ import org.joda.time.format.DateTimeFormatter;
*/
public class CustomLocalDateSerializer extends StdSerializer<LocalDate>
{
/** Local date format */
private final static DateTimeFormatter DATE_FORMAT = DateTimeFormat.forPattern("yyyy-MM-dd");
/** Local date format yyyy-MM-dd*/
private final static DateTimeFormatter DATE_FORMAT = ISODateTimeFormat.date();
public CustomLocalDateSerializer()
{