You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2022/05/16 02:12:42 UTC
[juddi] 01/01: Merge branch 'feature/JUDDI-978' into test/testmerge resolves all ci/testing isssues
This is an automated email from the ASF dual-hosted git repository.
alexoree pushed a commit to branch test/testmerge
in repository https://gitbox.apache.org/repos/asf/juddi.git
commit eab4a7e307b904ff13b465b07162769028cc813c
Merge: df8c64812 fde14da9b
Author: Alex O'Ree <al...@apache.org>
AuthorDate: Sun May 15 22:12:35 2022 -0400
Merge branch 'feature/JUDDI-978' into test/testmerge
resolves all ci/testing isssues
docs/asciidoc/.gitignore | 6 -
docs/asciidoc/ClientGuide/.gitignore | 6 -
.../ClientGuide/en-US/ClientGuide-docinfo.xml | 56 ---
.../ClientGuide/en-US/ClientGuide.asciidoc | 95 -----
docs/asciidoc/ClientGuide/en-US/Guardfile | 13 -
docs/asciidoc/ClientGuide/en-US/_Sidebar.asciidoc | 15 -
docs/asciidoc/ClientGuide/en-US/asciidoctor.css | 80 -----
docs/asciidoc/ClientGuide/pom.xml | 209 -----------
docs/asciidoc/Guide/.gitignore | 6 -
docs/asciidoc/Guide/en-US/Guardfile | 14 -
docs/asciidoc/Guide/en-US/Guide-docinfo.xml | 56 ---
docs/asciidoc/Guide/en-US/Guide.asciidoc | 107 ------
.../en-US/GuideUDDIRegistryIntroduction.asciidoc | 109 ------
docs/asciidoc/Guide/en-US/_Sidebar.asciidoc | 15 -
docs/asciidoc/Guide/en-US/asciidoctor.css | 80 -----
docs/asciidoc/Guide/pom.xml | 207 -----------
docs/asciidoc/Home.asciidoc | 8 -
docs/asciidoc/Readme.asciidoc | 58 ----
docs/asciidoc/pom.xml | 42 ---
docs/dist/.gitignore | 6 -
docs/dist/assembly.xml | 72 ----
docs/dist/pom.xml | 66 ----
docs/pom.xml | 1 -
juddi-core-openjpa/pom.xml | 44 ++-
juddi-dist/pom.xml | 9 -
juddi-rest-cxf/pom.xml | 3 +
pom.xml | 293 ++++++++++++----
src/site/markdown/ClientGuide.md | 9 +
.../site/markdown/ClientGuideKeyFormatTemplates.md | 85 +++--
.../ClientGuideMappingWADLandWSDLtoUDDI.md | 26 +-
.../ClientGuideSimplePublishingUsingthejUDDIAPI.md | 235 ++++++-------
.../site/markdown/ClientGuideTCKRunner.md | 40 +--
.../site/markdown/ClientGuideUDDIMigrationTool.md | 30 +-
.../site/markdown/ClientGuideUDDIv2Services.md | 25 +-
...deUsingUDDIAnnotationstoAutomateRegistration.md | 72 ++--
.../markdown/ClientGuideUsingjUDDIRestServices.md | 93 ++---
.../site/markdown/ClientGuideUsingthejUDDIGUI.md | 221 ++++--------
.../ClientGuidejUDDIClientConfigurationGuide.md | 100 +++---
.../site/markdown/ClientGuidejUDDIClientforNET.md | 28 +-
src/site/markdown/Guide.md | 9 +
.../site/markdown/GuideAdministration.md | 385 ++++++++++++---------
.../site/markdown/GuideArchitecture.md | 37 +-
.../site/markdown/GuideConfigurationServer.md | 175 +++++-----
.../site/markdown/GuideContributingtojUDDI.md | 89 ++---
.../site/markdown/GuideExtendingUDDI.md | 35 +-
.../site/markdown/GuideGettingStarted.md | 81 ++---
.../site/markdown/GuideHowToDeployjUDDITo.md | 151 ++++----
.../site/markdown/GuideReplication.md | 52 +--
.../site/markdown/GuideRootSeedData.md | 47 ++-
.../site/markdown/GuideTroubleshootingjUDDI.md | 24 +-
src/site/markdown/GuideUDDIRegistryIntroduction.md | 101 ++++++
.../site/markdown/GuideUDDISubscriptions.md | 77 +++--
.../markdown/GuideUsingDigitalSignaturesinUDDI.md | 12 +-
src/site/pdf-client.xml | 56 +++
src/site/pdf-server.xml | 58 ++++
.../images/GettingStarted-add_publisher.png | Bin
.../images/GettingStarted-authToken_SoapUI.png | Bin
.../images/GettingStarted-create_business.png | Bin
.../images/GettingStarted-create_keygenerator.png | Bin
.../images/GettingStarted-form_login.png | Bin
.../images/GettingStarted-happy_juddi.png | Bin
.../images/GettingStarted-jUDDI_admin.png | Bin
.../images/GettingStarted-jUDDI_welcome.png | Bin
.../images/GettingStarted-juddi_services.png | Bin
.../images/UDDI_Registry_invocation_pattern.png | Bin
.../resources}/images/UDDI_services_overview.png | Bin
.../resources}/images/a_bothup_b_sales_down.png | Bin
.../resources}/images/community/community_doc.png | Bin
.../resources}/images/community/jbossorglogo.png | Bin
.../site/resources}/images/community/title_hdr.png | Bin
.../resources}/images/create_new_subscription.png | Bin
.../site/resources}/images/icon.svg | 0
.../resources}/images/jUDDIArchitecture_Gui.png | Bin
.../images/jUDDIArchitecture_clientAndGui.png | Bin
.../resources}/images/jUDDIArchitecture_server.png | Bin
.../images/jUDDIbyKimWood300x300ish - Copy.png | Bin 0 -> 37799 bytes
.../resources}/images/juddi-admin-configure.png | Bin
.../site/resources}/images/juddi-admin-home.png | Bin
.../resources}/images/juddi-admin-juddiapi.png | Bin
.../site/resources}/images/juddi-admin-mbeans.png | Bin
.../site/resources}/images/juddi-admin-stats.png | Bin
.../site/resources}/images/juddi-admin-status.png | Bin
.../images/juddi-gui-browse-business.png | Bin
.../images/juddi-gui-browse-business2.png | Bin
.../resources}/images/juddi-gui-browse-options.png | Bin
.../images/juddi-gui-browse-services.png | Bin
.../resources}/images/juddi-gui-browse-tmodel.png | Bin
.../images/juddi-gui-create-business.png | Bin
.../images/juddi-gui-create-business2.png | Bin
.../images/juddi-gui-create-business3.png | Bin
.../images/juddi-gui-fullbootstrap-menu.png | Bin
.../resources}/images/juddi-gui-import-wsdl.png | Bin
.../resources}/images/juddi-gui-login-warning.png | Bin
.../site/resources}/images/juddi-gui-menu.png | Bin
.../site/resources}/images/juddi-gui-mybuz.png | Bin
.../resources}/images/juddi-gui-nodeswitcher.png | Bin
.../images/juddi-gui-publisherassertion.png | Bin
.../images/juddi-gui-publisherassertion2.png | Bin
.../images/juddi-gui-publisherassertion3.png | Bin
.../site/resources}/images/juddi-gui-search.png | Bin
.../resources}/images/juddi-gui-service-add1.png | Bin
.../resources}/images/juddi-gui-service-add2.png | Bin
.../site/resources}/images/juddi-gui-sign1.png | Bin
.../site/resources}/images/juddi-gui-sign2.png | Bin
.../resources}/images/juddi-gui-signed-invalid.png | Bin
.../resources}/images/juddi-gui-signed-valid.png | Bin
.../resources}/images/juddi-gui-signerpanel1.png | Bin
.../resources}/images/juddi-gui-signerpanel2.png | Bin
.../resources}/images/juddi-gui-signerpanel3.png | Bin
.../images/juddi-gui-subscription-view.png | Bin
.../resources}/images/juddi-gui-subscription1.png | Bin
.../resources}/images/juddi-gui-subscription2.png | Bin
.../resources}/images/juddi-gui-subscription2a.png | Bin
.../resources}/images/juddi-gui-subscription3.png | Bin
.../resources}/images/juddi-gui-subscription4.png | Bin
.../resources}/images/juddi-gui-subscription5.png | Bin
.../resources}/images/juddi-gui-subscription6.png | Bin
.../images/juddi-gui-tabletbootstrap-menu.png | Bin
.../resources}/images/juddi-gui-tmodel-keygen.png | Bin
.../site/resources}/images/juddi-gui-transfer.png | Bin
.../site/resources}/images/juddi-gui-welcome.png | Bin
.../images/marketing_node_installation.png | Bin
.../site/resources}/images/marketing_services.png | Bin
.../resources}/images/newly_saved_subscription.png | Bin
...L_response_synchronous_subscription_request.png | Bin
.../images/registration_by_annotation.png | Bin
.../resources}/images/registry_info_helloworld.png | Bin
.../resources}/images/sales_node_installation.png | Bin
.../site/resources}/images/sales_services.png | Bin
.../site/resources}/images/set_coverage_period.png | Bin
.../resources}/images/subscriptions_portal.png | Bin
.../resources}/images/uddi_core_datastructures.gif | Bin
src/site/site.xml | 38 ++
uddi-client-dist/pom.xml | 17 +-
134 files changed, 1598 insertions(+), 2486 deletions(-)
diff --cc juddi-core-openjpa/pom.xml
index e2adb03ff,e2adb03ff..b59823394
--- a/juddi-core-openjpa/pom.xml
+++ b/juddi-core-openjpa/pom.xml
@@@ -59,10 -59,10 +59,42 @@@
</instructions>
</configuration>
</plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-antrun-plugin</artifactId>
++ <version>1.8</version>
++ <executions>
++ <execution>
++ <phase>process-classes</phase>
++ <configuration>
++ <tasks>
++ <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask"
++ classpathref="maven.compile.classpath"/>
++
++ <openjpac>
++ <config propertiesFile = "${basedir}/src/test/resources/META-INF/persistence.xml"/>
++ <classpath refid="maven.compile.classpath"/>
++ </openjpac>
++ </tasks>
++ </configuration>
++ <goals>
++ <goal>run</goal>
++ </goals>
++ </execution>
++ </executions>
++ </plugin>
++<!--
++DISABLED, something screwy happens with either
++- javadoc jar
++- source jar
++- maven site jar (probably this one)
++
++and this plugin...it gets confused and doesn't actually enhance the classes
++
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
-- <version>3.1.0</version>
++ <version>3.2.2</version>
<configuration>
<includes>**/org/apache/juddi/model/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@@ -82,11 -82,11 +114,11 @@@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
-- <version>3.1.0</version>
++ <version>3.2.2</version>
</dependency>
</dependencies>
</plugin>
--
++-->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version>
@@@ -109,7 -109,7 +141,7 @@@
</filesets>
</configuration>
</plugin>
--
++
</plugins>
</build>
<dependencies>
@@@ -140,11 -140,11 +172,11 @@@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
-- <version>2.3.0</version>
++ <version>3.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
-- <artifactId>geronimo-jpa_2.0_spec</artifactId>
++ <artifactId>geronimo-jpa_2.2_spec</artifactId>
<version>1.1</version>
</dependency>
<dependency>
diff --cc juddi-rest-cxf/pom.xml
index 7c161cffd,7c161cffd..b2f5cbd97
--- a/juddi-rest-cxf/pom.xml
+++ b/juddi-rest-cxf/pom.xml
@@@ -105,6 -105,6 +105,7 @@@
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId>
++ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@@ -116,11 -116,11 +117,13 @@@
<artifactId>cglib</artifactId>
</exclusion>
</exclusions>
++ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>4.3.6.Final</version>
++ <scope>provided</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
diff --cc pom.xml
index 23261cac9,957781134..a4394f6fa
--- a/pom.xml
+++ b/pom.xml
@@@ -466,6 -468,83 +468,85 @@@ under the License
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>com.github.spyhunter99</groupId>
+ <artifactId>maven-pdf-plugin</artifactId>
+ <version>1.5.0.8</version>
+ <executions>
+ <execution>
+ <id>pdf-user</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>pdf</goal>
+ </goals>
++ <inherited>false</inherited>
+ <configuration>
++
+ <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
+ <includeReports>false</includeReports>
+ <docDescriptor>src/site/pdf-client.xml</docDescriptor>
+
+ <!-- optional, the title of a doc defined in pdf-user that is rendered before the TOC
+ <executiveSummaryName>EXSUM</executiveSummaryName>-->
+ <!-- optional, a header only on the title page-->
+ <titleHeader>Apache Software Foundation</titleHeader>
+
+ <!-- optional, the distribution statement is printed on the title page towards the bottom, common use case:
+ confidentiality statements, limited distribution, legalese and other mumbo jumbo.
+ <distributionStatement>DISTRIBUTION STATEMENT: Feel free to give this document to anyone you will take it.</distributionStatement>
+ -->
+ <!-- optional, these header/footer definitions are used on all pages exception the title page -->
+ <pdfFooter>Apache jUDDI
+ Version ${project.version}
+ ${timestamp}</pdfFooter>
+ <pdfHeader>Apache jUDDI
+ Version ${project.version}
+ ${timestamp}</pdfHeader>
+
+
+ <!-- optional, the max depth of the TOC -->
+ <tocMaxDepthToPrint>4</tocMaxDepthToPrint>
+ </configuration>
+ </execution>
+ <execution>
+ <id>pdf-server</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>pdf</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
+ <includeReports>false</includeReports>
+ <docDescriptor>src/site/pdf-server.xml</docDescriptor>
+
+ <!-- optional, the title of a doc defined in pdf-user that is rendered before the TOC
+ <executiveSummaryName>EXSUM</executiveSummaryName>-->
+ <!-- optional, a header only on the title page-->
+ <titleHeader>Apache Software Foundation</titleHeader>
+
+ <!-- optional, the distribution statement is printed on the title page towards the bottom, common use case:
+ confidentiality statements, limited distribution, legalese and other mumbo jumbo.
+ <distributionStatement>DISTRIBUTION STATEMENT: Feel free to give this document to anyone you will take it.</distributionStatement>
+ -->
+ <!-- optional, these header/footer definitions are used on all pages exception the title page -->
+ <pdfFooter>Apache jUDDI - https://juddi.apache.org
+ Version ${project.version}
+ ${timestamp}</pdfFooter>
+ <pdfHeader>Apache jUDDI
+ Version ${project.version}
+ ${timestamp}</pdfHeader>
+
+
+ <!-- optional, the max depth of the TOC -->
+ <tocMaxDepthToPrint>4</tocMaxDepthToPrint>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
+
</plugins>
</build>
<reporting>
@@@ -482,7 -561,7 +563,7 @@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
-- <version>2.9</version>
++ <version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@@ -640,7 -713,7 +715,7 @@@
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId>
-- <version>1.0.0.Final</version>
++ <version>1.0.2.Final</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@@ -858,12 -931,12 +933,7 @@@
<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>
@@@ -952,6 -985,116 +982,117 @@@
</modules>
<build>
<plugins>
+
+ <plugin>
+ <groupId>com.github.spyhunter99</groupId>
+ <artifactId>maven-pdf-plugin</artifactId>
+ <version>1.5.0.8</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>pdf-client</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>pdf</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
+ <includeReports>false</includeReports>
+ <docDescriptor>src/site/pdf-client.xml</docDescriptor>
+
+
+ <pdfFooter>Version ${project.version}
+ ${timestamp}</pdfFooter>
+ <pdfHeader>jUDDI Client Guide</pdfHeader>
+
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>pdf-server</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>pdf</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
+ <includeReports>false</includeReports>
+ <docDescriptor>src/site/pdf-server.xml</docDescriptor>
+
+ <pdfFooter>Version ${project.version}
+ ${timestamp}</pdfFooter>
+ <pdfHeader>jUDDI Server Guide</pdfHeader>
+
+
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>pack-site</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>site</goal>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <attach>false</attach>
+ </configuration>
++ <inherited>false</inherited>
+ </execution>
+ </executions>
+ </plugin>
+ <!--
+ <plugin>
+ <groupId>com.coderplus.maven.plugins</groupId>
+ <artifactId>copy-rename-maven-plugin</artifactId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <id>rename-file</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+ <sourceFile>${project.build.directory}/${project.build.finalName}-site.jar</sourceFile>
+ <destinationFile>${project.build.directory}/${project.build.finalName}-site.zip</destinationFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.10</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/${project.build.finalName}-site.zip</file>
+ <type>zip</type>
+ <classifier>site</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+
+
<!-- Create a source-release artifact that contains the fully buildable
project directory source structure. This is the artifact which is the official
subject of any release vote. -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org