Skip to content
This repository was archived by the owner on Nov 23, 2023. It is now read-only.

Commit d3fd6bb

Browse files
sverhoevensverhoeven
committed
Make vendor an optional var
1 parent 3c65a4c commit d3fd6bb

File tree

8 files changed

+24
-27
lines changed

8 files changed

+24
-27
lines changed

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,8 @@ The following steps are needed to get a ready to use project.
8484
12. Make skeleton git aware, by running `git init`.
8585
13. Fill in all placeholders (`[Enter ... here.]`) in
8686

87-
* plugin/META-INF/MANIFEST.MF
88-
* plugin/src/**/*.xml
87+
* plugin/src/java/**/*.xml
8988
* feature/feature.xml
90-
* p2/category.xml
9189

9290
14. Commit all changes and push to GitHub
9391
15. Optionally, setup Continuous Integration as described in the project README.md file.

‎src/main/resources/META-INF/maven/archetype-metadata.xml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<archetype-descriptor
3-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
4-
name="knime.node.archetype"
5-
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
2+
<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="knime.node.archetype"
3+
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
64
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
75
<requiredProperties>
86
<requiredProperty key="tycho_version">
@@ -19,6 +17,9 @@
1917
<requiredProperty key="node" />
2018
<requiredProperty key="python_script_filename" />
2119
<requiredProperty key="required_python_package" />
20+
<requiredProperty key="vendor">
21+
<defaultValue>Netherlands eScience Center</defaultValue>
22+
</requiredProperty>
2223
</requiredProperties>
2324
<fileSets>
2425
<fileSet filtered="true" encoding="UTF-8">
@@ -39,8 +40,7 @@
3940
</fileSet>
4041
</fileSets>
4142
<modules>
42-
<module id="${rootArtifactId}.plugin" dir="plugin"
43-
name="${rootArtifactId}.plugin">
43+
<module id="${rootArtifactId}.plugin" dir="plugin" name="${rootArtifactId}.plugin">
4444
<fileSets>
4545
<fileSet filtered="true" packaged="true" encoding="UTF-8">
4646
<directory>src/java</directory>
@@ -71,8 +71,7 @@
7171
</fileSet>
7272
</fileSets>
7373
</module>
74-
<module id="${rootArtifactId}.feature" dir="feature"
75-
name="${rootArtifactId}.feature">
74+
<module id="${rootArtifactId}.feature" dir="feature" name="${rootArtifactId}.feature">
7675
<fileSets>
7776
<fileSet filtered="true" encoding="UTF-8">
7877
<directory></directory>
@@ -93,8 +92,7 @@
9392
</fileSet>
9493
</fileSets>
9594
</module>
96-
<module id="${rootArtifactId}.tests" dir="tests"
97-
name="${rootArtifactId}.tests">
95+
<module id="${rootArtifactId}.tests" dir="tests" name="${rootArtifactId}.tests">
9896
<fileSets>
9997
<fileSet filtered="true" packaged="true" encoding="UTF-8">
10098
<directory>src/java</directory>
@@ -132,4 +130,4 @@
132130
</fileSets>
133131
</module>
134132
</modules>
135-
</archetype-descriptor>
133+
</archetype-descriptor>

‎src/main/resources/archetype-resources/feature/feature.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
id="${parentArtifactId}.feature"
88
label="${parentArtifactId} Feature"
99
version="${qversion}"
10-
provider-name="[Enter provider name here.]">
10+
provider-name="${vendor}">
1111

1212
<description url="https://github.com/${github_organization}/${github_repository}">
1313
[Enter Feature Description here.]

