[SCOUT-133] updates site definitions to match jUDDI's theming and corrects release version [SCOUT-132] fixes debug statements[SCOUT-132] fixes debug statements [SCOUT-133] updates site definitions to match jUDDI's theming and corrects release version [SCOUT-134] updates all dependencies and code to match 3.1.5 juddi apis [SCOUT-135] resolves mappings issues with address line [SCOUT-136] resolves issues with sort by name with findbinding NOJIRA signing key
Project: http://git-wip-us.apache.org/repos/asf/juddi-scout/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi-scout/commit/8836df0d Tree: http://git-wip-us.apache.org/repos/asf/juddi-scout/tree/8836df0d Diff: http://git-wip-us.apache.org/repos/asf/juddi-scout/diff/8836df0d Branch: refs/heads/master Commit: 8836df0d62819c773fed7ce6846fd2c2996af6e5 Parents: 2381cd3 Author: Alex O'Ree <[email protected]> Authored: Sat Nov 24 15:56:40 2018 -0500 Committer: Alex O'Ree <[email protected]> Committed: Sat Nov 24 15:56:40 2018 -0500 ---------------------------------------------------------------------- .gitattributes | 1 + .gitignore | 22 + KEYS | 34 + README | 9 + pom.xml | 1612 +++++++++--------- server.xml | 123 +- .../registry/BusinessLifeCycleManagerImpl.java | 8 +- .../BusinessLifeCycleManagerV3Impl.java | 8 +- .../ws/scout/registry/ConnectionImpl.java | 6 +- .../org/apache/ws/scout/registry/Constants.java | 36 +- .../apache/ws/scout/registry/IRegistryV3.java | 10 +- .../ws/scout/registry/RegistryV3Impl.java | 18 +- .../ws/scout/registry/infomodel/KeyImpl.java | 2 +- .../apache/ws/scout/util/EnumerationHelper.java | 6 +- .../ws/scout/util/ScoutJaxrUddiHelper.java | 971 +++++------ .../ws/scout/util/ScoutJaxrUddiV3Helper.java | 1031 +++++------ .../ws/scout/util/ScoutUddiJaxrHelper.java | 2 +- .../ws/scout/util/ScoutUddiV3JaxrHelper.java | 2 +- src/site/site.xml | 31 +- src/site/xdoc/releases.xml | 5 + src/test/java/org/apache/ws/scout/Finder.java | 2 - .../registry/qa/JAXR010OrganizationTest.java | 122 +- .../registry/qa/JAXR015PrimaryContactTest.java | 276 +-- .../registry/qa/JAXR030AssociationsTest.java | 2 + .../registry/qa/JAXR050ServiceBindingTest.java | 47 +- .../scout/registry/qa/JAXR060RegistryTest.java | 189 +- src/test/resources/META-INF/jaxr-uddi.xml | 4 +- 27 files changed, 2488 insertions(+), 2091 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi-scout/blob/8836df0d/.gitattributes ---------------------------------------------------------------------- diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..2125666 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto \ No newline at end of file http://git-wip-us.apache.org/repos/asf/juddi-scout/blob/8836df0d/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d4954dd --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +target +**/target/* +**/derby.log +**/.project +**/.classpath +**/.settings/ +.gradle/ +.svn/ +.idea +**/*.iml +docs/db/ddl/*.ddl +*.ddl +uddi-tck/pref-rpt-*.txt +nb-configuration.xml +*.orig +uddi-tck/drivers/ +*.releaseBackup +*.versionsBackup +**/bin/Debug/* +**/obj/** +*.suo +juddi-client.net/.vs/juddi-client.net/v15/** http://git-wip-us.apache.org/repos/asf/juddi-scout/blob/8836df0d/KEYS ---------------------------------------------------------------------- diff --git a/KEYS b/KEYS index 17bdcde..e3b0a17 100644 --- a/KEYS +++ b/KEYS @@ -62,3 +62,37 @@ iE8EGBECAA8FAki15YMCGwwFCQHhM4AACgkQdjn0gpJC6Z611ACgoBYBiPkeKig7 f+bKmTLT7oLzf+sAoIeCfFt8vA6ovF3RkvN05O65WPcD =5V68 -----END PGP PUBLIC KEY BLOCK----- + + +pub rsa4096 2018-11-23 [SC] [expires: 2023-11-22] + 3A1AAFA9B89A1D1DDD5F3A4B98AD2E19BFF4106D +uid [ultimate] Alex O'Ree <[email protected]> +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFv3+7oBEADXMQXwYMxs45ePjno3XcOouM5NMCYsKk6qmrCBr2ffLLTPER6M +9KtyYAqCqe1DQmB0BRau1GuBRN6mydzILjVaJ6B1S+SsDGHOTDpTVyKUKSkQ292X +KzGq3w5xqvQ1ZP1Iob38XvGQDR2vKnqDeZhVcCsDrbMPBpO3bxCCwrztwHogGZiA +wejypOGlYz3stRY7SKvFkuuH75An6KGx/C9VDh8EH0tUT3hQ09On1/m6+I/8X3YR +WUhCj5WuUg9oaI0MCd9CjgKRH7PEnemFhb1iXBxcOn8vC8hRmYqsl54gIhfF9T8P +HdyTfqji7AKNu3zz3yiiaqlteZewxFyjhwnjvmJMQ+D5Mt9ZfexuDIMY7319psiY +w8x8CuDb1NPq3vR/P0oo5baldIk2r3K0uOdXBGOls1bbqUTv2V+fFdAzk7qC+kxU +PrEpkFKMKd2jtkcO/0Qfgn5r5r7aU1AyGRbXT7fySMT2/6GFu4XSrVWBtjFP9u7F +5ELb19dFaQk6eUCr+ZMTwz5TP6pajDp3NSBX+lXZipYHQEIcwk0P8kSwHwqVUhgr +uAlyy5E/bvmBxX0nFZVbGwlUedT2OkwhU2FeQKfMG9Ohimpx0qK0XQbRRAaJ8AI9 +ws3rC/RkPdfOZvgIdGScf+aNJNb9/5pnSUx+bpBppg7MhbWTnRkkCR1qsQARAQAB +tCBBbGV4IE8nUmVlIDxhbGV4b3JlZUBhcGFjaGUub3JnPokCVAQTAQgAPhYhBDoa +r6m4mh0d3V86S5itLhm/9BBtBQJb9/u6AhsDBQkJZgGABQsJCAcCBhUKCQgLAgQW +AgMBAh4BAheAAAoJEJitLhm/9BBt8jEQAKU8DFRyiVFVK+k+TwVIFgS7ZF3uV48p +6I6VSCZUQsWYJWu0LnT8k/vi1lSz3i4080J5vB/8pkuYtJW3Bfv15BcZ6xDg9Asm +XcAvt/sS315x+TyjBeqvfi3yJEVlCySduc3PeoMVLOZmtPcmbeajAmHh9P1TkZ7g +f9sXtdzXrnViwMYMs+CN91qlWCfZJopfomEf1aazhJixYfjjh12wwSfLRsa7cHWd +XeuTdXg7xAOnegLLdfzgzpQdRC67QM6K6GmucqY0dCKIWIgN1UuV5n33336fI0WB +RR+LKGTZK39l2ddh0iizurJO9QYM4m8FmhVmym2e/2ClY3N1QniXU1a8ZGIPlSIS +/tbyMYXt+3CiP9P+nyrQKoilCX54L1RdwOrDb7Z1B4DnQqls6MrdEphHtZMdDkeX +INBX9q3P7J4SrwA5xAbvevaVHJ5mk7rgmG2V1FVGmDeX8ACF4ONfOs4T4C1bTMhw +SOM+ulVAtr1nsrDZWO7/Kv9LlVXr1/pbOZuRp6ioveQlZZNzzfjLm4WxpeTqeQ4w +PJzYFhDkrJXyb4GOhnsyVyHclxnMWP3xB0iV4BFyY92SMIPfnaoLoI4sBui+Ua7i +PUwMIH473BaLm7fvqothns0DAmXYd+VKpAx0zta0ucya0wtBXY0xaz7h4vVHB6zJ +Ui44RuYe758D +=LGw7 +-----END PGP PUBLIC KEY BLOCK----- http://git-wip-us.apache.org/repos/asf/juddi-scout/blob/8836df0d/README ---------------------------------------------------------------------- diff --git a/README b/README index dfdf991..ed3827e 100644 --- a/README +++ b/README @@ -87,6 +87,15 @@ SUPPORT [email protected] +Release Notes - Scout - Version 1.2.8 + +Bug + + [SCOUT-136] - Scout adds sort by name desc to findBinding UDDI requests, which is invalid + [SCOUT-135] - Fix for mismatch with UDDI Address Line + [SCOUT-134] - Updates dependencies and code to match the jUDDI 3.1.5 APIs + + Release Notes - Scout - Version 1.2.7 Bug http://git-wip-us.apache.org/repos/asf/juddi-scout/blob/8836df0d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a9bb06c..64814fb 100644 --- a/pom.xml +++ b/pom.xml @@ -1,825 +1,867 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>6</version> - </parent> - <groupId>org.apache.juddi.scout</groupId> - <artifactId>scout</artifactId> - <version>1.2.8-SNAPSHOT</version> - <packaging>bundle</packaging> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>19</version> + </parent> + <groupId>org.apache.juddi.scout</groupId> + <artifactId>scout</artifactId> + <version>1.2.8-SNAPSHOT</version> + <packaging>jar</packaging> - <properties> - <juddi.registry.version>3.1.3</juddi.registry.version> - </properties> + <properties> + <javadoc.extra.settings /> + <juddi.registry.version>3.3.6-SNAPSHOT</juddi.registry.version> + </properties> - <prerequisites> - <maven>3.0.3</maven> - </prerequisites> - <name>Apache Scout</name> - <description> + <name>Apache Scout</name> + <description> Apache Scout is an implementation of the JSR 93 - JavaTM API for XML Registries 1.0 (JAXR) </description> - <url>http://juddi.apache.org/scout/</url> - <issueManagement> - <system>JIRA</system> - <url>http://issues.apache.org/jira/browse/SCOUT</url> - </issueManagement> - <ciManagement> - <system>Continuum</system> - <url>http://vmbuild.apache.org</url> - <notifiers> - <notifier> - <sendOnError>true</sendOnError> - <sendOnFailure>true</sendOnFailure> - <sendOnSuccess>true</sendOnSuccess> - <sendOnWarning>true</sendOnWarning> - <configuration> - <address>[email protected]</address> - </configuration> - </notifier> - </notifiers> - </ciManagement> - <inceptionYear>2004</inceptionYear> - <mailingLists> - <mailingList> - <name>jUDDI/Scout Developers</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> - <archive>http://mail-archives.apache.org/mod_mbox/juddi-dev/</archive> - </mailingList> - </mailingLists> - <developers> - <developer> - <id>anil</id> - <name>Anil Saldhana</name> - <email>[email protected]</email> - <organization /> - </developer> - <developer> - <id>djencks</id> - <name>David Jencks</name> - <email>[email protected]</email> - <organization /> - </developer> - <developer> - <id>kstam</id> - <name>Kurt T Stam</name> - <email>[email protected]</email> - <organization /> - </developer> - <developer> - <id>jfaath</id> - <name>Jeff Faath</name> - <email>[email protected]</email> - <organization /> - </developer> - <developer> - <name>Steve Viens</name> - <email>[email protected]</email> - <organization /> - </developer> - <developer> - <id>tcunning</id> - <name>Tom Cunningham</name> - <email>[email protected]</email> - <organization /> - </developer> - </developers> - <contributors> - <contributor> - <name>Deepack Bhole</name> - <email>[email protected]</email> - <organization /> - </contributor> - <contributor> - <name>Davanum Srinivas</name> - <email>[email protected]</email> - <organization /> - </contributor> - <contributor> - <name>Geir Magnusson Jr.</name> - <email>[email protected]</email> - <organization /> - </contributor> - <contributor> - <name>Lin Sun</name> - <email>[email protected]</email> - <organization /> - </contributor> - <contributor> - <name>Jarek Gawor</name> - <email>[email protected]</email> - <organization /> - </contributor> - <contributor> - <name>Jeremy Boynes</name> - <email>[email protected]</email> - <organization /> - </contributor> - </contributors> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <connection>scm:svn:https://svn.apache.org/repos/asf/juddi/scout/trunk</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/juddi/scout/trunk</developerConnection> - <url>http://svn.apache.org/viewcvs.cgi/juddi/scout/trunk</url> - </scm> - <dependencies> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-activation_1.1_spec</artifactId> - <version>1.0.2</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxb_2.1_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxr_1.0_spec</artifactId> - <version>2.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxrpc_1.1_spec</artifactId> - <version>2.0.0</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-saaj_1.3_spec</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> - <version>1.0.1</version> - </dependency> + <url>http://juddi.apache.org/scout/</url> + <issueManagement> + <system>JIRA</system> + <url>http://issues.apache.org/jira/browse/SCOUT</url> + </issueManagement> + <ciManagement> + <system>Continuum</system> + <url>http://vmbuild.apache.org</url> + <notifiers> + <notifier> + <sendOnError>true</sendOnError> + <sendOnFailure>true</sendOnFailure> + <sendOnSuccess>true</sendOnSuccess> + <sendOnWarning>true</sendOnWarning> + <configuration> + <address>[email protected]</address> + </configuration> + </notifier> + </notifiers> + </ciManagement> + <inceptionYear>2004</inceptionYear> + <mailingLists> + <mailingList> + <name>jUDDI/Scout Developers</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + <archive>http://mail-archives.apache.org/mod_mbox/juddi-dev/</archive> + </mailingList> + </mailingLists> + <developers> + <developer> + <id>anil</id> + <name>Anil Saldhana</name> + <email>[email protected]</email> + <organization /> + </developer> + <developer> + <id>djencks</id> + <name>David Jencks</name> + <email>[email protected]</email> + <organization /> + </developer> + <developer> + <id>kstam</id> + <name>Kurt T Stam</name> + <email>[email protected]</email> + <organization /> + </developer> + <developer> + <id>jfaath</id> + <name>Jeff Faath</name> + <email>[email protected]</email> + <organization /> + </developer> + <developer> + <name>Steve Viens</name> + <email>[email protected]</email> + <organization /> + </developer> + <developer> + <id>tcunning</id> + <name>Tom Cunningham</name> + <email>[email protected]</email> + <organization /> + </developer> + </developers> + <contributors> + <contributor> + <name>Deepack Bhole</name> + <email>[email protected]</email> + <organization /> + </contributor> + <contributor> + <name>Davanum Srinivas</name> + <email>[email protected]</email> + <organization /> + </contributor> + <contributor> + <name>Geir Magnusson Jr.</name> + <email>[email protected]</email> + <organization /> + </contributor> + <contributor> + <name>Lin Sun</name> + <email>[email protected]</email> + <organization /> + </contributor> + <contributor> + <name>Jarek Gawor</name> + <email>[email protected]</email> + <organization /> + </contributor> + <contributor> + <name>Jeremy Boynes</name> + <email>[email protected]</email> + <organization /> + </contributor> + </contributors> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <connection>scm:svn:https://svn.apache.org/repos/asf/juddi/scout/trunk</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/juddi/scout/trunk</developerConnection> + <url>http://svn.apache.org/viewcvs.cgi/juddi/scout/trunk</url> + </scm> + <dependencies> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + <version>1.0.2</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxb_2.1_spec</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxr_1.0_spec</artifactId> + <version>2.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxrpc_1.1_spec</artifactId> + <version>2.0.0</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-saaj_1.3_spec</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + <version>1.0.1</version> + </dependency> - <dependency> - <groupId>axis</groupId> - <artifactId>axis</artifactId> - <version>1.4</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>org.apache.axis</groupId> - <artifactId>axis-jaxrpc</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.axis</groupId> - <artifactId>axis-saaj</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.axis</groupId> - <artifactId>axis-wsdl4j</artifactId> - </exclusion> - <exclusion> - <groupId>commons-discovery</groupId> - <artifactId>commons-discovery</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>axis</groupId> - <artifactId>axis-saaj</artifactId> - <version>1.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>axis</groupId> - <artifactId>axis-jaxrpc</artifactId> - <version>1.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-discovery</groupId> - <artifactId>commons-discovery</artifactId> - <version>0.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>logkit</groupId> - <artifactId>logkit</artifactId> - </exclusion> - <exclusion> - <groupId>avalon-framework</groupId> - <artifactId>avalon-framework</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>juddi-client</artifactId> - <version>${juddi.registry.version}</version> - </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis</artifactId> + <version>1.4</version> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>org.apache.axis</groupId> + <artifactId>axis-jaxrpc</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis</groupId> + <artifactId>axis-saaj</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis</groupId> + <artifactId>axis-wsdl4j</artifactId> + </exclusion> + <exclusion> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis-saaj</artifactId> + <version>1.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>axis</groupId> + <artifactId>axis-jaxrpc</artifactId> + <version>1.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>0.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + </exclusion> + <exclusion> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>juddi-client</artifactId> + <version>${juddi.registry.version}</version> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.5</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>10.1.2.1</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>10.14.2.0</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.13</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>1.6.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>aspectj</groupId> - <artifactId>aspectjweaver</artifactId> - <version>1.5.2</version> - <scope>test</scope> - </dependency> - </dependencies> - <repositories> - <repository> - <id>maven2-repository.dev.java.net</id> - <name>Java.net Maven 2 Repository</name> - <url>http://download.java.net/maven/2</url> - <layout>default</layout> - </repository> - <repository> - <id>apache.nexus</id> - <name>Apache NEXUS Maven 2 Repository</name> - <url>https://repository.apache.org/content/repositories/releases/</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>aspectj-maven-plugin</artifactId> - <version>1.3</version> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>1.6.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <version>1.5.2</version> + <scope>test</scope> + </dependency> + </dependencies> + <repositories> + <repository> + <id>maven2-repository.dev.java.net</id> + <name>Java.net Maven 2 Repository</name> + <url>http://download.java.net/maven/2</url> + <layout>default</layout> + </repository> + <repository> + <id>apache.nexus</id> + <name>Apache NEXUS Maven 2 Repository</name> + <url>https://repository.apache.org/content/repositories/releases/</url> + <layout>default</layout> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <aggregate>true</aggregate> + <additionalparam>${javadoc.extra.settings}</additionalparam> + </configuration> <executions> <execution> + <id>aggregate</id> <goals> - <goal>test-compile</goal> <!-- use this goal to weave all your test classes --> + <goal>aggregate</goal> </goals> + <phase>site</phase> </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.1</version> - <configuration> - <autoVersionSubmodules>true</autoVersionSubmodules> - <preparationGoals>clean install</preparationGoals> - <goals>deploy</goals> - <releaseProfiles>apache-release</releaseProfiles> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.6</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.6</version> + + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>aspectj-maven-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <goals> + <goal>test-compile</goal> <!-- use this goal to weave all your test classes --> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.1</version> + <configuration> + <autoVersionSubmodules>true</autoVersionSubmodules> + <preparationGoals>clean install</preparationGoals> + <goals>deploy</goals> + <releaseProfiles>apache-release</releaseProfiles> + </configuration> + </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M1</version> + <executions> + <execution> + <id>enforce-versions</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>validate</phase> + <configuration> + <rules> + <requireMavenVersion> + <version>[3.0.3,)</version> + </requireMavenVersion> + <requireJavaVersion> + <version>[1.5,)</version> + </requireJavaVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.0.0</version> - <extensions>true</extensions> - <configuration> - <instructions> - <Import-Package>org.apache.axis.*;resolution:=optional,*</Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>ianal-maven-plugin</artifactId> - <version>1.0-alpha-1</version> - </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.0.0</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Import-Package>org.apache.axis.*;resolution:=optional,*</Import-Package> + </instructions> + </configuration> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>ianal-maven-plugin</artifactId> + <version>1.0-alpha-1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.19.1</version> + </plugin> + </plugins> + </build> + <distributionManagement> + <site> + <id>website</id> + <url>scpexe://people.apache.org/www/juddi.apache.org/scout</url> + </site> + </distributionManagement> - </plugins> - </build> - <distributionManagement> - <site> - <id>website</id> - <url>scpexe://people.apache.org/www/juddi.apache.org/scout</url> - </site> - </distributionManagement> + <profiles> + <profile> + <id>doclint-java8-disable</id> + <activation> + <jdk>[1.8,)</jdk> + </activation> + - <profiles> - <profile> - <id>uddiv2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>juddi</artifactId> - <version>2.0.1</version> - <scope>test</scope> - </dependency> - <!-- have to figure out which dependencies of 3.0.2 make the uddiv2 build work --> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-ws</artifactId> - <version>3.0.2</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4</version> - <configuration> - <skip>true</skip> - <includes> - <include>**/*Test.java</include> - </includes> - <systemProperties> - <property> - <name>derby.stream.error.file</name> - <value>target/derby.log</value> - </property> - <property> - <name>java.io.tmpdir</name> - <value>${basedir}/temp</value> - </property> - </systemProperties> - <environmentVariables> - <uddi.version>2</uddi.version> - </environmentVariables> - </configuration> - <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - <systemProperties> - <property> - <name>cactus.contextURL</name> - <value>http://localhost:8880/juddi</value> - </property> - <property> - <name>java.io.tmpdir</name> - <value>${basedir}/temp</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>uddiv3</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>juddi-tomcat</artifactId> - <version>${juddi.registry.version}</version> - <scope>test</scope> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-ws</artifactId> - <version>${juddi.registry.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> - <executions> - <execution> - <id>copy</id> - <phase>package</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.juddi</groupId> - <artifactId>juddi-tomcat</artifactId> - <version>${juddi.registry.version}</version> - <type>zip</type> - <outputDirectory>${basedir}/target</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>test</id> - <phase>pre-integration-test</phase> - <configuration> - <tasks> - <unzip dest="target" src="target/juddi-tomcat-${juddi.registry.version}.zip" /> - <copy file="${basedir}/server.xml" todir="target/juddi-tomcat-${juddi.registry.version}/conf" overwrite="true" /> - <copy file="${basedir}/log4j.properties" todir="target/juddi-tomcat-${juddi.registry.version}/webapps/juddiv3/WEB-INF/classes" overwrite="true" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - <version>1.0</version> - <configuration> - <wait>false</wait> - <container> - <containerId>tomcat6x</containerId> - <home>${basedir}/target/juddi-tomcat-${juddi.registry.version}</home> - </container> - <configuration> - <type>existing</type> - <home>${project.build.directory}/juddi-tomcat-${juddi.registry.version}</home> - <properties> - <cargo.logging>high</cargo.logging> - <cargo.hostname>localhost</cargo.hostname> - <cargo.servlet.port>8880</cargo.servlet.port> - <cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M</cargo.jvmargs> - </properties> - </configuration> - </configuration> - <executions> - <execution> - <id>start-container</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start</goal> - </goals> - </execution> - <execution> - <id>stop-container</id> - <phase>post-integration-test</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> + <properties> + <javadoc.extra.settings>-Xdoclint:none</javadoc.extra.settings> + </properties> + </profile> + <profile> + <id>uddiv2</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>juddi</artifactId> + <version>2.0.1</version> + <scope>test</scope> + </dependency> + <!-- have to figure out which dependencies of 3.0.2 make the uddiv2 build work --> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-ws</artifactId> + <version>${juddi.registry.version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + <includes> + <include>**/*Test.java</include> + </includes> + <systemProperties> + <property> + <name>derby.stream.error.file</name> + <value>target/derby.log</value> + </property> + <property> + <name>java.io.tmpdir</name> + <value>${basedir}/temp</value> + </property> + </systemProperties> + <environmentVariables> + <uddi.version>2</uddi.version> + </environmentVariables> + </configuration> + <executions> + <execution> + <id>surefire-it</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <systemProperties> + <property> + <name>cactus.contextURL</name> + <value>http://localhost:8880/juddi</value> + </property> + <property> + <name>java.io.tmpdir</name> + <value>${basedir}/temp</value> + </property> + </systemProperties> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>uddiv3</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>juddi-tomcat</artifactId> + <version>${juddi.registry.version}</version> + <scope>test</scope> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-ws</artifactId> + <version>${juddi.registry.version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.juddi</groupId> + <artifactId>juddi-tomcat</artifactId> + <version>${juddi.registry.version}</version> + <type>zip</type> + <outputDirectory>${basedir}/target</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>test</id> + <phase>pre-integration-test</phase> + <configuration> + <tasks> + <unzip dest="target" src="target/juddi-tomcat-${juddi.registry.version}.zip" /> + <copy file="${basedir}/server.xml" todir="target/juddi-tomcat-${juddi.registry.version}/conf" overwrite="true" /> + <copy file="${basedir}/log4j.properties" todir="target/juddi-tomcat-${juddi.registry.version}/webapps/juddiv3/WEB-INF/classes" overwrite="true" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>1.7.0</version> + + <executions> + <execution> + <id>start-container</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start</goal> + </goals> + <configuration> + <wait>false</wait> + <container> + <containerId>tomcat9x</containerId> + <home>${basedir}/target/juddi-tomcat-${juddi.registry.version}</home> + </container> + <configuration> + <type>existing</type> + <home>${project.build.directory}/juddi-tomcat-${juddi.registry.version}</home> + <properties> + <cargo.logging>high</cargo.logging> + <cargo.hostname>localhost</cargo.hostname> + <cargo.servlet.port>8880</cargo.servlet.port> + <cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M</cargo.jvmargs> + </properties> + </configuration> + </configuration> + </execution> + <execution> + <id>stop-container</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + </goals> + <configuration> + <container> + <containerId>tomcat9x</containerId> + </container> + <configuration> + <properties> + <cargo.servlet.port>8880</cargo.servlet.port> + </properties> + <home>${project.build.directory}/juddi-tomcat-${juddi.registry.version}</home> + </configuration> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4</version> - <configuration> - <skip>true</skip> - <includes> - <include>**/*Test.java</include> - </includes> - <systemProperties> - <property> - <name>derby.stream.error.file</name> - <value>target/derby.log</value> - </property> - <property> - <name>java.io.tmpdir</name> - <value>${basedir}/temp</value> - </property> - </systemProperties> - <environmentVariables> - <uddi.version>3</uddi.version> - </environmentVariables> - </configuration> - <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - <systemProperties> - <property> - <name>cactus.contextURL</name> - <value>http://localhost:8880/juddi</value> - </property> - <property> - <name>java.io.tmpdir</name> - <value>${basedir}/temp</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>apache-release</id> - <activation> - <property> - <name>apache-release</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>juddi</artifactId> - <version>2.0.1</version> - <scope>test</scope> - </dependency> - <!-- have to figure out which dependencies of 3.0.2 make the uddiv2 build work --> - <dependency> - <groupId>org.apache.juddi</groupId> - <artifactId>uddi-ws</artifactId> - <version>3.0.2</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-4</version> - <executions> - <execution> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> - <descriptorRefs> - <descriptorRef> - source-release - </descriptorRef> - </descriptorRefs> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <!-- apache version not yet released --> - <!--<groupId>org.apache</groupId> --> - <groupId>org.apache.geronimo.genesis</groupId> - <artifactId>apache-source-release-assembly-descriptor</artifactId> - <!-- apache version not yet known --> - <version>2.0</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4</version> - <configuration> - <skip>true</skip> - <includes> - <include>**/*Test.java</include> - </includes> - <systemProperties> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + <includes> + <include>**/*Test.java</include> + </includes> + <systemProperties> + <property> + <name>derby.stream.error.file</name> + <value>target/derby.log</value> + </property> + <property> + <name>java.io.tmpdir</name> + <value>${basedir}/temp</value> + </property> + </systemProperties> + <environmentVariables> + <uddi.version>3</uddi.version> + </environmentVariables> + </configuration> + <executions> + <execution> + <id>surefire-it</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <systemProperties> + <property> + <name>cactus.contextURL</name> + <value>http://localhost:8880/juddi</value> + </property> + <property> + <name>java.io.tmpdir</name> + <value>${basedir}/temp</value> + </property> + </systemProperties> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>apache-release</id> + <activation> <property> - <name>derby.stream.error.file</name> - <value>target/derby.log</value> + <name>apache-release</name> </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>juddi</artifactId> + <version>2.0.1</version> + <scope>test</scope> + </dependency> + <!-- have to figure out which dependencies of 3.0.2 make the uddiv2 build work --> + <dependency> + <groupId>org.apache.juddi</groupId> + <artifactId>uddi-ws</artifactId> + <version>${juddi.registry.version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + + <executions> + <execution> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> + <descriptorRefs> + <descriptorRef> + source-release + </descriptorRef> + </descriptorRefs> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <!-- apache version not yet released --> + <!--<groupId>org.apache</groupId> --> + <groupId>org.apache.geronimo.genesis</groupId> + <artifactId>apache-source-release-assembly-descriptor</artifactId> + <!-- apache version not yet known --> + <version>2.0</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + <includes> + <include>**/*Test.java</include> + </includes> + <systemProperties> + <property> + <name>derby.stream.error.file</name> + <value>target/derby.log</value> + </property> + <property> + <name>java.io.tmpdir</name> + <value>${basedir}/temp</value> + </property> + </systemProperties> + <environmentVariables> + <uddi.version>2</uddi.version> + </environmentVariables> + </configuration> + <executions> + <execution> + <id>surefire-it</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <systemProperties> + <property> + <name>cactus.contextURL</name> + <value>http://localhost:8880/juddi</value> + </property> + <property> + <name>java.io.tmpdir</name> + <value>${basedir}/temp</value> + </property> + </systemProperties> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + <profile> + <id>testcache</id> + <activation> + <activeByDefault>false</activeByDefault> <property> - <name>java.io.tmpdir</name> - <value>${basedir}/temp</value> + <name>testcache</name> + <value>true</value> </property> - </systemProperties> - <environmentVariables> - <uddi.version>2</uddi.version> - </environmentVariables> - </configuration> - <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - <systemProperties> - <property> - <name>cactus.contextURL</name> - <value>http://localhost:8880/juddi</value> - </property> - <property> - <name>java.io.tmpdir</name> - <value>${basedir}/temp</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - <profile> - <id>testcache</id> - <activation> - <activeByDefault>false</activeByDefault> - <property> - <name>testcache</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>pertest</forkMode> - <argLine>-javaagent:${settings.localRepository}/aspectj/aspectjweaver/1.5.2/aspectjweaver-1.5.2.jar</argLine> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>pertest</forkMode> + <argLine>-javaagent:${settings.localRepository}/aspectj/aspectjweaver/1.5.2/aspectjweaver-1.5.2.jar</argLine> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.5</version> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> - <reportSets> - <reportSet> - <reports> - <report>javadoc</report> - <report>test-javadoc</report> - </reports> - </reportSet> - </reportSets> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>3.0.0</version> + </plugin> - <configuration> - <quiet>true</quiet> - <tags> - <tag> - <name>goal</name> - <placement>Xt</placement> - </tag> - <tag> - <name>phase</name> - <placement>Xt</placement> - </tag> - <tag> - <name>execute</name> - <placement>Xt</placement> - </tag> - <tag> - <name>requiresDependencyResolution</name> - <placement>Xt</placement> - </tag> - <tag> - <name>parameter</name> - <placement>Xf</placement> - </tag> - <tag> - <name>required</name> - <placement>Xf</placement> - </tag> - <tag> - <name>readonly</name> - <placement>Xf</placement> - </tag> - <tag> - <name>component</name> - <placement>Xf</placement> - </tag> - <tag> - <name>plexus.component</name> - <placement>Xf</placement> - </tag> - <tag> - <name>plexus.requirement</name> - <placement>Xf</placement> - </tag> - </tags> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.1</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.4</version> - <configuration> - <sourceEncoding>utf-8</sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>1.5</targetJdk> - <linkXRef>true</linkXRef> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>3.11.0</version> + <configuration> + <sourceEncoding>utf-8</sourceEncoding> + <minimumTokens>100</minimumTokens> + <targetJdk>1.5</targetJdk> + <linkXRef>true</linkXRef> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.1</version> - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.9</version> + <configuration> + <dependencyLocationsEnabled>false</dependencyLocationsEnabled> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.4.3</version> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.22.1</version> + </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.2</version> - <configuration> - <quiet>true</quiet> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - <version>2.0-beta-2</version> - </plugin> - </plugins> - </reporting> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.7</version> + <configuration> + <quiet>true</quiet> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + <version>2.0</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>3.0.5</version> + <configuration> + <xmlOutput>true</xmlOutput> + <!-- Optional directory to put findbugs xdoc xml report --> + <xmlOutputDirectory>target/site</xmlOutputDirectory> + </configuration> + </plugin> + <!-- doesn't work with asf<plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-changes-plugin</artifactId> + <version>2.12.1</version> + <reportSets> + <reportSet> + <reports> + <report>jira-report</report> + </reports> + </reportSet> + </reportSets> + </plugin> + --> + </plugins> + </reporting> </project> http://git-wip-us.apache.org/repos/asf/juddi-scout/blob/8836df0d/server.xml ---------------------------------------------------------------------- diff --git a/server.xml b/server.xml index 6c98bd7..8260211 100644 --- a/server.xml +++ b/server.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='utf-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -20,14 +20,16 @@ Documentation at /docs/config/server.html --> <Server port="8005" shutdown="SHUTDOWN"> - + <Listener className="org.apache.catalina.startup.VersionLoggerListener" /> + <!-- Security listener. Documentation at /docs/config/listeners.html + <Listener className="org.apache.catalina.security.SecurityListener" /> + --> <!--APR library loader. Documentation at /docs/apr.html --> <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> - <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html --> - <Listener className="org.apache.catalina.core.JasperListener" /> - <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html --> - <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" /> + <!-- Prevent memory leaks due to use of particular java/javax APIs--> + <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" /> <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> + <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" /> <!-- Global JNDI resources Documentation at /docs/jndi-resources-howto.html @@ -44,44 +46,70 @@ </GlobalNamingResources> <!-- A "Service" is a collection of one or more "Connectors" that share - a single "Container" Note: A "Service" is not itself a "Container", + a single "Container" Note: A "Service" is not itself a "Container", so you may not define subcomponents such as "Valves" at this level. Documentation at /docs/config/service.html --> <Service name="Catalina"> - + <!--The connectors can use a shared executor, you can define one or more named thread pools--> <!-- - <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" + <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" maxThreads="150" minSpareThreads="4"/> --> - - + + <!-- A "Connector" represents an endpoint by which requests are received and responses are returned. Documentation at : - Java HTTP Connector: /docs/config/http.html (blocking & non-blocking) + Java HTTP Connector: /docs/config/http.html Java AJP Connector: /docs/config/ajp.html APR (HTTP/AJP) Connector: /docs/apr.html - Define a non-SSL HTTP/1.1 Connector on port 8080 + Define a non-SSL/TLS HTTP/1.1 Connector on port 8080 --> - <Connector port="8880" protocol="HTTP/1.1" - connectionTimeout="20000" + <Connector port="8880" protocol="HTTP/1.1" + connectionTimeout="20000" redirectPort="8443" /> <!-- A "Connector" using the shared thread pool--> <!-- <Connector executor="tomcatThreadPool" - port="8080" protocol="HTTP/1.1" - connectionTimeout="20000" + port="8080" protocol="HTTP/1.1" + connectionTimeout="20000" redirectPort="8443" /> - --> - <!-- Define a SSL HTTP/1.1 Connector on port 8443 - This connector uses the JSSE configuration, when using APR, the - connector should be using the OpenSSL style configuration - described in the APR documentation --> + --> + <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 + This connector uses the NIO implementation. The default + SSLImplementation will depend on the presence of the APR/native + library and the useOpenSSL attribute of the + AprLifecycleListener. + Either JSSE or OpenSSL style configuration may be used regardless of + the SSLImplementation selected. JSSE style configuration is used below. + --> + <!-- + <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol" + maxThreads="150" SSLEnabled="true"> + <SSLHostConfig> + <Certificate certificateKeystoreFile="conf/localhost-rsa.jks" + type="RSA" /> + </SSLHostConfig> + </Connector> + --> + <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2 + This connector uses the APR/native implementation which always uses + OpenSSL for TLS. + Either JSSE or OpenSSL style configuration may be used. OpenSSL style + configuration is used below. + --> <!-- - <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true" - maxThreads="150" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" /> + <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol" + maxThreads="150" SSLEnabled="true" > + <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" /> + <SSLHostConfig> + <Certificate certificateKeyFile="conf/localhost-rsa-key.pem" + certificateFile="conf/localhost-rsa-cert.pem" + certificateChainFile="conf/localhost-rsa-chain.pem" + type="RSA" /> + </SSLHostConfig> + </Connector> --> <!-- Define an AJP 1.3 Connector on port 8009 --> @@ -95,8 +123,8 @@ Documentation at /docs/config/engine.html --> <!-- You should set jvmRoute to support load-balancing via AJP ie : - <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1"> - --> + <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1"> + --> <Engine name="Catalina" defaultHost="localhost"> <!--For clustering, please take a look at documentation at: @@ -104,39 +132,34 @@ /docs/config/cluster.html (reference documentation) --> <!-- <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/> - --> - - <!-- The request dumper valve dumps useful debugging information about - the request and response data received and sent by Tomcat. - Documentation at: /docs/config/valve.html --> - <!-- - <Valve className="org.apache.catalina.valves.RequestDumperValve"/> --> - <!-- This Realm uses the UserDatabase configured in the global JNDI - resources under the key "UserDatabase". Any edits - that are performed against this UserDatabase are immediately - available for use by the Realm. --> - <Realm className="org.apache.catalina.realm.UserDatabaseRealm" - resourceName="UserDatabase"/> + <!-- Use the LockOutRealm to prevent attempts to guess user passwords + via a brute-force attack --> + <Realm className="org.apache.catalina.realm.LockOutRealm"> + <!-- This Realm uses the UserDatabase configured in the global JNDI + resources under the key "UserDatabase". Any edits + that are performed against this UserDatabase are immediately + available for use by the Realm. --> + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" + resourceName="UserDatabase"/> + </Realm> - <!-- Define the default virtual host - Note: XML Schema validation will not work with Xerces 2.2. - --> <Host name="localhost" appBase="webapps" - unpackWARs="true" autoDeploy="true" - xmlValidation="false" xmlNamespaceAware="false"> + unpackWARs="true" autoDeploy="true"> <!-- SingleSignOn valve, share authentication between web applications Documentation at: /docs/config/valve.html --> + <!-- <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> + --> <!-- Access log processes all example. - Documentation at: /docs/config/valve.html --> - <!-- - <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" - prefix="localhost_access_log." suffix=".txt" pattern="common" resolveHosts="false"/> - --> + Documentation at: /docs/config/valve.html + Note: The pattern used is equivalent to using pattern="common" --> + <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" + prefix="localhost_access_log" suffix=".txt" + pattern="%h %l %u %t "%r" %s %b" /> </Host> </Engine> http://git-wip-us.apache.org/repos/asf/juddi-scout/blob/8836df0d/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java b/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java index f85a182..58bce2d 100644 --- a/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java +++ b/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java @@ -333,7 +333,7 @@ public class BusinessLifeCycleManagerImpl extends LifeCycleManagerImpl List<TModel> tmodelList = td.getTModel(); entityarr = new TModel[tmodelList.size()]; tmodelList.toArray(entityarr); - log.debug("After Saving TModel. Obtained vector size:" + entityarr != null ? entityarr.length : 0); + log.debug("After Saving TModel. Obtained vector size:" + ((entityarr != null) ? entityarr.length : 0)); for (int i = 0; entityarr != null && i < entityarr.length; i++) { TModel tm = (TModel) entityarr[i]; coll.add(new KeyImpl(tm.getTModelKey())); @@ -382,7 +382,7 @@ public class BusinessLifeCycleManagerImpl extends LifeCycleManagerImpl entityarr = new TModel[tmodelList.size()]; tmodelList.toArray(entityarr); - log.debug("After Saving TModel. Obtained vector size:" + entityarr != null ? entityarr.length : 0); + log.debug("After Saving TModel. Obtained vector size:" + ((entityarr != null) ? entityarr.length : 0)); for (int i = 0; entityarr != null && i < entityarr.length; i++) { TModel tm = (TModel) entityarr[i]; coll.add(new KeyImpl(tm.getTModelKey())); @@ -433,7 +433,7 @@ public class BusinessLifeCycleManagerImpl extends LifeCycleManagerImpl entityarr = new BusinessEntity[bizEntityList.size()]; bizEntityList.toArray(entityarr); - log.debug("After Saving Business. Obtained vector size:" + entityarr != null ? entityarr.length : 0); + log.debug("After Saving Business. Obtained vector size:" + ((entityarr != null) ? entityarr.length : 0)); for (int i = 0; entityarr != null && i < entityarr.length; i++) { BusinessEntity entity = (BusinessEntity) entityarr[i]; coll.add(new KeyImpl(entity.getBusinessKey())); @@ -803,7 +803,7 @@ public class BusinessLifeCycleManagerImpl extends LifeCycleManagerImpl keyResultArr = new Result[resultList.size()]; resultList.toArray(keyResultArr); - log.debug("After deleting Business. Obtained vector size:" + keyResultArr != null ? keyResultArr.length : 0); + log.debug("After deleting Business. Obtained vector size:" + ((keyResultArr != null) ? keyResultArr.length : 0)); for (int i = 0; keyResultArr != null && i < keyResultArr.length; i++) { Result result = (Result) keyResultArr[i]; int errno = result.getErrno(); http://git-wip-us.apache.org/repos/asf/juddi-scout/blob/8836df0d/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java b/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java index ea9c850..c8eee4f 100644 --- a/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java +++ b/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerV3Impl.java @@ -332,7 +332,7 @@ public class BusinessLifeCycleManagerV3Impl extends LifeCycleManagerImpl List<TModel> tmodelList = td.getTModel(); entityarr = new TModel[tmodelList.size()]; tmodelList.toArray(entityarr); - log.debug("After Saving TModel. Obtained vector size:" + entityarr != null ? entityarr.length : 0); + log.debug("After Saving TModel. Obtained vector size:" + ((entityarr != null) ? entityarr.length : 0)); for (int i = 0; entityarr != null && i < entityarr.length; i++) { TModel tm = (TModel) entityarr[i]; coll.add(new KeyImpl(tm.getTModelKey())); @@ -381,7 +381,7 @@ public class BusinessLifeCycleManagerV3Impl extends LifeCycleManagerImpl entityarr = new TModel[tmodelList.size()]; tmodelList.toArray(entityarr); - log.debug("After Saving TModel. Obtained vector size:" + entityarr != null ? entityarr.length : 0); + log.debug("After Saving TModel. Obtained vector size:" + ((entityarr != null) ? entityarr.length : 0)); for (int i = 0; entityarr != null && i < entityarr.length; i++) { TModel tm = (TModel) entityarr[i]; coll.add(new KeyImpl(tm.getTModelKey())); @@ -431,7 +431,7 @@ public class BusinessLifeCycleManagerV3Impl extends LifeCycleManagerImpl entityarr = new BusinessEntity[bizEntityList.size()]; bizEntityList.toArray(entityarr); - log.debug("After Saving Business. Obtained vector size:" + entityarr != null ? entityarr.length : 0); + log.debug("After Saving Business. Obtained vector size:" + ((entityarr != null) ? entityarr.length : 0)); for (int i = 0; entityarr != null && i < entityarr.length; i++) { BusinessEntity entity = (BusinessEntity) entityarr[i]; coll.add(new KeyImpl(entity.getBusinessKey())); @@ -829,7 +829,7 @@ public class BusinessLifeCycleManagerV3Impl extends LifeCycleManagerImpl keyResultArr = new Result[resultList.size()]; resultList.toArray(keyResultArr); - log.debug("After deleting Business. Obtained vector size:" + keyResultArr != null ? keyResultArr.length : 0); + log.debug("After deleting Business. Obtained vector size:" + ((keyResultArr != null) ? keyResultArr.length : 0)); for (int i = 0; keyResultArr != null && i < keyResultArr.length; i++) { Result result = (Result) keyResultArr[i]; int errno = result.getErrno(); http://git-wip-us.apache.org/repos/asf/juddi-scout/blob/8836df0d/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java b/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java index 6d2be0d..0d0daf3 100644 --- a/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java +++ b/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java @@ -28,7 +28,7 @@ import javax.xml.registry.RegistryService; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.juddi.v3.client.config.UDDIClerkManager; +import org.apache.juddi.v3.client.config.UDDIClient; /** * Apache Scout Implementation of a JAXR Connection. @@ -52,7 +52,7 @@ public class ConnectionImpl implements Connection, Serializable private final String postalScheme; private final int maxRows; private String uddiVersion; - UDDIClerkManager manager = null; + UDDIClient manager = null; public ConnectionImpl(Properties properties) throws InvalidRequestException { @@ -77,7 +77,7 @@ public class ConnectionImpl implements Connection, Serializable String managerName = null; if (manager==null && uddiConfigFile!=null) { try { - manager = new UDDIClerkManager(uddiConfigFile, properties); + manager = new UDDIClient(uddiConfigFile, properties); manager.start(); } catch (ConfigurationException e) { log.error(e.getMessage(),e); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
