Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/marp 826 alfresco ecm build release for this connector for designer 11.3 #43

Merged
merged 10 commits into from
Aug 19, 2024
+281 −334
Merged

Feature/marp 826 alfresco ecm build release for this connector for designer 11.3 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d42eb76
Convert connector to work with Designer 11.3.1
vhhoang-axonivy Aug 12, 2024
883f9f1
Convert connector to work with Designer 11.3
vhhoang-axonivy Aug 13, 2024
3a9dd18
Try to resolve build with maven error
vhhoang-axonivy Aug 13, 2024
b18b971
Try to resolve build with maven error
vhhoang-axonivy Aug 13, 2024
d50e6af
Try to resolve build with maven error
vhhoang-axonivy Aug 13, 2024
4f31ab4
Try changing to 11.4.0
vhhoang-axonivy Aug 13, 2024
c352ee4
Convert Alfresco connector to work with Designer 11.3.1
vhhoang-axonivy Aug 13, 2024
a81cb3e
Try deleting REST Client Url
vhhoang-axonivy Aug 13, 2024
5f7a406
Clean up
vhhoang-axonivy Aug 15, 2024
3e04a5b
Revert to original format
vhhoang-axonivy Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions alfresco-connector-demo/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**/*.ivyClass|**/*.mod|**/*.rddescriptor|**/*.xhtml" kind="src" path="src_hd">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>


<classpathentry kind="src" path="src_wsproc">
<attributes>
<attribute name="optional" value="true"/>
Expand Down
5 changes: 5 additions & 0 deletions alfresco-connector-demo/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
<arguments>
Expand Down
5 changes: 3 additions & 2 deletions alfresco-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.alfresco.connector.demo.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.alfresco.connector.demo
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:useProjectSettings=true
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
eclipse.preferences.version=1
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000
eclipse.preferences.version=1
58 changes: 1 addition & 57 deletions alfresco-connector-demo/.settings/org.eclipse.wst.common.component
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,66 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">






<wb-module deploy-name="alfresco-connector-demo0">






<wb-resource deploy-path="/" source-path="/webContent" tag="defaultRootSource"/>






<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>






<wb-resource deploy-path="/WEB-INF/classes" source-path="/src_hd"/>






<wb-resource deploy-path="/WEB-INF/classes" source-path="/src_wsproc"/>






<wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/>






<property name="java-output-path" value="/alfresco-connector-demo0/classes"/>

<property name="context-root" value="alfresco-connector-demo0"/>






</wb-module>






