Skip to content

Commit

Permalink
Merge pull request #11 from axonivy-market/feature/MARP-1481-Update-c…
Browse files Browse the repository at this point in the history
…onnectors-to-v12

MARP-1481 convert to Ivy 12
  • Loading branch information
tvtphuc-axonivy authored Nov 27, 2024
2 parents 0577764 + 0fba4c9 commit d7badeb
Show file tree
Hide file tree
Showing 67 changed files with 874 additions and 720 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ on:

jobs:
build:
uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v5
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ on:

jobs:
build:
uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4
uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ on: workflow_dispatch

jobs:
build:
uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4
uses: axonivy-market/github-workflows/.github/workflows/release.yml@v5
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<groupId>com.axonivy.connector.skribble</groupId>
<name>skribble-connector</name>
<artifactId>skribble-connector-modules</artifactId>
<version>10.0.25-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
7 changes: 1 addition & 6 deletions skribble-connector-demo/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**/*.ivyClass|**/*.p.json|**/*.rddescriptor|**/*.xhtml" kind="src" path="src_hd">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src_wsproc">
<classpathentry kind="src" path="src_wsproc">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
Expand Down
102 changes: 53 additions & 49 deletions skribble-connector-demo/.project
Original file line number Diff line number Diff line change
@@ -1,49 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>skribble-connector-demo</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>skribble-connector-demo</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<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>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
12 changes: 0 additions & 12 deletions skribble-connector-demo/.settings/.jsdtscope

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.skribble.demo.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.skribble.demo
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
eclipse.preferences.version=1
6 changes: 3 additions & 3 deletions skribble-connector-demo/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
org.eclipse.jdt.core.compiler.compliance=21
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
org.eclipse.jdt.core.compiler.source=21
21 changes: 10 additions & 11 deletions skribble-connector-demo/.settings/org.eclipse.wst.common.component
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="skribble-connector-demo">
<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="context-root" value="skribble-connector-demo"/>
<property name="java-output-path" value="/skribble-connector-demo/target/classes"/>
</wb-module>
</project-modules>
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="skribble-connector-demo">
<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_wsproc"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/>
<property name="context-root" value="skribble-connector-demo"/>
<property name="java-output-path" value="/skribble-connector-demo/target/classes"/>
</wb-module>
</project-modules>
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="wst.jsdt.web"/>
<installed facet="java" version="17"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jst.jsf" version="2.1"/>
</faceted-project>
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<installed facet="java" version="21"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="jst.jsf" version="2.1"/>
</faceted-project>

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions skribble-connector-demo/config/variables.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json
# == Variables ==
#
# You can define here your project Variables.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "Data",
"namespace" : "com.axonivy.connector.skribble.demo",
"isBusinessCaseData" : false
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "SampleProcessData",
"namespace" : "com.axonivy.connector.skribble.demo",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "createSignatureRequest",
"type" : "com.skribble.api.v2.client.CreateSignatureRequest",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "signatureRequest",
"type" : "com.skribble.api.v2.client.SignatureRequest",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "nextView",
"type" : "String",
"modifiers" : [ "PERSISTENT" ]
} ]
}

This file was deleted.

4 changes: 2 additions & 2 deletions skribble-connector-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.skribble</groupId>
<artifactId>skribble-connector-demo</artifactId>
<version>10.0.25-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>10.0.14</project.build.plugin.version>
<project.build.plugin.version>12.0.0</project.build.plugin.version>
</properties>
<dependencies>
<dependency>
Expand Down
52 changes: 31 additions & 21 deletions skribble-connector-demo/processes/SampleProcess.p.json
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/12.0.0/process.json",
"id" : "191739E06E060E63",
"config" : {
"data" : "com.axonivy.connector.skribble.demo.SampleProcessData"
Expand All @@ -9,38 +9,46 @@
"type" : "RequestStart",
"name" : "signNewDocument.ivp",
"config" : {
"callSignature" : "signNewDocument",
"outLink" : "signNewDocument.ivp",
"startDescription" : "Upload your document for signing and define the requirement signers",
"startName" : "Upload document for signing",
"tags" : "demo",
"case" : { }
"signature" : "signNewDocument",
"request" : {
"name" : "Upload document for signing",
"description" : "Upload your document for signing and define the requirement signers"
}
},
"tags" : [
"demo"
],
"visual" : {
"at" : { "x" : 88, "y" : 144 }
},
"connect" : { "id" : "f14", "to" : "f9" }
"connect" : [
{ "id" : "f14", "to" : "f9" }
]
}, {
"id" : "f4",
"type" : "RequestStart",
"name" : "showOverview.ivp",
"config" : {
"callSignature" : "showOverview",
"signature" : "showOverview",
"input" : {
"map" : {
"out.nextView" : "\"overview\""
}
},
"outLink" : "showOverview.ivp",
"startDescription" : "Loads all your documents from the Skribble-platform.",
"startName" : "Show documents status",
"tags" : "demo",
"case" : { }
"request" : {
"name" : "Show documents status",
"description" : "Loads all your documents from the Skribble-platform."
}
},
"tags" : [
"demo"
],
"visual" : {
"at" : { "x" : 96, "y" : 232 }
},
"connect" : { "id" : "f7", "to" : "f6" }
"connect" : [
{ "id" : "f7", "to" : "f6" }
]
}, {
"id" : "f6",
"type" : "DialogCall",
Expand All @@ -49,8 +57,7 @@
"on Skribble"
],
"config" : {
"dialogId" : "com.axonivy.connector.skribble.demo.Overview",
"startMethod" : "start()",
"dialog" : "com.axonivy.connector.skribble.demo.Overview:start()",
"output" : {
"map" : {
"out" : "in",
Expand All @@ -61,19 +68,22 @@
"visual" : {
"at" : { "x" : 256, "y" : 232 }
},
"connect" : { "id" : "f16", "to" : "f10" }
"connect" : [
{ "id" : "f16", "to" : "f10" }
]
}, {
"id" : "f9",
"type" : "DialogCall",
"name" : "Upload document for signing",
"config" : {
"dialogId" : "com.axonivy.connector.skribble.demo.SignRequest",
"startMethod" : "start()"
"dialog" : "com.axonivy.connector.skribble.demo.SignRequest:start()"
},
"visual" : {
"at" : { "x" : 256, "y" : 144 }
},
"connect" : { "id" : "f17", "to" : "f15" }
"connect" : [
{ "id" : "f17", "to" : "f15" }
]
}, {
"id" : "f10",
"type" : "TaskEnd",
Expand Down

This file was deleted.

Loading

0 comments on commit d7badeb

Please sign in to comment.