USRE-139 not set pgp yet

This commit is contained in:
YuCheng Hu 2023-08-29 18:15:53 -04:00
parent 93efe6e98b
commit be5ad70649
5 changed files with 1182 additions and 1154 deletions

View File

@ -11,16 +11,16 @@
<option name="name" value="ossrh Releases" />
<option name="url" value="https://oss.sonatype.org/service/local/staging/deploy/maven2/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.ossez.com/repository/maven-public/" />
</remote-repository>
<remote-repository>
<option name="id" value="ossez-repo-releases" />
<option name="name" value="OSSEZ Private Releases" />
<option name="url" value="https://repo.ossez.com/repository/maven-releases/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.ossez.com/repository/maven-public/" />
</remote-repository>
<remote-repository>
<option name="id" value="ossez-repo-snapshots" />
<option name="name" value="Repository for JDK 1.4 builds" />

View File

@ -303,7 +303,6 @@ public class RetsTransport {
metadataBuilder.setStrict(this.strict);
return metadataBuilder.doBuild(xmlDocument);
} finally {
this.monitor.eventFinish(monitorobj);

View File

@ -11,6 +11,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
import com.ossez.usreio.client.CapabilityUrls;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.dom4j.*;
@ -32,9 +33,13 @@ import com.ossez.usreio.tests.common.metadata.types.MValidationExternalType;
import com.ossez.usreio.tests.common.metadata.types.MValidationLookup;
import com.ossez.usreio.tests.common.metadata.types.MValidationLookupType;
import org.dom4j.io.SAXReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
public class JDomCompactBuilder extends MetadataBuilder {
private final static Logger log = LoggerFactory.getLogger(JDomCompactBuilder.class);
public static final String CONTAINER_PREFIX = "METADATA-";
public static final String CONTAINER_ROOT = "RETS";
public static final String CONTAINER_METADATA = "METADATA";
@ -69,6 +74,7 @@ public class JDomCompactBuilder extends MetadataBuilder {
@Override
public Metadata doBuild(Object src) throws MetadataException {
log.info("Rets Meta Data JDomCompactBuilder");
return build((Document) src);
}
@ -175,9 +181,9 @@ public class JDomCompactBuilder extends MetadataBuilder {
throw new MetadataException("Missing element " + CONTAINER_SYSTEM);
}
MSystem sys = processSystem(element);
Metadata metadata;
metadata = new Metadata(sys);
Metadata metadata = new Metadata(sys);
recurseAll(metadata, root);
metadata.setRawMetaData(src.asXML());
return metadata;
}
@ -218,7 +224,9 @@ public class JDomCompactBuilder extends MetadataBuilder {
return split(cols);
}
/** do NOT use string.split() unless your prepared to deal with loss due to token boundary conditions */
/**
* do NOT use string.split() unless your prepared to deal with loss due to token boundary conditions
*/
private String[] split(Element el) {
if (el == null) return null;
final String delimiter = "\t";

View File

@ -34,9 +34,16 @@ import com.ossez.usreio.tests.common.metadata.types.MValidationLookupType;
import org.dom4j.Attribute;
import org.dom4j.Document;
import org.dom4j.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** Parses apart a complete Standard-XML response, returns a Metadata object */
/**
* Parses apart a complete Standard-XML response, returns a Metadata object
*/
public class JDomStandardBuilder extends MetadataBuilder {
private final static Logger log = LoggerFactory.getLogger(JDomStandardBuilder.class);
public static final String ELEMENT_SYSTEM = "System";
public static final String ELEMENT_RESOURCE = "Resource";
public static final String ELEMENT_FOREIGNKEY = "ForeignKey";
@ -85,6 +92,7 @@ public class JDomStandardBuilder extends MetadataBuilder {
@Override
public Metadata doBuild(Object src) throws MetadataException {
log.info("Rets Meta Data JDomStandardBuilder");
return build((Document) src);
}
@ -92,7 +100,11 @@ public class JDomStandardBuilder extends MetadataBuilder {
Element element = src.getRootElement();
expectElement(element, CONTAINER_ROOT);
element = getElement(element, CONTAINER_METADATA);
return build(element);
// Set return MetaData
Metadata metadata = build(element);
metadata.setRawMetaData(src.asXML());
return metadata;
}
@Override
@ -121,7 +133,6 @@ public class JDomStandardBuilder extends MetadataBuilder {
*
* @param top The outside METADATA container.
* @return true if the request is recursive
*
*/
private boolean checkForRecursion(Element top) {
/*
@ -611,6 +622,7 @@ public class JDomStandardBuilder extends MetadataBuilder {
public static final String CONTAINER_VALIDATIONEXTERNALTYPE = "METADATA-VALIDATION_EXTERNAL_TYPE";
public static final Map sContainer2Type = new HashMap();
static {
for (int i = 0; i < MetadataType.values().length; i++) {
MetadataType type = MetadataType.values()[i];

View File

@ -18,6 +18,7 @@ import com.ossez.usreio.tests.common.metadata.types.MSearchHelp;
public class Metadata implements Serializable {
protected MSystem system;
protected String rawMetaData;
public Metadata(MetaCollector collector) throws MetadataException {
MetaObject[] sys = collector.getMetadata(MetadataType.SYSTEM, null);
@ -151,4 +152,12 @@ public class Metadata implements Serializable {
public MResource getResource(MClass clazz) {
return getResource(getResourceId(clazz));
}
public String getRawMetaData() {
return rawMetaData;
}
public void setRawMetaData(String rawMetaData) {
this.rawMetaData = rawMetaData;
}
}