</project-modules>
</project-modules>
25 changes: 13 additions & 12 deletions alfresco-connector-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
<?xml version="1.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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.alfresco</groupId>
<artifactId>alfresco-connector-demo</artifactId>
<version>10.0.7-SNAPSHOT</version>
<version>11.3.1-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>10.0.16</project.build.plugin.version>
<project.build.plugin.version>11.3.0</project.build.plugin.version>
</properties>
<pluginRepositories>
<pluginRepository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencies>
<dependency>
<groupId>com.axonivy.connector.alfresco</groupId>
Expand All @@ -25,6 +17,15 @@
<type>iar</type>
</dependency>
</dependencies>
<pluginRepositories>
<pluginRepository>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
Expand Down
26 changes: 16 additions & 10 deletions alfresco-connector-demo/processes/AlfrescoDemo/ecm.p.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format" : "10.0.0",
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"id" : "177A605C29E3AA51",
"config" : {
"data" : "com.alfresco.connector.Data"
Expand All @@ -9,16 +9,21 @@
"type" : "RequestStart",
"name" : "start.ivp",
"config" : {
"callSignature" : "start",
"outLink" : "start.ivp",
"startName" : "Upload Documents to Alfresco ECM",
"tags" : "demo"
"signature" : "start",
"request" : {
"name" : "Upload Documents to Alfresco ECM"
}
},
"tags" : [
"demo"
],
"visual" : {
"at" : { "x" : 96, "y" : 128 },
"labelOffset" : { "x" : 12, "y" : 37 }
},
"connect" : { "id" : "f4", "to" : "f3" }
"connect" : [
{ "id" : "f4", "to" : "f3" }
]
}, {
"id" : "f1",
"type" : "TaskEnd",
Expand All @@ -33,14 +38,15 @@
"to Alfresco ECM"
],
"config" : {
"dialogId" : "com.alfresco.connector.demo.ecm",
"startMethod" : "start()"
"dialog" : "com.alfresco.connector.demo.ecm:start()"
},
"visual" : {
"at" : { "x" : 224, "y" : 128 },
"size" : { "width" : 128, "height" : 60 }
"size" : { "width" : 128 }
},
"connect" : { "id" : "f2", "to" : "f1" }
"connect" : [
{ "id" : "f2", "to" : "f1" }
]
}, {
"id" : "f5",
"type" : "ProcessAnnotation",
Expand Down
68 changes: 39 additions & 29 deletions alfresco-connector-demo/processes/AlfrescoDemo/readDocuments.p.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"format" : "10.0.0",
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"id" : "17811D7894B7C803",
"kind" : "CALLABLE_SUB",
"config" : {
Expand All @@ -10,19 +10,19 @@
"type" : "CallSubStart",
"name" : "call(folderid)",
"config" : {
"callSignature" : "call",
"signature" : "call",
"input" : {
"params" : [
{ "name" : "folderid", "type" : "String" }
{ "name" : "folderid", "type" : "String", "desc" : "" }
],
"map" : {
"out.folderid" : "param.folderid"
}
},
"result" : {
"params" : [
{ "name" : "connectionError", "type" : "String" },
{ "name" : "documents", "type" : "List<com.alfresco.api.explorer.NodeChildAssociationEntry>" }
{ "name" : "connectionError", "type" : "String", "desc" : "" },
{ "name" : "documents", "type" : "List<com.alfresco.api.explorer.NodeChildAssociationEntry>", "desc" : "" }
],
"map" : {
"result.connectionError" : "in.connectionError",
Expand All @@ -34,7 +34,9 @@
"at" : { "x" : 96, "y" : 112 },
"labelOffset" : { "x" : 18, "y" : 37 }
},
"connect" : { "id" : "f3", "to" : "f6" }
"connect" : [
{ "id" : "f3", "to" : "f6" }
]
}, {
"id" : "f1",
"type" : "CallSubEnd",
Expand All @@ -49,31 +51,35 @@
"of Folder"
],
"config" : {
"path" : "/nodes/{nodeId}/children",
"clientId" : "f0cc7209-7cdd-4a5d-9dde-72257a4bf963",
"clientErrorCode" : "ivy:error:rest:client",
"queryParams" : {
"skipCount" : "",
"maxItems" : "",
"orderBy" : "",
"where" : "",
"include" : "",
"relativePath" : "",
"includeSource" : "",
"fields" : ""
},
"statusErrorCode" : "ivy:error:rest:client",
"responseMapping" : {
"out.documents" : "result.list.entries"
},
"templateParams" : {
"nodeId" : "in.folderid"
"target" : {
"clientId" : "f0cc7209-7cdd-4a5d-9dde-72257a4bf963",
"path" : "/nodes/{nodeId}/children",
"templateParams" : {
"nodeId" : "in.folderid"
},
"queryParams" : {
"skipCount" : "",
"maxItems" : "",
"orderBy" : "",
"where" : "",
"include" : "",
"relativePath" : "",
"includeSource" : "",
"fields" : ""
}
},
"resultType" : "com.alfresco.api.explorer.NodeChildAssociationPaging"
"response" : {
"entity" : {
"type" : "com.alfresco.api.explorer.NodeChildAssociationPaging",
"map" : {
"out.documents" : "result.list.entries"
}
}
}
},
"visual" : {
"at" : { "x" : 232, "y" : 112 },
"size" : { "width" : 128, "height" : 60 },
"size" : { "width" : 128 },
"color" : "NodeStyle4"
},
"boundaries" : [ {
Expand All @@ -92,9 +98,13 @@
"at" : { "x" : 280, "y" : 144 },
"labelOffset" : { "x" : 0, "y" : 15 }
},
"connect" : { "id" : "f4", "to" : "f1", "via" : [ { "x" : 384, "y" : 144 } ] }
"connect" : [
{ "id" : "f4", "to" : "f1", "via" : [ { "x" : 384, "y" : 144 } ] }
]
} ],
"connect" : { "id" : "f2", "to" : "f1" }
"connect" : [
{ "id" : "f2", "to" : "f1" }
]
}, {
"id" : "f5",
"type" : "ProcessAnnotation",
Expand Down
8 changes: 4 additions & 4 deletions alfresco-connector-demo/src_hd/com/alfresco/connector/demo/ecm/ecm.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</p:panel>
<p:panel id="datapanel"
rendered="#{data.connectionError == null or data.connectionError.length() == 0}">
<p:repeat var="folder" value="#{data.folder}">
<ui:repeat var="folder" value="#{data.folder}">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it changed by you or Ivy team?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is changed by Ivy.

<p:commandLink actionListener="#{logic.openFolder(folder)}"
update=":form:datapanel">
<i class="si si-folder-empty" />
Expand All @@ -44,9 +44,9 @@
<p:spacer width="10"></p:spacer>
</p:commandLink>
<p:spacer />
</p:repeat>
</ui:repeat>

<p:repeat value="#{data.documents}" var="node">
<ui:repeat value="#{data.documents}" var="node">
<div style="padding-left: 20px; padding-top: 10px;">
<i class="si si-common-file-text"></i>
<h:outputText value=" #{node.entry.name}" />
Expand All @@ -57,7 +57,7 @@
value=" by: #{node.entry.createdByUser.displayName}" />
</div>
</div>
</p:repeat>
</ui:repeat>
<br />
<p:outputLabel rendered="#{data.documents.size() eq 0}">
<br />No enties found</p:outputLabel>
Expand Down
Loading
Loading