[java-idp-plugin-metadatagen] 02/06: Initial plugin/module stuff
Rod Widdowson
rdw at steadingsoftware.com
Fri Jun 11 09:47:52 UTC 2021
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-idp-plugin-metadatagen.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-metadatagen.git;a=commit;h=a9a1a79d6d85b3daba6dc9eb01f3c2cb4919ee92
commit a9a1a79d6d85b3daba6dc9eb01f3c2cb4919ee92
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Apr 5 15:12:12 2021 +0100
Initial plugin/module stuff
---
.gitignore | 5 +-
.project | 17 +++
metadatagen-api/.project | 23 +++
metadatagen-api/pom.xml | 6 +-
metadatagen-dist/.project | 17 +++
metadatagen-dist/src/main/assembly/assembly.xml | 12 +-
.../src/main/resources/bootstrap/keys.txt | 164 ++++++++++++++++++++-
metadatagen-impl/.project | 23 +++
metadatagen-impl/pom.xml | 4 +-
.../idp/plugin/metadatagen/ExamplePlugin.java | 27 ----
.../{ExampleModule.java => MetadataGenModule.java} | 8 +-
.../idp/plugin/metadatagen/MetadataGenPlugin.java | 34 +++++
.../META-INF/net.shibboleth.idp/postconfig.xml | 44 ------
.../idp/flows/authn/myplugin/plugin-beans.xml | 22 ---
.../idp/flows/authn/myplugin/plugin-flow.xml | 7 -
.../services/net.shibboleth.idp.module.IdPModule | 2 +-
.../services/net.shibboleth.idp.plugin.IdPPlugin | 2 +-
.../idp/plugin/metadatagen/module.properties | 19 ++-
.../idp/plugin/metadatagen/plugin.properties | 3 +-
.../idp/plugin/metadatatgen/bin/metadatagen.bat | 4 +
.../idp/plugin/metadatatgen/bin/metadatagen.sh | 7 +
pom.xml | 8 +-
22 files changed, 325 insertions(+), 133 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4603305..19b39a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
*/target
*/test-output
*~
-target
+*/.classpath
+*/.settings
+/.settings
+
diff --git a/.project b/.project
new file mode 100644
index 0000000..8af56a2
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>java-idp-plugin-metadatagen</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/metadatagen-api/.project b/metadatagen-api/.project
new file mode 100644
index 0000000..8bf6520
--- /dev/null
+++ b/metadatagen-api/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>idp-plugin-metadatagen-api</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/metadatagen-api/pom.xml b/metadatagen-api/pom.xml
index 502fa89..64ab606 100644
--- a/metadatagen-api/pom.xml
+++ b/metadatagen-api/pom.xml
@@ -16,7 +16,7 @@
<properties>
<checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
- <automatic.module.name>net.shibboleth.idp.plugin.metadatagen.metadatagen.api</automatic.module.name>
+ <automatic.module.name>net.shibboleth.idp.plugin.metadatagen.api</automatic.module.name>
</properties>
<dependencies>
@@ -45,7 +45,7 @@
<manifestEntries>
<Implementation-Title>${project.artifactId}</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>FINISH</Implementation-Vendor>
+ <Implementation-Vendor>shibboleth.net</Implementation-Vendor>
</manifestEntries>
</manifestSection>
</manifestSections>
@@ -56,4 +56,4 @@
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/metadatagen-dist/.project b/metadatagen-dist/.project
new file mode 100644
index 0000000..8d0d8e2
--- /dev/null
+++ b/metadatagen-dist/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>idp-plugin-metadatagen-dist</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/metadatagen-dist/src/main/assembly/assembly.xml b/metadatagen-dist/src/main/assembly/assembly.xml
index 06c755c..58e7eea 100644
--- a/metadatagen-dist/src/main/assembly/assembly.xml
+++ b/metadatagen-dist/src/main/assembly/assembly.xml
@@ -17,7 +17,7 @@
<!-- The plugin property file -->
<fileSet>
- <directory>../plugin-impl/target/classes/FIXME</directory>
+ <directory>../metadatagen-impl/target/classes/net/shibboleth/idp/plugin/metadatagen</directory>
<outputDirectory>bootstrap</outputDirectory>
<includes>
<include>plugin.properties</include>
@@ -26,10 +26,10 @@
<!-- The implementation jar -->
<fileSet>
- <directory>../plugin-impl/target</directory>
+ <directory>../metadatagen-impl/target</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
- <include>plugin-impl-*.jar</include>
+ <include>idp-plugin-metadatagen-impl-*.jar</include>
</includes>
<excludes>
<exclude>*test*.jar</exclude>
@@ -40,10 +40,10 @@
<!-- The API jar -->
<fileSet>
- <directory>../plugin-api/target</directory>
+ <directory>../metadatagen-api/target</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
- <include>plugin-api-*.jar</include>
+ <include>idp-plugin-metadatagen-api-*.jar</include>
</includes>
<excludes>
<exclude>*test*.jar</exclude>
@@ -54,7 +54,7 @@
<!-- The dependencies -->
<fileSet>
- <directory>../plugin-impl/target/dependency</directory>
+ <directory>../metadatagen-impl/target/dependency</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
<include>*.jar</include>
diff --git a/metadatagen-dist/src/main/resources/bootstrap/keys.txt b/metadatagen-dist/src/main/resources/bootstrap/keys.txt
index 921c030..0980a37 100644
--- a/metadatagen-dist/src/main/resources/bootstrap/keys.txt
+++ b/metadatagen-dist/src/main/resources/bootstrap/keys.txt
@@ -1 +1,163 @@
-FIXME: Plugin keys
\ No newline at end of file
+pub 4096R/2A4B3FF0 2019-09-18
+uid Rod Widdowson <rdw at steadingsoftware.com>
+sub 4096R/441D628D 2019-09-18
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+HEdQFQ==
+=/gwj
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub 4096R/02277962 2011-09-22
+uid Scott Cantor <cantor.2 at osu.edu>
+sig 3 02277962 2011-09-22 Scott Cantor <cantor.2 at osu.edu>
+sig 3 30A2362E 2011-09-23 Brian Swaney <swaney.29 at osu.edu>
+sig 47905D15 2011-09-26 Scott Cantor (Internet2) <cantor.2 at osu.edu>
+sig EA2882BB 2011-09-28 Ian A. Young <ian at iay.org.uk>
+sig A9D7AF55 2011-09-24 Michael Craft <mcraft at peak15.org>
+sig D7079C77 2011-09-28 Ian A. Young <ian at iay.org.uk>
+sig D2B37353 2011-10-11 Chad La Joie <lajoie at itumi.biz>
+sub 4096R/5B94AC0C 2011-09-22
+sig 02277962 2011-09-22 Scott Cantor <cantor.2 at osu.edu>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (Darwin)
+
+mQINBE56gwwBEADI6Y7tBIdYr8t0zfHU2hRbD7GfuanIkn4Fhf/CZ7ICN+SfA/XP
+JAx3HDRkM/nc65U2mKG7vG3zlNOcKgeFoCwqhlLc4sSGP6DDoPYKtZOLEHwA/sIy
+Lldw3re5KbCFIElnbBW/0av15IGHXgyylmG24jhlY/ufjLd53Qm4agxv51kdYdgH
+cI0djzLqvMWTabWhw8QtmitPZSKdqOwTqkIt6bYAdOvc9r5bvAzemw6IO01L9aX7
+/yFIVJAYySL/UpbEtLcl3B/qXUXwhiq2bAUtvdmV+35FSMrAgfD25bYv+dVoJdtX
+Gb4tQcPteSRDIQYswT+bilEtGOOu9vqLvko3hSHOK2Yqc8SufDakrOlCWO1R00Sw
+QHGSkPKgA5O3RpOz3qbuPN6sDt/7FgqyzB6VqF9445bTqWDfIihXEAFr97gf28Xg
+ngAn2Tp8ZZ6zTzYWv3/GGvCedCcrHrIG/nKf0Z0/1q9Uf8P7crv2udGuZjs3bMtY
+RQNKzki/wKRuGnZ7HjgOEDIe8E+QMs+568i5vYqdaNrmCxUodRFjwkZ/0aRuHzxo
+JNQaB/r2Ckj5X/yEX6f45D0hiwBmIFz2+VUnis7RAPelcUl1X/kT4p/3gvKSsFE0
+Ti7JWCY9e+ntnzcsb4ywisFen9tQQPP4G++qnhGyApz323LfDVPJkFWWJwARAQAB
+tB9TY290dCBDYW50b3IgPGNhbnRvci4yQG9zdS5lZHU+iQI3BBMBCgAhBQJOeoMM
+AhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEDeLhFQCJ3li6fwP/10LcYMk
+QhXODeO2+QkPTxM1VMxTBJCjM3ZX5ZpCCCUolJuhHlqNljpJUx6q2VP7UvNx1T1z
+eWlCrScHUZnxaS6Bh0WTz/SeNdMj1PDWLZeGn+EokRTNSRzHU2XJgdnURCNb8pWe
+rSuE8BuoMOXIRP+qj/fxKvNmo5q4zJ7y5P5qpQSUXxbdTuXi3gLuiWWfDJyFGs5o
+4mNIDAu0rVYkid4OovHMO/5tWahkv7tXDuKvLjHBii9n7sKlpmyJxMkxi+j8Jcba
+qHKu8nQNzEQh2GTQqI+SI/s13dvna8DhnfTKN/CqSgLVeWnN4Pi/uKX4vod1w6KC
+Xg8OvzlSGij//lIHrni2ZMvZrfbDwacIr9vzJK7pfCVQhKJQAEoZ6vJwF5OHPrlz
+xR3rseI/1AMrv6wSmoA3G5fUh/CEICe90Mpz3pjyQ7xoLil879tMWGGTIBExb3wJ
+XI/hcLLA9dBDvnDl6RL/B5yArNiT/hLhofW8Su0N5jdYXkgM1MA5q7vju+Bt/yfP
+SDEHBaAp2XCHXXOyUpXV8s8wvu2JXJPaJ3akYY47eBQnkG7gt5SQud1Bl4RFnBZx
+3QiEOwQlYhrODSVsRYIu1bsJ/8HT9foxP3CrxqrrhQySyc5TqIj3VmQfeaPYjxPL
+6eX5ldS3VxWCP4DJh3IchYsd9mRAu+QfmgnmiQIcBBMBAgAGBQJOe++jAAoJEPpB
+tfcwojYumlUQAIDiXg0ErWbfzOIlnQgGVYEqBeLi/QsrSO/VauytDMtaKOgdJosy
+33DNteMPICW6DGr7wZ89evduZXlnKjox4mLJsvNAJfNuw+Gk3eJPu1ECdTkRftB5
+/f3ShYcH0ZJOvaMTzLDd2bHdQYW4/gQuYcjLFi9ZJ1KMZM9E5U41Gu5Hr/JUKvPL
+/nVU9ji/Dn0i/4nFuNjmITTRM21pc1wfYz0rvGfCuNIAYThxWIelXXaCpF0P3hfw
+X/EoLE8P6QkJoAgoPa58Zx1qdptTqUz5TKuxw2+eleMNQUd2V0TbjnJ90GBubxEt
+bMkkrP0RPP+ti2j4DoU1k9Ghxtp5K/QDUnq/kySao1UhI5HHILOeG77fSzYqfDYy
+fTaq4z8LFp3Gus3/dlYZxq3b1Hcobs4X2oQxX7k0nzgwc2qZR0JhKN0quHhUZly8
+D/4qvEN2Uqa6TkuPlC1vdAC/SqXpxQQQn56S6fNCZbxQfPhc7Anmvc4jXC4Z09KE
+roi0uWzZbcfG7e8NEVba2tuPn8YefrtokJGqQu3FGmA3ij1g+8LyR2PxY7+IzDXT
+Ds5+msQDxLUKOc7CRnBDoyqv4llmT8woUcB7LAiIsTWLVU96Xazijs1dpoW2GgVH
+fdEhbcswYVSzJ+rIv+1EbMMbd+yjlU7L/h+Ia6UnxitZb0qNca51AhvciEYEEBEK
+AAYFAk6ApGIACgkQpXtW80eQXRUgxwCePIV9LehYh+Jio8mtQ74I/NWvfDQAoLmX
+TfmKAganE+r/FcCcwykzj70ViEYEEBECAAYFAk6DTO8ACgkQ70D8KeoogrukNwCd
+GX5zZOsC44CjV2AopI8KoMFJto4AoMH+qA35GIBUkEt8IoRVFs1rp3TGiQEcBBAB
+AgAGBQJOfS4aAAoJEH8LUwap169VyrAH/1lrWiCJarm8eFLNlajcDt5TR5ZpanZV
+UbuzAp9Jk8XtBkCMssnuzcqqSbGmq3P6CuaSTx0BybBOhRgC+UCb/DCS0TGomJYU
+TcG7e7MyJZC4ocarORGURABk1UK/fkgEBn+9o2jdDlf7bm7JHlZJ8huLjiAq5fap
+zp5WhTUAcreHjYieTS5umt01yxFatxhqiTbNXzs1c7Hc19rW4cTLREm6YQUNwTIx
+qJ2hHyDfU13ephowv1DpoAwLXdHAsNy/C8RKRlr0Qc4snihVkGevLNWatYK4HP6M
+0tEvGX9CpnTXpOsLZkfp96RMtE2TEvMEEA0HVoZPE7/kCyYR5DForeqJAhwEEAEC
+AAYFAk6DkGAACgkQmoBOl9cHnHeZQw//QoUi0oP1lp7MjbFKGovCiCQU1qE0YEDH
+pkkDxwj/yoGK3ylOGd32regz3TuoV4AP7ZF7eZvrIXsVB5p2b8FL4IkBJi9/cXUJ
+dZ+cy/0Cd7vivd48nEBTNZvHNkyKyjFW8/FcE2IyylJIb9acV2WnZgGqfOMp8k/l
+KczfzNaaV3FFVY15Q1Q7heSUiAof85/dxAOoW0i1j7dmRNEKRHIme0v71Qv+J714
+c95ujg1d83rIa5uVfD/EeBbJn9WvRWO7OPYylhuyJHurtvQ2CJL9/RUL3mIsaNxT
+HweXfKuLsyYoIkQL7HpDIGDpZ5jPMrvSSeP/8wgY/NUNrXhYsVK00Djd+vV925xD
+rdA46pNEF4FwlL4WFHZgGurPxGYJ4MXleWsQ21t70GvTJIt1FrF55aYuHJcf5x+8
+VinG2tu1pCJg5b94OJ9km1BY/xjgnNwxafqplsBVfMjLN9NM0j2wKq/glztBgIra
+KqZocQi5omrmhiJp1qrdOdWFhRtIY2kCyoX48137FbshAw/O9ETF6p5EuKEHd+Tj
+stThW6oIIcbSV6PKAi9n0cL5URL9JKO1+q6QsT4YssuixaB0bfuF9BuYdvy2xoyF
+eKD4uN+qScqM2/N5Aoechj9aIfhqyhX4Ex8WpKdzEzV84pfGvvWk8kEZQESHr2hZ
+RqykkdLpqmqJAhwEEAECAAYFAk6UUdsACgkQoLPLCdKzc1MFWw/+Ln0WSpZa6HHr
+7v+zBIjT8gWKNcTh4QY11wSmamZmFJ6FpnKfJsQBnSw5h6yhZ4uL+pr/XhznDZJY
+yhdR3novamyrBfVJHkpQjcxC80aECdsIz+3p1vNEKBFnADez90gUcFRNVxd8waOZ
+sDf0VwRsu8cv+umMt+/LrpwsJz8mWmzU1qzITiAMN0IXdnzAqA7fOrFZvcfAn0My
+SPGDyThUsG0rl2DJH8f1WvbDuQPSw2l+/Wm2nxwB4sCQYhnrvFu1cCWIeWnK/5U1
+EG1FvB5XKOSCs90Y3fLe6nwlqXAC0dqTj2CWoove5RKJ67U/R8foi/YJmvTzdQ/N
+Lcu2zGGLTnTLJLnR/Fw9BQShItFYk/N5c5dls90/9iDXSbLhy4SzKPkdsKxPTOIy
+7Kej+KkSdzVaYw5DXtwl8FUIEOkPhI7Vxm+eNTL2WNeONqRzxO3OnkwyIMOT+y6R
+9CXIpv4l0HaT1mqXSwdc8Z7ZgkcmMg2IXdCjb1jQ0bK/jwBNlyvNig/Hxdq95vHl
+C5uG7hgPLX9rKrkOStqJC5WU9TSyF5oE4Ug4EgY8v4hVM/eQJrWHctnqk+aEYFwL
+CQyjApfpzuf9bCEQNbER2lwpz3M0JIl4SonYlTrkaZE4cd5jMWISFdsGAhv6RKaH
+gh5LlDIgQ0kaRg2sbnEECUfa/N8SuSS5Ag0ETnqDDAEQALc2/PpXjPRCzIk4MG+B
+BisGO8DbepljnK5b8KfppxjeFTyWtH7Q5/5Bcj8bRZIOKFZR5Zj1BpOUbpEa5fSt
+6sxzLlmvjaoYzOvRcPYWZbwnC9G6qqvwigdBsiV/259lf1kYALlUAC/D+HwEP7fE
+n/NJU00ONCJhOhf/5+dgBbCtEufoBu9YggDWOg7jM+BlD28E1dRSmammFXYs+BK8
+Xf6mrqzw3IHGqrYkkJzn+qq2CF/y2asEK6RJq7o/JecT9TfHky7cdIlv5gdAF2Mh
+9nl5rXJR02B476D4GWo0jtqG5y3Q54Kiecx2V5Al+ESxYAqv9wODb8SzrVQ2MoiA
+9x3ENeu2g26YzB3rZXlClzFiAOP+qPlmbPW4W4H+sQ2u90KroPET+FV+xQaxHtrN
+MXHPXdeWGwPKxq6uI7xgd4VBMP7Sv97lbn7fpkax6jRRIyrOPTCk3PL7uAssUDdt
+TunX66f/ODA/d1Y0FJGFKy9s8WyXAb0EwOUrhNJqgUf3vCB/FAWJrjOJ1nVLhzU7
+MCqs0bAKnT32dWzZ36PXpqTRRJdpntiF4TYIgaW6RhBVmNNmxF3bQiHf4aTDYRN8
+uqcScE7cao9SsPrt9qnC9JbMM+bQhdAq1uYWvVA8zucR95GNffzV1J29lhTalYst
+NisKWxxuY0HENtOgJsKPxbp9ABEBAAGJAh8EGAEKAAkFAk56gwwCGwwACgkQN4uE
+VAIneWI8hA//b89SV9KuExBVcc4JWvAW4VcJWl6DpmyXDscPJ3tqjtzWfnnJ6Fkt
+HQ0XtQCS3GgIAtocKQ6Wdzq+WwqUElAZcHQP68TjCaJuximDvaBqeeFfnIzZcyaW
+9dXCrmM4+h3ZlRim86OuRvLWFCtHw07I1llODIexwM7WR/VJodHvddNw35Bn9rkv
+HgPFlXNrAcArZXyU4pciey8VTvr36HW/USkz8dDxm0ATWxWsZiuuEs+MY1VE2Yh5
+/Y99va0w7+8s0Lgojvglksu04u/PW0XFID1r9m24OFJUz5+NDiHwFG/7NT9/Sd5S
+A4OBrLWXAYxjU2uaOubRd5tPrNpg2wwE6Bqs6r9HxxOogw73LbnRWaFG4Cf+Q0qr
+AOV3uVQkUb8Ed0vbeziUuHkHcQ2FsYDxoaKLzXcz3j023SH5FgcPlsKJI9K7AFCn
+8e412bY2F3xujSXRB6hkC2Hltt5DJsSHaGNY41jhCcHQ9KvKezNmrpvTXI59bFv0
+VDzy7vlN67Y3On4X+FVqb6ejVae2vP+nIEk2S+Hmr2CDrlwwmuOCrJxoVqTwTiTX
+mVrwpIBjQlG8wK563t4g053+oidWjK106DfN/CFdrL4n5ALxJzJIWH41IAyBTjDq
+7Hy4UVCwEes88l4iYs50+q45cZYsbCms8svXSwt6pcAuKQiKaJdECm0=
+=ShRP
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/metadatagen-impl/.project b/metadatagen-impl/.project
new file mode 100644
index 0000000..22ca005
--- /dev/null
+++ b/metadatagen-impl/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>idp-plugin-metadatagen-impl</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/metadatagen-impl/pom.xml b/metadatagen-impl/pom.xml
index cb7a1ca..2e4d33b 100644
--- a/metadatagen-impl/pom.xml
+++ b/metadatagen-impl/pom.xml
@@ -15,7 +15,7 @@
<properties>
<checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
- <automatic.module.name>net.shibboleth.idp.plugin.metadatagen.metadatagen.impl</automatic.module.name>
+ <automatic.module.name>net.shibboleth.idp.plugin.metadatagen.impl</automatic.module.name>
</properties>
<dependencies>
@@ -39,4 +39,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/metadatagen-impl/src/main/java/net/shibboleth/idp/plugin/metadatagen/ExamplePlugin.java b/metadatagen-impl/src/main/java/net/shibboleth/idp/plugin/metadatagen/ExamplePlugin.java
deleted file mode 100644
index 7a224d2..0000000
--- a/metadatagen-impl/src/main/java/net/shibboleth/idp/plugin/metadatagen/ExamplePlugin.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package net.shibboleth.idp.plugin.metadatagen;
-
-import java.io.IOException;
-import javax.annotation.Nonnull;
-
-import net.shibboleth.idp.plugin.IdPPlugin;
-import net.shibboleth.idp.plugin.PluginException;
-import net.shibboleth.idp.plugin.PropertyDrivenIdPPlugin;
-
-/**
- * Plugin description about the webauthn plugin.
- */
-public class ExamplePlugin extends PropertyDrivenIdPPlugin {
-
- /**
- * Constructor.
- *
- * @param claz type of plugin
- *
- * @throws IOException if properties can't be loaded
- * @throws PluginException if another error occurs
- */
- public ExamplePlugin(@Nonnull final Class<? extends IdPPlugin> claz) throws IOException, PluginException {
- super(claz);
- }
-
-}
\ No newline at end of file
diff --git a/metadatagen-impl/src/main/java/net/shibboleth/idp/plugin/metadatagen/ExampleModule.java b/metadatagen-impl/src/main/java/net/shibboleth/idp/plugin/metadatagen/MetadataGenModule.java
similarity index 57%
rename from metadatagen-impl/src/main/java/net/shibboleth/idp/plugin/metadatagen/ExampleModule.java
rename to metadatagen-impl/src/main/java/net/shibboleth/idp/plugin/metadatagen/MetadataGenModule.java
index dfad380..4eeb119 100644
--- a/metadatagen-impl/src/main/java/net/shibboleth/idp/plugin/metadatagen/ExampleModule.java
+++ b/metadatagen-impl/src/main/java/net/shibboleth/idp/plugin/metadatagen/MetadataGenModule.java
@@ -7,9 +7,9 @@ import net.shibboleth.idp.module.impl.PluginIdPModule;
/**
- * {@link IdPModule IdP Module} implementation.
+ * {@link net.shibboleth.idp.module.IdPModule IdP Module} implementation.
*/
-public class ExampleModule extends PluginIdPModule{
+public class MetadataGenModule extends PluginIdPModule{
/**
* Constructor.
@@ -17,8 +17,8 @@ public class ExampleModule extends PluginIdPModule{
* @throws ModuleException on error
* @throws IOException on error
*/
- public ExampleModule() throws IOException, ModuleException {
- super(ExampleModule.class);
+ public MetadataGenModule() throws IOException, ModuleException {
+ super(MetadataGenModule.class);
}
diff --git a/metadatagen-impl/src/main/java/net/shibboleth/idp/plugin/metadatagen/MetadataGenPlugin.java b/metadatagen-impl/src/main/java/net/shibboleth/idp/plugin/metadatagen/MetadataGenPlugin.java
new file mode 100644
index 0000000..d05f8e2
--- /dev/null
+++ b/metadatagen-impl/src/main/java/net/shibboleth/idp/plugin/metadatagen/MetadataGenPlugin.java
@@ -0,0 +1,34 @@
+package net.shibboleth.idp.plugin.metadatagen;
+
+import java.io.IOException;
+import java.util.Collections;
+
+import net.shibboleth.idp.module.IdPModule;
+import net.shibboleth.idp.module.ModuleException;
+import net.shibboleth.idp.plugin.PluginException;
+import net.shibboleth.idp.plugin.PropertyDrivenIdPPlugin;
+
+/**
+ * Plugin description about the webauthn plugin.
+ */
+public class MetadataGenPlugin extends PropertyDrivenIdPPlugin {
+
+ /**
+ * Constructor.
+ *
+ * @throws IOException if properties can't be loaded
+ * @throws PluginException if another error occurs
+ */
+ public MetadataGenPlugin() throws IOException, PluginException {
+ super(MetadataGenPlugin.class);
+ try {
+ final IdPModule module = new MetadataGenModule();
+ setEnableOnInstall(Collections.singleton(module));
+ setDisableOnRemoval(Collections.singleton(module));
+ } catch (final IOException e) {
+ throw e;
+ } catch (final ModuleException e) {
+ throw new PluginException(e);
+ }
+ }
+}
\ No newline at end of file
diff --git a/metadatagen-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/metadatagen-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
deleted file mode 100644
index 20278f9..0000000
--- a/metadatagen-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize" default-destroy-method="destroy">
-
- <!--
- System beans needed for extension to function, loaded after global.xml.
- The default template shows an incomplete example authentication flow descriptor which can be
- removed if not needed
- -->
-
- <bean id="authn/metadatagen" parent="shibboleth.AuthenticationFlow"
- p:order="%{xxx.order:1000}"
- p:nonBrowserSupported="%{xxx.nonBrowserSupported:true}"
- p:passiveAuthenticationSupported="%{xxx.passiveAuthenticationSupported:true}"
- p:forcedAuthenticationSupported="%{xxx.forcedAuthenticationSupported:true}"
- p:proxyRestrictionsEnforced="%{xxx.proxyRestrictionsEnforced:%{idp.authn.enforceProxyRestrictions:true}}"
- p:proxyScopingEnforced="%{xxx.proxyScopingEnforced:false}"
- p:discoveryRequired="%{xxx.discoveryRequired:false}"
- p:lifetime="%{xxx.lifetime:%{idp.authn.defaultLifetime:PT1H}}"
- p:inactivityTimeout="%{xxx.inactivityTimeout:%{idp.authn.defaultTimeout:PT30M}}"
- p:reuseCondition-ref="#{'%{xxx.reuseCondition:shibboleth.Conditions.TRUE}'.trim()}"
- p:activationCondition-ref="#{'%{xxx.activationCondition:shibboleth.Conditions.TRUE}'.trim()}">
- <property name="supportedPrincipals">
- <list>
- <bean parent="shibboleth.SAML2AuthnContextClassRef"
- c:classRef="class-ref" />
- <bean parent="shibboleth.SAML1AuthenticationMethod"
- c:method="auth-ref" />
- </list>
- </property>
- <property name="supportedPrincipalsByString">
- <bean parent="shibboleth.CommaDelimStringArray"
- c:_0="#{'%{xxx.supportedPrincipals:}'.trim()}" />
- </property>
- </bean>
-
-</beans>
\ No newline at end of file
diff --git a/metadatagen-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/myplugin/plugin-beans.xml b/metadatagen-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/myplugin/plugin-beans.xml
deleted file mode 100644
index 15560b0..0000000
--- a/metadatagen-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/myplugin/plugin-beans.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize"
- default-destroy-method="destroy">
-
- <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
- p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
- <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
- <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
-
-</beans>
diff --git a/metadatagen-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/myplugin/plugin-flow.xml b/metadatagen-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/myplugin/plugin-flow.xml
deleted file mode 100644
index 98e318a..0000000
--- a/metadatagen-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/myplugin/plugin-flow.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<flow xmlns="http://www.springframework.org/schema/webflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
- parent="authn.abstract, authn/conditions">
-
-
-
-</flow>
diff --git a/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule b/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
index 6569877..a3d2ddd 100644
--- a/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
+++ b/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
@@ -1 +1 @@
-net.shibboleth.idp.plugin.metadatagen.ExampleModule
+net.shibboleth.idp.plugin.metadatagen.MetadataGenModule
diff --git a/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin b/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
index 636972d..b819685 100644
--- a/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
+++ b/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
@@ -1,2 +1,2 @@
-net.shibboleth.idp.plugin.metadatagen.ExamplePlugin
+net.shibboleth.idp.plugin.metadatagen.MetadataGenPlugin
\ No newline at end of file
diff --git a/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/module.properties b/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/module.properties
index de627cb..79138db 100644
--- a/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/module.properties
+++ b/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/module.properties
@@ -1,14 +1,17 @@
# Example Properties defining an authentication module.
# Class to Module ID mappings
-net.shibboleth.idp.plugin.metadatagen.ExampleModule = idp.authn.metadatagen
+net.shibboleth.idp.plugin.metadatagen.MetadataGenModule = idp.metadatagen
# Module Owner
-idp.authn.metadatagen.plugin = net.shibboleth.idp.plugin.authn.metadatagen
+idp.metadatagen.plugin = net.shibboleth.idp.plugin.metadatagen
-idp.authn.metadatagen.name = metadatagen Authentication
-idp.authn.metadatagen.desc = Login flow for metadatagen
-idp.authn.metadatagen.url = /metadatagenConfiguration
-idp.authn.metadatagen.1.src = somefile
-idp.authn.metadatagen.1.dest = conf/to-somefile
-idp.authn.metadatagen.1.replace = true
+idp.metadatagen.name = Metadata Generator (Beta)
+idp.metadatagen.desc = A test Metadata Generator
+idp.metadatagen.url = /Metadatagen
+idp.metadatagen.1.src = /net/shibboleth/idp/plugin/metadatatgen/bin/metadatagen.sh
+idp.metadatagen.1.dest = bin/metadatagen.sh
+idp.metadatagen.1.replace = true
+idp.metadatagen.2.src = /net/shibboleth/idp/plugin/metadatatgen/bin/metadatagen.bat
+idp.metadatagen.2.dest = bin/metadatagen.bat
+idp.metadatagen.2.replace = true
diff --git a/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/plugin.properties b/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/plugin.properties
index a966fa9..e056e21 100644
--- a/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/plugin.properties
+++ b/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/plugin.properties
@@ -1,9 +1,8 @@
# Example properties defining this plugin
-plugin.id = net.shibboleth.idp.plugin.metadatagen.metadatagen
+plugin.id = net.shibboleth.idp.plugin.metadatagen
# Only used when package manifest is not available
plugin.version = 0.0.1
-plugin.license = licence.txt
# No prereqs
#plugin.modules.required =
diff --git a/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatatgen/bin/metadatagen.bat b/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatatgen/bin/metadatagen.bat
new file mode 100644
index 0000000..79b7299
--- /dev/null
+++ b/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatatgen/bin/metadatagen.bat
@@ -0,0 +1,4 @@
+ at echo off
+setlocal
+
+"%~dp0\runclass.bat" net.shibboleth.idp.plugin.metadatagen.MetadataGen --home "%~dp0\.." %*
diff --git a/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatatgen/bin/metadatagen.sh b/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatatgen/bin/metadatagen.sh
new file mode 100644
index 0000000..fc4268d
--- /dev/null
+++ b/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatatgen/bin/metadatagen.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+declare LOCATION
+
+LOCATION=$(dirname $0)
+
+$LOCATION/runclass.sh net.shibboleth.idp.module.impl.ModuleManagerCLI --ansi --home "$LOCATION/.." "$@"
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5d371c0..b25834d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>net.shibboleth</groupId>
<artifactId>parent</artifactId>
- <version>11.2.0-SNAPSHOT</version>
+ <version>11.2.0</version>
</parent>
<groupId>net.shibboleth.idp.plugin.metadatagen</groupId>
<artifactId>idp-plugin-metadatagen-parent</artifactId>
@@ -14,15 +14,15 @@
<description>metadatagen plugin for the Shibboleth IdP.</description>
<properties>
<idp.groupId>net.shibboleth.idp</idp.groupId>
- <idp.version>4.1.0-SNAPSHOT</idp.version>
+ <idp.version>4.1.0</idp.version>
<opensaml.groupId>org.opensaml</opensaml.groupId>
- <opensaml.version>4.1.0-SNAPSHOT</opensaml.version>
+ <opensaml.version>4.1.0</opensaml.version>
<checkstyle.configLocation>${project.basedir}/checkstyle.xml</checkstyle.configLocation>
</properties>
<distributionManagement>
<site>
<id>site</id>
- <url>dav:...</url>
+ <url>${shibboleth.site.url}java-idp-plugin-metadatagen/${project.version}/</url>
</site>
</distributionManagement>
<repositories>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list