Compare commits

...
Author SHA1 Message Date
Andrea Ligios 6a4a790786 Update README.md 2022-03-25 18:16:26 +01:00
Andrea Ligios 560d589838 Merge branch 'fix/repo-5711-repo-solr-comms' into sdk-4.4
# Conflicts:
#	archetypes/alfresco-allinone-archetype/pom.xml
#	archetypes/alfresco-platform-jar-archetype/pom.xml
#	archetypes/alfresco-share-jar-archetype/pom.xml
#	archetypes/archetypes-it/pom.xml
#	docs/working-with-generated-projects/working-with-aio.md
#	modules/alfresco-rad/pom.xml
#	plugins/alfresco-maven-plugin/pom.xml
#	pom.xml
2022-03-24 11:26:40 +01:00
Alex Mukha e42f539f82 REPO-5711 Fix repository to Search services comms
The Search Services is now using anew default "secret" communication method.
The changes also have updates to the latest Search Services version (2.0.3)
2022-03-23 16:33:03 +00:00
Andrea Ligios 80327a9968 4.4.0 2022-03-22 10:05:35 +01:00
Andrea Ligios f71c209762 Updated version in pom and documentation 2022-03-22 09:40:26 +01:00
Andrea Ligios 4349038590 Updated Docs and Tests versions 2022-03-22 09:23:24 +01:00
Andrea Ligios c8b1c35ac8 7.2.0 2022-03-21 10:35:54 +01:00
mpichura f3a64a34cf REPO-5709: adding alfresco-internal repository. 2022-03-16 10:41:04 +01:00
mpichura 3e1e9ff085 REPO-5709: removing ACS 6.2 related tests. 2022-03-16 09:52:55 +01:00
mpichura 2fda91eacc REPO-5709: adding alfresco-internal repository. 2022-03-15 16:45:59 +01:00
mpichura 0d0c0109b9 REPO-5709: adding alfresco-internal repository. 2022-03-15 16:26:30 +01:00
mpichura e822e82cd3 REPO-5709: adding alfresco-internal repository. 2022-03-15 15:11:54 +01:00
mpichura 5774deb1cd Modification for solr properties. 2022-03-15 13:36:11 +01:00
Andrea Ligios eb52d856ae 7.2.0-A30 2022-03-15 09:46:40 +01:00
Andrea Ligios aaf81191bb Fixed the version of Share in default build 2022-03-09 20:03:35 +01:00
Andrea Ligios 0a0c8d8172 Add 7.2 tests, remove 6.1 tests 2022-03-09 19:37:30 +01:00
13 changed files with 126 additions and 115 deletions
+6
View File
@@ -13,6 +13,8 @@ and [Test Driven Development (TDD)](https://en.wikipedia.org/wiki/Test-driven_de
This project is released under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) license.
If you are an Enterprise customer check the [Support](#alfresco-enterprise-customers-and-partners-support) section.
## News
- 2022-03: Alfresco SDK 4.4.0 released
@@ -33,6 +35,10 @@ If you are an Enterprise customer check the [Support](#alfresco-enterprise-custo
## User Getting Started
### Important Notice about ACS 7.2
Please refer to https://github.com/Alfresco/alfresco-sdk/issues/635 to fix the Search Services 403 problem.
### Important Notice about ACS 7.1
#### Share Version Number
@@ -11,7 +11,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.5.0-SNAPSHOT</version>
<version>4.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -21,6 +21,8 @@ services:
environment:
JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}"
JAVA_OPTS: "
-Dsolr.secureComms=secret
-Dsolr.sharedSecret=secret
-Dmessaging.broker.url=\"failover:(nio://${rootArtifactId}-activemq:61616)?timeout=3000&jms.useCompression=true\"
"
CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
@@ -43,13 +45,15 @@ services:
volumes:
- ${rootArtifactId}-db-volume:/var/lib/postgresql/data
${rootArtifactId}-ass:
image: alfresco/alfresco-search-services:1.2.0
image: alfresco/alfresco-search-services:2.0.3
environment:
SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs
SOLR_ALFRESCO_PORT: 8080
SOLR_SOLR_HOST: ${rootArtifactId}-ass
SOLR_SOLR_PORT: 8983
SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
ALFRESCO_SECURE_COMMS: "secret"
JAVA_TOOL_OPTIONS: "-Dalfresco.secureComms.secret=secret"
ports:
- "8983:8983"
volumes:
@@ -12,7 +12,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.5.0-SNAPSHOT</version>
<version>4.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -17,6 +17,8 @@ services:
environment:
JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}"
JAVA_OPTS: "
-Dsolr.secureComms=secret
-Dsolr.sharedSecret=secret
-Dmessaging.broker.url=\"failover:(nio://${rootArtifactId}-activemq:61616)?timeout=3000&jms.useCompression=true\"
"
CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
@@ -39,13 +41,15 @@ services:
volumes:
- ${rootArtifactId}-db-volume:/var/lib/postgresql/data
${rootArtifactId}-ass:
image: alfresco/alfresco-search-services:1.2.0
image: alfresco/alfresco-search-services:2.0.3
environment:
SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs
SOLR_ALFRESCO_PORT: 8080
SOLR_SOLR_HOST: ${rootArtifactId}-ass
SOLR_SOLR_PORT: 8983
SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
ALFRESCO_SECURE_COMMS: "secret"
JAVA_TOOL_OPTIONS: "-Dalfresco.secureComms.secret=secret"
ports:
- "8983:8983"
volumes:
@@ -14,7 +14,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.5.0-SNAPSHOT</version>
<version>4.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -24,7 +24,8 @@ services:
# -Ddb.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco
# -Dsolr.host=${rootArtifactId}-ass
# -Dsolr.port=8983
# -Dsolr.secureComms=none
# -Dsolr.secureComms=secret
# -Dsolr.sharedSecret=secret
# -Dsolr.base.url=/solr
# -Dindex.subsystem.name=solr6
# -Dcsrf.filter.enabled=false
@@ -52,13 +53,15 @@ services:
# volumes:
# - ${rootArtifactId}-db-volume:/var/lib/postgresql/data
# ${rootArtifactId}-ass:
# image: alfresco/alfresco-search-services:1.2.0
# image: alfresco/alfresco-search-services:2.0.3
# environment:
# SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs
# SOLR_ALFRESCO_PORT: 8080
# SOLR_SOLR_HOST: ${rootArtifactId}-ass
# SOLR_SOLR_PORT: 8983
# SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
# ALFRESCO_SECURE_COMMS: "secret"
# JAVA_TOOL_OPTIONS: "-Dalfresco.secureComms.secret=secret"
# ports:
# - "8983:8983"
# volumes:
+1 -1
View File
@@ -17,7 +17,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.5.0-SNAPSHOT</version>
<version>4.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -150,7 +150,7 @@ Then check the name of the ACS Repository container:
$ docker container ls
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
ba90b1648470 alfresco-content-services-my-platform-project:development "catalina.sh run -se…" 8 minutes ago Up 8 minutes 0.0.0.0:8080->8080/tcp, 0.0.0.0:8888->8888/tcp docker_my-platform-project-acs_1
0435b09e687c alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 8 minutes ago Up 8 minutes 0.0.0.0:8983->8983/tcp docker_my-platform-project-ass_1
0435b09e687c alfresco/alfresco-search-services:2.0.3 "/bin/sh -c '$DIST_D…" 8 minutes ago Up 8 minutes 0.0.0.0:8983->8983/tcp docker_my-platform-project-ass_1
c9145e7cdb20 postgres:9.6 "docker-entrypoint.s…" 8 minutes ago Up 8 minutes 0.0.0.0:5555->5432/tcp docker_my-platform-project-postgres_1
```
@@ -220,7 +220,7 @@ as they run in daemon mode in the background. Check this by executing the follow
$ docker container ls
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
61de829092f3 alfresco-content-services-my-platform-project:development "catalina.sh run -se…" 3 minutes ago Up 3 minutes 0.0.0.0:8080->8080/tcp, 0.0.0.0:8888->8888/tcp docker_my-platform-project-acs_1
07300ddb6714 alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 3 minutes ago Up 3 minutes 0.0.0.0:8983->8983/tcp docker_my-platform-project-ass_1
07300ddb6714 alfresco/alfresco-search-services:2.0.3 "/bin/sh -c '$DIST_D…" 3 minutes ago Up 3 minutes 0.0.0.0:8983->8983/tcp docker_my-platform-project-ass_1
09922ce36d90 postgres:9.6 "docker-entrypoint.s…" 3 minutes ago Up 3 minutes 0.0.0.0:5555->5432/tcp docker_my-platform-project-postgres_1
```
@@ -236,6 +236,3 @@ Removing docker_my-platform-project-ass_1 ... done
Removing docker_my-platform-project-postgres_1 ... done
Removing network docker_default
```
@@ -153,7 +153,7 @@ CONTAINER ID IMAGE CO
dda89172506c alfresco/alfresco-content-repository-community:6.1.2-ga "catalina.sh run -se…" 6 minutes ago Up 6 minutes 0.0.0.0:8080->8080/tcp docker_my-share-project-acs_1
2b4fa4b4a3f6 alfresco-share-my-share-project:development "/usr/local/tomcat/s…" 6 minutes ago Up 6 minutes 8000/tcp, 0.0.0.0:8180->8080/tcp, 0.0.0.0:9898->8888/tcp docker_my-share-project-share_1
ad8857f3574b postgres:9.6 "docker-entrypoint.s…" 6 minutes ago Up 6 minutes 0.0.0.0:5555->5432/tcp docker_my-share-project-postgres_1
92902d7ae624 alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 6 minutes ago Up 6 minutes 0.0.0.0:8983->8983/tcp docker_my-share-project-ass_1
92902d7ae624 alfresco/alfresco-search-services:2.0.3 "/bin/sh -c '$DIST_D…" 6 minutes ago Up 6 minutes 0.0.0.0:8983->8983/tcp docker_my-share-project-ass_1
```
Then open up a shell into the Alfresco Share container:
@@ -237,7 +237,7 @@ CONTAINER ID IMAGE CO
59f02060955a alfresco-share-my-share-project:development "/usr/local/tomcat/s…" 4 minutes ago Up 4 minutes 8000/tcp, 0.0.0.0:8180->8080/tcp, 0.0.0.0:9898->8888/tcp docker_my-share-project-share_1
dda89172506c alfresco/alfresco-content-repository-community:6.1.2-ga "catalina.sh run -se…" 16 minutes ago Up 16 minutes 0.0.0.0:8080->8080/tcp docker_my-share-project-acs_1
ad8857f3574b postgres:9.6 "docker-entrypoint.s…" 16 minutes ago Up 16 minutes 0.0.0.0:5555->5432/tcp docker_my-share-project-postgres_1
92902d7ae624 alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 16 minutes ago Up 16 minutes 0.0.0.0:8983->8983/tcp docker_my-share-project-ass_1
92902d7ae624 alfresco/alfresco-search-services:2.0.3 "/bin/sh -c '$DIST_D…" 16 minutes ago Up 16 minutes 0.0.0.0:8983->8983/tcp docker_my-share-project-ass_1
```
Now, standing in the directory where the `run.sh` script is located execute the following command to stop and remove the containers:
@@ -254,6 +254,3 @@ Removing docker_my-share-project-postgres_1 ... done
Removing docker_my-share-project-ass_1 ... done
Removing network docker_default
```
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.5.0-SNAPSHOT</version>
<version>4.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.5.0-SNAPSHOT</version>
<version>4.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
+1 -1
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.5.0-SNAPSHOT</version>
<version>4.4.0</version>
<name>Alfresco SDK</name>
<description>This aggregator Project builds all modules required for the Alfresco SDK</description>
<packaging>pom</packaging>