‎src/main/resources/archetype-resources/p2/category.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<?xml version="1.0" encoding="UTF-8"?>
66
<site>
77
<feature url="features/${parentArtifactId}.feature-${qversion}.jar" id="${parentArtifactId}.feature" version="${qversion}">
8-
<category name="${parentArtifactId}"/>
8+
<category name="nl.esciencecenter.3D-e-Chem"/>
99
</feature>
10-
<category-def name="${parentArtifactId}" label="[Enter Category Label here.]">
10+
<category-def name="nl.esciencecenter.3D-e-Chem" label="KNIME 3D-e-Chem Contributions">
1111
<description>
12-
[Enter Category Description here.]
12+
3D-e-Chem: Collection KNIME nodes &amp; Extensions for the NLeSC 3d-e-Chem project
1313
</description>
1414
</category-def>
1515
</site>

‎src/main/resources/archetype-resources/plugin/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
#set( $qversion = $version.replace("-SNAPSHOT", ".qualifier") )
55
Manifest-Version: 1.0
66
Bundle-ManifestVersion: 2
7-
Bundle-Name: [Enter Your Node name here here.]
7+
Bundle-Name: ${node}
88
Bundle-SymbolicName: ${rootArtifactId}.plugin;singleton:=true
99
Bundle-Version: ${qversion}
1010
Bundle-RequiredExecutionEnvironment: JavaSE-$java_version
1111
Bundle-Activator: ${package}.Activator
12-
Bundle-Vendor: [Enter Your Company here.]
12+
Bundle-Vendor: ${vendor}
1313
Require-Bundle: org.eclipse.core.runtime,
1414
org.knime.workbench.core,
1515
org.knime.workbench.repository,

‎src/main/resources/archetype-resources/tests/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
1616
nl.esciencecenter.e3dchem.knime.testing.plugin;bundle-version="[1.0.0,2.0.0)",
1717
nl.esciencecenter.e3dchem.python.plugin;bundle-version="[2.0.0,3.0.0)",
1818
${rootArtifactId}.plugin
19-
Bundle-Vendor: [Enter Your Company here.]
19+
Bundle-Vendor: ${vendor}
2020
Bundle-ClassPath: .

‎src/main/resources/archetype-resources/tests/src/knime/simple-test/__node__ (#4)/settings.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
<entry key="state" type="xstring" value="CONFIGURED"/>
3434
<entry key="factory" type="xstring" value="${package}.${node}Factory"/>
3535
<entry key="node-name" type="xstring" value="${node}"/>
36-
<entry key="node-bundle-name" type="xstring" value="[Enter Your Node name here here.]"/>
37-
<entry key="node-bundle-symbolic-name" type="xstring" value="foo.bar.knime.plugin"/>
38-
<entry key="node-bundle-vendor" type="xstring" value="[Enter Your Company here.]"/>
36+
<entry key="node-bundle-name" type="xstring" value="${node}"/>
37+
<entry key="node-bundle-symbolic-name" type="xstring" value="${rootArtifactId}.plugin"/>
38+
<entry key="node-bundle-vendor" type="xstring" value="${vendor}"/>
3939
<entry key="node-bundle-version" type="xstring" value="1.0.0"/>
40-
<entry key="node-feature-name" type="xstring" value="foo.bar.knime Feature"/>
41-
<entry key="node-feature-symbolic-name" type="xstring" value="${artifactId}.feature.feature.group"/>
42-
<entry key="node-feature-vendor" type="xstring" value="[Enter provider name here.]"/>
40+
<entry key="node-feature-name" type="xstring" value="${parentArtifactId} Feature"/>
41+
<entry key="node-feature-symbolic-name" type="xstring" value="${parentArtifactId}.feature.feature.group"/>
42+
<entry key="node-feature-vendor" type="xstring" value="${vendor}"/>
4343
<entry key="node-feature-version" type="xstring" value="1.0.0"/>
4444
<config key="factory_settings"/>
4545
<entry key="name" type="xstring" value="${node}"/>

‎src/test/resources/projects/basic/archetype.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ github_repository=bar
1111
node=SomeNode
1212
python_script_filename=simple
1313
required_python_package=json
14+
vendor=SomeCompany

0 commit comments

Comments
 (0)