This is an automated email from the ASF dual-hosted git repository. alexoree pushed a commit to branch feature/JUDDI-978 in repository https://gitbox.apache.org/repos/asf/juddi.git
commit 25a86acaed152606a730444f57845a7afe5379dc Merge: 47accac9a e01bc27ae Author: Alex O'Ree <[email protected]> AuthorDate: Sun Apr 17 11:45:16 2022 -0400 Merge branch 'master' into feature/JUDDI-978 # Conflicts: # docs/asciidoc/ClientGuide/pom.xml # docs/asciidoc/Guide/pom.xml # docs/asciidoc/pom.xml # pom.xml .github/dependabot.yml | 11 ++ .github/workflows/codeql-analysis.yml | 72 +++++++ RELEASE_NOTES.html | 42 +++- docs/dist/pom.xml | 2 +- docs/pom.xml | 2 +- juddi-client-cli/pom.xml | 4 +- .../org/apache/juddi/v3/client/cli/WadlImport.java | 2 +- .../org/apache/juddi/v3/client/cli/WsdlImport.java | 2 +- juddi-client/pom.xml | 2 +- .../org/apache/juddi/v3/client/UDDIConstants.java | 2 + .../apache/juddi/v3/client/config/UDDIClient.java | 4 + .../v3/client/config/UDDIClientContainer.java | 4 + .../juddi/v3/client/mapping/MapUDDIv2Tov3.java | 28 +-- .../juddi/v3/client/mapping/MapUDDIv3Tov2.java | 99 +++++----- .../juddi/v3/client/mapping/ServiceLocator.java | 62 ++++-- .../juddi/v3/client/transport/RMITransport.java | 220 --------------------- .../juddi/v3/client/transport/Transport.java | 3 +- .../src/test/resources/META-INF/subscription.xml | 14 +- juddi-client/src/test/resources/META-INF/uddi.xml | 14 +- juddi-core-openjpa/pom.xml | 6 +- juddi-core/pom.xml | 2 +- .../src/main/java/org/apache/juddi/Registry.java | 27 --- .../java/org/apache/juddi/config/Property.java | 3 + .../org/apache/juddi/model/BindingTemplate.java | 2 + .../java/org/apache/juddi/model/DiscoveryUrl.java | 2 + .../main/java/org/apache/juddi/model/Email.java | 2 + .../org/apache/juddi/model/PublisherAssertion.java | 2 +- .../juddi/model/ReplicationConfiguration.java | 7 +- .../juddi/model/ReplicationConfigurationNode.java | 2 +- .../java/org/apache/juddi/model/Signature.java | 2 +- .../query/FindBusinessByDiscoveryURLQuery.java | 4 +- .../org/apache/juddi/rmi/JNDIRegistration.java | 154 --------------- .../java/org/apache/juddi/rmi/JUDDIApiService.java | 196 ------------------ .../java/org/apache/juddi/rmi/RMIRegistration.java | 149 -------------- .../juddi/rmi/UDDICustodyTransferService.java | 66 ------- .../org/apache/juddi/rmi/UDDIInquiryService.java | 108 ---------- .../apache/juddi/rmi/UDDIPublicationService.java | 133 ------------- .../org/apache/juddi/rmi/UDDISecurityService.java | 53 ----- .../juddi/rmi/UDDISubscriptionListenerService.java | 49 ----- .../apache/juddi/rmi/UDDISubscriptionService.java | 71 ------- .../java/org/apache/juddi/rmi/package-info.java | 19 -- .../subscription/notify/JNDI_RMINotifier.java | 91 --------- .../juddi/subscription/notify/RMINotifier.java | 63 ------ .../org/apache/juddi/validation/ValidateNode.java | 13 +- .../resources/juddi_install_data/UDDI_tModels.xml | 25 +-- juddi-core/src/main/resources/messages.properties | 2 +- .../api/impl/API_050_BindingTemplateTest.java | 62 ++++++ ...091_RMISubscriptionListenerIntegrationTest.java | 173 ---------------- .../juddi/api/impl/API_110_FindBusinessTest.java | 45 +++++ .../apache/juddi/api/runtime/CLIServerTest.java | 4 +- .../{juddiTestimpl.java => JuddiTestimpl.java} | 2 +- .../{replicantImpl.java => ReplicantImpl.java} | 4 +- .../org/apache/juddi/rmi/JNDIRegistrationTest.java | 58 ------ .../juddi/subscription/notify/NotifierTest.java | 32 +-- juddi-ddl-generator/pom.xml | 46 +++-- .../java/org/apache/juddi/ddl/generator/App.java | 137 ++++++++----- juddi-dist/pom.xml | 2 +- juddi-examples/ValueSetValidator/pom.xml | 2 +- juddi-examples/create-partition/pom.xml | 2 +- .../partition/SimpleCreateTmodelPartition.java | 2 +- juddi-examples/hello-world-embedded/pom.xml | 2 +- .../juddi/example/helloworld/HelloWorld.java | 2 +- juddi-examples/hello-world/pom.xml | 2 +- .../juddi/example/helloworld/HelloWorld.java | 2 +- juddi-examples/juddi-embedded/pom.xml | 2 +- juddi-examples/more-uddi-samples/pom.xml | 2 +- .../juddi/samples/BusinessServiceKeymismatch.java | 2 +- .../apache/juddi/samples/FindBusinessBugHunt.java | 2 +- .../apache/juddi/samples/JuddiAdminService.java | 4 +- .../org/apache/juddi/samples/SimpleBrowse.java | 2 +- .../java/org/apache/juddi/samples/WadlImport.java | 2 +- .../java/org/apache/juddi/samples/WsdlImport.java | 2 +- juddi-examples/pom.xml | 2 +- juddi-examples/service-version/pom.xml | 2 +- .../service/version/ServiceVersioningExample.java | 2 +- juddi-examples/simple-browse/pom.xml | 2 +- .../apache/juddi/example/browse/SimpleBrowse.java | 2 +- juddi-examples/simple-publish-clerk/pom.xml | 2 +- juddi-examples/simple-publish-portable/pom.xml | 2 +- .../example/publish/SimplePublishPortable.java | 2 +- .../subscription-notification-amqp/pom.xml | 2 +- juddi-examples/uddi-annotations/pom.xml | 2 +- juddi-examples/uddiv2-api-bridge-example/pom.xml | 2 +- .../api/bridge/example/SimpleBrowseUDDIv2.java | 2 +- juddi-examples/wsdl2uddi-lifecyle/pom.xml | 2 +- juddi-examples/wsdl2uddi/pom.xml | 2 +- juddi-gui-dsig/pom.xml | 2 +- juddi-gui/pom.xml | 2 +- .../apache/juddi/webconsole/PostBackConstants.java | 1 + .../org/apache/juddi/webconsole/hub/UddiHub.java | 26 ++- .../juddi/webconsole/hub/builders/Printers.java | 6 +- .../juddi/webconsole/resources/web.properties | 2 + .../juddi/webconsole/resources/web_es.properties | 2 + juddi-gui/src/main/webapp/about.jsp | 4 +- juddi-gui/src/main/webapp/advanced.jsp | 4 +- juddi-gui/src/main/webapp/ajax/businesssearch.jsp | 8 +- juddi-gui/src/main/webapp/ajax/servicesearch.jsp | 2 +- juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp | 6 +- juddi-gui/src/main/webapp/assertions.jsp | 4 +- juddi-gui/src/main/webapp/bindingChooser.jsp | 3 - juddi-gui/src/main/webapp/bindingEditor.jsp | 14 +- juddi-gui/src/main/webapp/businessBrowse.jsp | 9 +- juddi-gui/src/main/webapp/businessEditor2.jsp | 7 +- juddi-gui/src/main/webapp/editSubscription.jsp | 4 +- juddi-gui/src/main/webapp/home.jsp | 4 +- juddi-gui/src/main/webapp/importFromWadl.jsp | 4 +- juddi-gui/src/main/webapp/importFromWsdl.jsp | 4 +- juddi-gui/src/main/webapp/js/bindingeditor.js | 1 - juddi-gui/src/main/webapp/js/businessEditor.js | 1 + juddi-gui/src/main/webapp/js/businesssearch.js | 13 +- juddi-gui/src/main/webapp/js/serviceBrowse.js | 14 +- juddi-gui/src/main/webapp/js/serviceEditor.js | 8 +- juddi-gui/src/main/webapp/js/tmodelChooser.js | 16 +- juddi-gui/src/main/webapp/js/tmodelsearch.js | 99 +++++----- juddi-gui/src/main/webapp/reginfo.jsp | 4 +- juddi-gui/src/main/webapp/search.jsp | 4 +- juddi-gui/src/main/webapp/serviceBrowse.jsp | 94 ++++----- juddi-gui/src/main/webapp/serviceEditor.jsp | 4 +- juddi-gui/src/main/webapp/settings.jsp | 4 +- juddi-gui/src/main/webapp/signer.jsp | 4 +- juddi-gui/src/main/webapp/subscriptionFeed.jsp | 4 +- juddi-gui/src/main/webapp/tmodelBrowse.jsp | 109 +++++----- juddi-gui/src/main/webapp/tmodelChooser.jsp | 4 +- juddi-gui/src/main/webapp/tmodelEditor.jsp | 4 +- juddi-gui/src/main/webapp/tmodelPartitions.jsp | 4 +- juddi-gui/src/main/webapp/transfer.jsp | 4 +- juddi-gui/src/main/webapp/viewSubscriptions.jsp | 4 +- juddi-rest-cxf/pom.xml | 2 +- juddi-tomcat/build.xml | 1 + juddi-tomcat/context.xml | 15 +- .../juddi_install_data_node2/UDDI_tModels.xml | 27 +-- .../juddi_install_data_node3/UDDI_tModels.xml | 26 +-- juddi-tomcat/pom.xml | 11 +- juddiv3-war-repl/pom.xml | 2 +- juddiv3-war/pom.xml | 2 +- juddiv3-war/src/main/webapp/admin/mbeans.jsp | 25 +-- pom.xml | 84 ++++++-- qa/juddi-xlt/src/META-INF/uddi.xml | 14 +- readme.txt | 8 +- src/site/markdown/committers.md | 2 +- src/site/markdown/index.md | 10 +- src/site/markdown/integration.md | 4 +- src/site/markdown/releases.md | 2 +- src/site/markdown/security.md | 31 +++ src/site/site.xml | 5 +- uddi-client-dist/pom.xml | 3 +- uddi-migration-tool/pom.xml | 2 +- .../org/apache/juddi/v3/migration/tool/Export.java | 2 +- .../org/apache/juddi/v3/migration/tool/Import.java | 2 +- uddi-tck-base/pom.xml | 2 +- .../java/org/apache/juddi/v2/tck/TckPublisher.java | 5 +- .../java/org/apache/juddi/v3/tck/TckCommon.java | 23 ++- .../java/org/apache/juddi/v3/tck/TckPublisher.java | 4 +- uddi-tck-base/src/main/resources/tck.properties | 2 - .../subscriptionnotifier/listenerServiceRMI.xml | 43 ---- .../subscriptionnotifier/subscription1RMI.xml | 32 --- .../subscriptionnotifier/subscription2RMI.xml | 32 --- .../subscriptionnotifier/subscription3RMI.xml | 32 --- uddi-tck-runner/pom.xml | 2 +- .../main/java/org/apache/juddi/tckrunner/App.java | 2 - uddi-tck-runner/tck.properties | 4 +- uddi-tck/juddi_install_data_node2/UDDI_tModels.xml | 25 +-- uddi-tck/pom.xml | 4 +- ...091_RMISubscriptionListenerIntegrationTest.java | 186 ----------------- .../juddi/v3/tck/UDDI_090_RMIIntegrationTest.java | 188 ------------------ uddi-ws/pom.xml | 2 +- 166 files changed, 1028 insertions(+), 2824 deletions(-) diff --cc pom.xml index 32e797a39,362f4ada3..c2127df59 --- a/pom.xml +++ b/pom.xml @@@ -44,12 -43,11 +43,12 @@@ under the License <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <cxf.version>3.3.4</cxf.version> - <springframework.version>5.2.3.RELEASE</springframework.version> - <apache.tomcat.version>9.0.30</apache.tomcat.version> + <springframework.version>5.2.4.RELEASE</springframework.version> + <apache.tomcat.version>9.0.37</apache.tomcat.version> <jacoco.it.execution.data.file>${project.build.directory}/coverage-reports/jacoco-it.exec</jacoco.it.execution.data.file> <jacoco.ut.execution.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec</jacoco.ut.execution.data.file> - + <timestamp>${maven.build.timestamp}</timestamp> + <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format> </properties> <issueManagement> @@@ -936,6 -858,13 +941,13 @@@ <url>https://repo1.maven.org/maven2</url> <layout>default</layout> </repository> + - <repository> ++ <repository> + <id>central1</id> + <name>Maven Central Repository</name> + <url>https://repo.maven.org/maven2</url> + <layout>default</layout> + </repository> <repository> <id>jboss3</id> <name>JBoss 3rd Party</name> @@@ -946,15 -875,55 +958,64 @@@ <profiles> - <profile> - <id>prepare-site</id> - <activation> - <file> - <exists>src/site/site.xml</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - <!-- force the juddi docs module to build --> - <dependency> - <groupId>org.apache.juddi.juddi-docs</groupId> - <artifactId>juddi-docs</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> - - </dependencies> - <executions> - <execution> - <phase>site</phase> - <configuration> - <target> - - - <copy todir="target/site/docs/3.3/juddi-client-guide/"> - <fileset dir="docs/asciidoc/ClientGuide/target/docbook/publish/en-US" /> - </copy> - - <copy todir="target/site/docs/3.3/juddi-guide/"> - <fileset dir="docs/asciidoc/Guide/target/docbook/publish/en-US" /> - </copy> - - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - ++ <profile> ++ <id>prepare-site</id> ++ <activation> ++ <file> ++ <exists>src/site/site.xml</exists> ++ </file> ++ </activation> ++ <build> ++ <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-antrun-plugin</artifactId> ++ <dependencies> ++ <!-- force the juddi docs module to build --> ++ <dependency> ++ <groupId>org.apache.juddi.juddi-docs</groupId> ++ <artifactId>juddi-docs</artifactId> ++ <version>${project.version}</version> ++ <type>pom</type> ++ </dependency> ++ ++ </dependencies> ++ <executions> ++ <execution> ++ <phase>site</phase> ++ <configuration> ++ <target> ++ ++ ++ <copy todir="target/site/docs/3.3/juddi-client-guide/"> ++ <fileset dir="docs/asciidoc/ClientGuide/target/docbook/publish/en-US" /> ++ </copy> ++ ++ <copy todir="target/site/docs/3.3/juddi-guide/"> ++ <fileset dir="docs/asciidoc/Guide/target/docbook/publish/en-US" /> ++ </copy> ++ ++ </target> ++ </configuration> ++ <goals> ++ <goal>run</goal> ++ </goals> ++ </execution> ++ </executions> ++ </plugin> ++ </plugins> ++ </build> ++ </profile> ++ + <profile> + <id>doclint-java8-disable</id> + <activation> + <jdk>[1.8,)</jdk> + </activation> + <properties> + <javadoc.extra.settings>-Xdoclint:none</javadoc.extra.settings> + </properties> + </profile> <!-- inherit from the apache parent: release-profile --> <profile> @@@ -1017,7 -986,7 +1078,7 @@@ <plugin> <inherited>true</inherited> <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-deploy-plugin</artifactId> ++ <artifactId>maven-deploy-plugin</artifactId> <configuration> <updateReleaseInfo>true</updateReleaseInfo> </configuration> @@@ -1053,6 -1022,6 +1114,7 @@@ <configuration> <excludes> <exclude>**/*.nupkg</exclude> ++ <exclude>.github/**/*.*</exclude> <exclude>**/*.psd</exclude> <exclude>**/*.ddl</exclude> <exclude>Doxyfile</exclude> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
