Skip to content

Commit ee19392

Browse files
adamretteradamretter
authored
Merge pull request #1 from evolvedbinary/feature/eb-fork
Fork for Evolved Binary
2 parents 590d621 + 0d966bd commit ee19392

File tree

668 files changed

+658
-73777
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

668 files changed

+658
-73777
lines changed

‎.circleci/config.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
version: 2.1
2+
3+
jobs:
4+
build-and-test:
5+
docker:
6+
- image: cimg/openjdk:8.0
7+
steps:
8+
- checkout
9+
- restore_cache:
10+
keys:
11+
# when lock file changes, use increasingly general patterns to restore cache
12+
- maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }}
13+
- maven-repo-v1-{{ .Branch }}-
14+
- maven-repo-v1-
15+
- run:
16+
name: Build
17+
command: mvn -B -DskipTests clean site package
18+
- run:
19+
name: Test
20+
command: mvn verify
21+
- save_cache:
22+
paths:
23+
- ~/.m2
24+
key: maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }}
25+
26+
workflows:
27+
ci:
28+
jobs:
29+
- build-and-test

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
target/
2+
.idea/

‎modules/java5/LICENSE.txt‎ renamed to ‎LICENSE‎

File renamed without changes.

‎README.md‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Fork of Apache Web Services Commons
2+
[![CircleCI](https://circleci.com/gh/evolvedbinary/apache-ws-commons/tree/main.svg?style=svg)](https://circleci.com/gh/evolvedbinary/apache-ws-commons/tree/main)
3+
[![Java 8](https://img.shields.io/badge/java-8+-blue.svg)](https://adoptopenjdk.net/)
4+
[![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://opensource.org/licenses/Apache2.0)
5+
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.evolvedbinary.thirdparty.org.apache.ws.commons.util/ws-commons-util/badge.svg)](https://search.maven.org/search?q=g:com.evolvedbinary.thirdparty.org.apache.ws.commons.util)
6+
7+
8+
[Apache WS-Commons](https://ws.apache.org/commons/) is no longer officially maintained by Apache.
9+
This is a simple fork for the purposes of:
10+
1. Providing a new bug free implementation of `org.apache.ws.commons.util.NamespaceContextImpl`
11+
12+
* The Apache WS-Commons source code was imported to Git from the archived SVN Apache WS-Common repository at: https://svn.apache.org/repos/asf/webservices/commons/
13+
14+
*NOTE*: This fork was created for our own purposes, and we offer no guarantee that we will maintain it beyond our own requirements.
15+
16+
*NOTE*: As the SVN release tags appear to have been deleted, we have tried to reconstruct the following git tags:
17+
* `ws-commons-util-1.0.2` contains only the original source code that we have inferred made up the last Apache release of WS-Commons Util.
18+
* `ws-commons-1.0.1` contains only the original source code that we have inferred made up the last Apache release of WS-Commons Util and Java 5.
19+
20+
However, if you want an Apache WS-Commons that has been improved over the last Apache version, then this fork's artifacts are available from Maven Central as:
21+
22+
## WS-Commons Util
23+
```xml
24+
<dependency>
25+
<groupId>com.evolvedbinary.thirdparty.org.apache.ws.commons.util</groupId>
26+
<artifactId>ws-commons-util</artifactId>
27+
<version>1.1.0</version>
28+
</dependency>
29+
```
30+
31+
## WS-Commons Java 5
32+
```xml
33+
<dependency>
34+
<groupId>com.evolvedbinary.thirdparty.org.apache.ws.commons.java5</groupId>
35+
<artifactId>ws-commons-java5</artifactId>
36+
<version>1.1.0</version>
37+
</dependency>
38+
```
39+
40+
## Perfoming a Release
41+
To release a new version for Evolved Binary to Maven Central, simply run:
42+
``` bash
43+
mvn -Dmaven.site.skip=true -Dmaven.site.deploy.skip=true -Dgpg.keyname=D4A08A8AB731BF576354A8183EF2B4866A540119 -Darguments="-Dmaven.site.skip=true -Dmaven.site.deploy.skip=true -Dgpg.keyname=D4A08A8AB731BF576354A8183EF2B4866A540119" release:prepare
44+
45+
...
46+
47+
mvn -Dmaven.site.skip=true -Dmaven.site.deploy.skip=true -Dgpg.keyname=D4A08A8AB731BF576354A8183EF2B4866A540119 -Darguments="-Dmaven.site.skip=true -Dmaven.site.deploy.skip=true -Dgpg.keyname=D4A08A8AB731BF576354A8183EF2B4866A540119" release:perform
48+
```
49+
50+
Then visit https://central.sonatype.com/ and login, and release the staged artifacts to Maven Central
51+

‎java5/pom.xml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>com.evolvedbinary.thirdparty.org.apache.ws.commons</groupId>
7+
<artifactId>ws-commons</artifactId>
8+
<version>1.1.0-SNAPSHOT</version>
9+
</parent>
10+
11+
<groupId>com.evolvedbinary.thirdparty.org.apache.ws.commons.java5</groupId>
12+
<artifactId>ws-commons-java5</artifactId>
13+
<packaging>jar</packaging>
14+
15+
<name>Apache WebServices Java 5 Classes</name>
16+
<!-- Be sure, that the following is a single line. See
17+
http://jira.codehaus.org/browse/MJAR-39
18+
for the reason. -->
19+
<description>This is a small collection of classes, which are part of the Java 5 Core. In other words, you do not need this library, if you are running Java 5, or later. The Java 5 classes are used by projects like Apache JaxMe, Apache XML-RPC, or the the ws-common-utils.</description>
20+
<url>https://ws.apache.org/commons/ws-commons-java5/</url>
21+
22+
<scm>
23+
<connection>scm:git:https://github.com/evolvedbinary/apache-ws-commons.git</connection>
24+
<developerConnection>scm:git:https://github.com/evolvedbinary/apache-ws-commons.git</developerConnection>
25+
<url>scm:git:https://github.com/evolvedbinary/apache-ws-commons.git</url>
26+
</scm>
27+
28+
<build>
29+
<plugins>
30+
<plugin>
31+
<groupId>com.github.monkeywie</groupId>
32+
<artifactId>copy-rename-maven-plugin</artifactId>
33+
<executions>
34+
<execution>
35+
<id>copy-supporting-files-for-assembly</id>
36+
<phase>package</phase>
37+
<goals>
38+
<goal>copy</goal>
39+
</goals>
40+
<configuration>
41+
<fileSets>
42+
<fileSet>
43+
<sourceFile>${project.basedir}/../LICENSE</sourceFile>
44+
<destinationFile>${project.build.directory}/LICENSE</destinationFile>
45+
</fileSet>
46+
<fileSet>
47+
<sourceFile>${project.basedir}/../README.md</sourceFile>
48+
<destinationFile>${project.build.directory}/README.md</destinationFile>
49+
</fileSet>
50+
<fileSet>
51+
<sourceFile>${project.basedir}/../.gitignore</sourceFile>
52+
<destinationFile>${project.build.directory}/.gitignore</destinationFile>
53+
</fileSet>
54+
</fileSets>
55+
</configuration>
56+
</execution>
57+
</executions>
58+
</plugin>
59+
<plugin>
60+
<groupId>org.apache.maven.plugins</groupId>
61+
<artifactId>maven-assembly-plugin</artifactId>
62+
<executions>
63+
<execution>
64+
<id>create-java5-assemblies</id>
65+
<phase>package</phase>
66+
<goals>
67+
<goal>single</goal>
68+
</goals>
69+
<configuration>
70+
<descriptors>
71+
<descriptor>src/main/assembly/bin.xml</descriptor>
72+
<descriptor>src/main/assembly/src.xml</descriptor>
73+
</descriptors>
74+
<tarLongFileMode>gnu</tarLongFileMode>
75+
</configuration>
76+
</execution>
77+
</executions>
78+
</plugin>
79+
</plugins>
80+
</build>
81+
82+
<dependencies>
83+
<dependency>
84+
<groupId>xml-apis</groupId>
85+
<artifactId>xml-apis</artifactId>
86+
</dependency>
87+
</dependencies>
88+
89+
</project>

‎java5/src/main/assembly/bin.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<assembly>
2+
<id>bin</id>
3+
<formats>
4+
<format>tar.gz</format>
5+
</formats>
6+
<includeSiteDirectory>true</includeSiteDirectory>
7+
<fileSets>
8+
<fileSet>
9+
<outputDirectory></outputDirectory>
10+
<includes>
11+
<include>LICENSE</include>
12+
<include>README.md</include>
13+
</includes>
14+
<directory>${project.build.directory}</directory>
15+
</fileSet>
16+
<fileSet>
17+
<directory>target</directory>
18+
<outputDirectory>/lib</outputDirectory>
19+
<includes>
20+
<include>*.jar</include>
21+
</includes>
22+
</fileSet>
23+
</fileSets>
24+
</assembly>

‎java5/src/main/assembly/src.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<assembly>
2+
<id>src</id>
3+
<formats>
4+
<format>tar.gz</format>
5+
</formats>
6+
<fileSets>
7+
<fileSet>
8+
<includes>
9+
<include>pom.xml</include>
10+
</includes>
11+
</fileSet>
12+
<fileSet>
13+
<outputDirectory></outputDirectory>
14+
<includes>
15+
<include>LICENSE</include>
16+
<include>README.md</include>
17+
<include>.gitignore</include>
18+
</includes>
19+
<directory>${project.build.directory}</directory>
20+
</fileSet>
21+
<fileSet>
22+
<directory>src</directory>
23+
</fileSet>
24+
</fileSets>
25+
</assembly>

‎modules/java5/src/main/java/javax/xml/XMLConstants.java‎ renamed to ‎java5/src/main/java/javax/xml/XMLConstants.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public class XMLConstants {
5454
public static final java.lang.String XML_NS_URI =
5555
"http://www.w3.org/XML/1998/namespace";
5656

57-
/** <p>Constant holding the attribute name for declaration
58-
* of new prefixes. The constant value is "xmlns".</p>
59-
* <p><em>Note</em>: This is both an attribute name
57+
/** Constant holding the attribute name for declaration
58+
* of new prefixes. The constant value is "xmlns".
59+
* <em>Note</em>: This is both an attribute name
6060
* and a namespace prefix: For example, to assign the empty
6161
* prefix to a namespace, one would use
6262
* <pre>
@@ -66,7 +66,7 @@ public class XMLConstants {
6666
* one would use
6767
* <pre>
6868
* xmlns:pre="http://my.namespace/..."
69-
* </pre></p>
69+
* </pre>
7070
*/
7171
public static final java.lang.String XMLNS_ATTRIBUTE = "xmlns";
7272

‎modules/java5/src/main/java/javax/xml/namespace/NamespaceContext.java‎ renamed to ‎java5/src/main/java/javax/xml/namespace/NamespaceContext.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
* @since JAXB 1.0
3838
*/
3939
public interface NamespaceContext {
40-
/** <p>Given a prefix, returns the namespace URI associated with the prefix.
40+
/** Given a prefix, returns the namespace URI associated with the prefix.
4141
* More precisely, the following rules apply:
42-
* <table border="1">
42+
* <table border="1" summary="Rules governing Prefix to URI lookup">
4343
* <tr><th>Prefix (Input)</th><th>Namespace URI (Output)</th></tr>
4444
* <tr><th>{@link javax.xml.XMLConstants#DEFAULT_NS_PREFIX} ("")</th>
4545
* <td>The current default namespace URI or null, if there is no
@@ -52,7 +52,7 @@ public interface NamespaceContext {
5252
* </tr>
5353
* <tr><th>Any other prefix</th><td>The namespace URI currently mapped to the
5454
* prefix or null, if no such mapping is established.</td></tr>
55-
* </table></p>
55+
* </table>
5656
* @param pPrefix The prefix being looked up in the list of mappings.
5757
* @return The Namespace URI to which the input prefix is currently mapped
5858
* or null, if there is no such mapping.
@@ -61,20 +61,20 @@ public interface NamespaceContext {
6161
public String getNamespaceURI(String pPrefix);
6262

6363

64-
/** <p>This method returns a prefix, which is currently mapped to the given
64+
/** This method returns a prefix, which is currently mapped to the given
6565
* namespace URI. Note, that multiple prefixes may be mapped to the namespace
6666
* URI, in which case the returned prefix is undetermined. Do not make any
6767
* assumptions on the order in such cases. It is a better choice to use
6868
* {@link #getPrefixes(String)} instead, if you depend on some order
69-
* <table border="1">
69+
* <table border="1" summary="Rules governing URI to Prefix lookup">
7070
* <tr><th>Namespace URI (Input)</th><th>Prefix (Output)</th></tr>
7171
* <tr><th>Current default namespace URI</th>
7272
* <td>{@link javax.xml.XMLConstants#DEFAULT_NS_PREFIX} ("")</td></tr>
7373
* <tr><th>{@link javax.xml.XMLConstants#XML_NS_URI} ("http://www.w3.org/XML/1998/namespace")</th>
7474
* <td>{@link javax.xml.XMLConstants#XML_NS_PREFIX} ("xml")</td></tr>
7575
* <tr><th>{@link javax.xml.XMLConstants#XMLNS_ATTRIBUTE_NS_URI} ("http://www.w3.org/2000/xmlns/")</th>
7676
* <td>{@link javax.xml.XMLConstants#XMLNS_ATTRIBUTE}</td></tr>
77-
* </table></p>
77+
* </table>
7878
*
7979
* @param pNamespaceURI The namespace URI being looked up in the list of mappings.
8080
* @return A prefix currently mapped to the given namespace URI or null, if there
@@ -84,19 +84,19 @@ public interface NamespaceContext {
8484
public java.lang.String getPrefix(java.lang.String pNamespaceURI);
8585

8686

87-
/** <p>This method returns a collection of prefixes, which are currently mapped
87+
/** This method returns a collection of prefixes, which are currently mapped
8888
* to the given namespace URI. Note, that the collection may contain more than
8989
* one prefix, in which case the order is undetermined. If you do not depend
9090
* on a certain order and any prefix will do, you may choose to use
9191
* {@link #getPrefix(String)} instead. The following table describes the
9292
* returned values in more details:
93-
* <table border="1">
93+
* <table border="1" summary="Rules governing URI to Prefixes lookup">
9494
* <tr><th>Namespace URI (Input)</th><th>Prefix collection (Output)</th></tr>
9595
* <tr><th>{@link javax.xml.XMLConstants#XML_NS_URI} ("http://www.w3.org/XML/1998/namespace")</th>
9696
* <td>Collection with a single element: {@link javax.xml.XMLConstants#XML_NS_PREFIX} ("xml")</td></tr>
9797
* <tr><th>{@link javax.xml.XMLConstants#XMLNS_ATTRIBUTE_NS_URI} ("http://www.w3.org/2000/xmlns/")</th>
9898
* <td>Collection with a single element: {@link javax.xml.XMLConstants#XMLNS_ATTRIBUTE}</td></tr>
99-
* </table></p>
99+
* </table>
100100
*
101101
* @param pNamespaceURI The namespace URI being looked up in the list of
102102
* mappings or null, if there is no such mapping.

‎modules/java5/src/main/java/javax/xml/namespace/QName.java‎ renamed to ‎java5/src/main/java/javax/xml/namespace/QName.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@ public String getPrefix() {
113113
return prefix;
114114
}
115115

116-
/** <p>Returns true, if
116+
/** Returns true, if
117117
* <ul>
118118
* <li><code>pOther</code> instanceof QName</li>
119119
* <li>getNamespaceURI().equals(pOther.getNamespaceURI())</li>
120120
* <li>getLocalPart().equals(pOther.getLocalPart())</li>
121121
* </ul>
122-
* <em>Note</em>: The prefix is ignored.</p>
122+
* <em>Note</em>: The prefix is ignored.
123123
*/
124124
public boolean equals(Object pOther) {
125125
if (!(pOther instanceof QName)) {

0 commit comments

Comments
 (0)