Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
yecl
wecube
Commits
1e5e7709
Commit
1e5e7709
authored
3 years ago
by
gavin2lee
Browse files
Options
Download
Email Patches
Plain Diff
#2289 add fileset to s3 element
parent
ed82e760
master
2289_workflow_interf_enhance
2313_add_timestamp_to_node_log
2317_fix_bug_of_faulted_proc_inst
2321_fix_itsm_reported_defects
2321_fix_itsm_reported_issues
dev
dev_fix
dev_test
flow_exec_bug
remove_node_sass
v3.2.2
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
platform-core/src/main/java/com/webank/wecube/platform/core/service/plugin/xml/register/FileSetType.java
+27
-0
...latform/core/service/plugin/xml/register/FileSetType.java
platform-core/src/main/java/com/webank/wecube/platform/core/service/plugin/xml/register/FileType.java
+38
-0
...e/platform/core/service/plugin/xml/register/FileType.java
platform-core/src/main/java/com/webank/wecube/platform/core/service/plugin/xml/register/S3Type.java
+14
-28
...ube/platform/core/service/plugin/xml/register/S3Type.java
platform-core/src/main/resources/plugin/plugin-config-v2.xsd
+14
-2
platform-core/src/main/resources/plugin/plugin-config-v2.xsd
platform-core/src/test/resources/plugin/register-artifacts.xml
+7
-2
...orm-core/src/test/resources/plugin/register-artifacts.xml
with
100 additions
and
32 deletions
+100
-32
platform-core/src/main/java/com/webank/wecube/platform/core/service/plugin/xml/register/FileSetType.java
0 → 100644
+
27
-
0
View file @
1e5e7709
package
com.webank.wecube.platform.core.service.plugin.xml.register
;
import
java.util.ArrayList
;
import
java.util.List
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlType
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
@XmlType
(
name
=
"fileSetType"
,
propOrder
=
{
"file"
})
public
class
FileSetType
{
protected
List
<
FileType
>
file
;
public
List
<
FileType
>
getFile
()
{
if
(
file
==
null
)
{
file
=
new
ArrayList
<
FileType
>();
}
return
this
.
file
;
}
}
This diff is collapsed.
Click to expand it.
platform-core/src/main/java/com/webank/wecube/platform/core/service/plugin/xml/register/FileType.java
0 → 100644
+
38
-
0
View file @
1e5e7709
package
com.webank.wecube.platform.core.service.plugin.xml.register
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlAttribute
;
import
javax.xml.bind.annotation.XmlType
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
@XmlType
(
name
=
"fileType"
,
propOrder
=
{
"source"
,
"toFile"
})
public
class
FileType
{
@XmlAttribute
(
name
=
"source"
,
required
=
true
)
protected
String
source
;
@XmlAttribute
(
name
=
"toFile"
,
required
=
true
)
protected
String
toFile
;
public
String
getSource
()
{
return
source
;
}
public
void
setSource
(
String
source
)
{
this
.
source
=
source
;
}
public
String
getToFile
()
{
return
toFile
;
}
public
void
setToFile
(
String
toFile
)
{
this
.
toFile
=
toFile
;
}
}
This diff is collapsed.
Click to expand it.
platform-core/src/main/java/com/webank/wecube/platform/core/service/plugin/xml/register/S3Type.java
+
14
-
28
View file @
1e5e7709
...
...
@@ -11,8 +11,8 @@ package com.webank.wecube.platform.core.service.plugin.xml.register;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlAttribute
;
import
javax.xml.bind.annotation.XmlElement
;
import
javax.xml.bind.annotation.XmlType
;
import
javax.xml.bind.annotation.XmlValue
;
/**
...
...
@@ -34,38 +34,15 @@ import javax.xml.bind.annotation.XmlValue;
*/
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
@XmlType
(
name
=
"s3Type"
,
propOrder
=
{
"
value
"
"
bucketName"
,
"fileSet
"
})
public
class
S3Type
{
@XmlValue
protected
String
value
;
@XmlAttribute
(
name
=
"bucketName"
,
required
=
true
)
protected
String
bucketName
;
/**
* Gets the value of the value property.
*
* @return
* possible object is
* {@link String }
*
*/
public
String
getValue
()
{
return
value
;
}
/**
* Sets the value of the value property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public
void
setValue
(
String
value
)
{
this
.
value
=
value
;
}
@XmlElement
(
name
=
"fileSet"
,
required
=
false
)
protected
FileSetType
fileSet
;
/**
* Gets the value of the bucketName property.
...
...
@@ -91,4 +68,13 @@ public class S3Type {
this
.
bucketName
=
value
;
}
public
FileSetType
getFileSet
()
{
return
fileSet
;
}
public
void
setFileSet
(
FileSetType
fileSet
)
{
this
.
fileSet
=
fileSet
;
}
}
This diff is collapsed.
Click to expand it.
platform-core/src/main/resources/plugin/plugin-config-v2.xsd
+
14
-
2
View file @
1e5e7709
...
...
@@ -110,13 +110,25 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:complexType
name=
"
s3
Type"
>
<xs:complexType
name=
"
file
Type"
>
<xs:simpleContent>
<xs:extension
base=
"xs:string"
>
<xs:attribute
type=
"xs:string"
name=
"bucketName"
use=
"required"
/>
<xs:attribute
type=
"xs:string"
name=
"source"
use=
"required"
/>
<xs:attribute
type=
"xs:string"
name=
"toFile"
use=
"required"
/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:complexType
name=
"fileSetType"
>
<xs:sequence>
<xs:element
type=
"fileType"
name=
"file"
minOccurs=
"0"
maxOccurs=
"unbounded"
/>
</xs:sequence>
</xs:complexType>
<xs:complexType
name=
"s3Type"
>
<xs:sequence>
<xs:element
type=
"fileSetType"
name=
"fileSet"
minOccurs=
"0"
maxOccurs=
"unbounded"
/>
</xs:sequence>
<xs:attribute
type=
"xs:string"
name=
"bucketName"
use=
"required"
/>
</xs:complexType>
<xs:complexType
name=
"resourceDependenciesType"
>
<xs:sequence>
<xs:element
type=
"dockerType"
name=
"docker"
maxOccurs=
"unbounded"
/>
...
...
This diff is collapsed.
Click to expand it.
platform-core/src/test/resources/plugin/register-artifacts.xml
+
7
-
2
View file @
1e5e7709
<?xml version="1.0" encoding="UTF-8"?>
<package
name=
"artifacts"
version=
"
{{VERSION}}
"
<package
name=
"artifacts"
version=
"
v1.5.5.2
"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation=
"plugin-config-v2.xsd"
>
...
...
@@ -69,7 +69,12 @@
ARTIFACTS_DIFF_CONF_EXTENSION={{ARTIFACTS_DIFF_CONF_EXTENSION}},ARTIFACTS_VARIABLE_EXPRESSION={{ARTIFACTS_VARIABLE_EXPRESSION}},
WECUBE_GATEWAY_URL={{GATEWAY_URL}},WECUBE_JWT_SIGNING_KEY={{JWT_SIGNING_KEY}},ARTIFACTS_NEXUS_SORT_AS_STRING={{NEXUS_SORT_AS_STRING}},
ARTIFACTS_LOCAL_NEXUS_CONNECTOR_PORT=5000,ARTIFACTS_NEXUS_CONNECTOR_PORT={{NEXUS_CONNECTOR_PORT}}"
/>
<s3
bucketName=
"wecube-artifacts"
/>
<s3
bucketName=
"wecube-artifacts"
>
<fileSet>
<file
source=
"a.conf"
toFile=
"a.conf"
/>
<file
source=
"b.conf"
toFile=
"b.conf"
/>
</fileSet>
</s3>
</resourceDependencies>
<!-- 7.插件列表 - 描述插件包中单个插件的输入和输出 -->
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help