Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
ce1a251a9d
|
@ -1,16 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CheckStyle-IDEA" serialisationVersion="2">
|
||||
<checkstyleVersion>10.12.5</checkstyleVersion>
|
||||
<scanScope>JavaOnly</scanScope>
|
||||
<copyLibs>true</copyLibs>
|
||||
<option name="thirdPartyClasspath" />
|
||||
<option name="activeLocationIds" />
|
||||
<option name="locations">
|
||||
<list>
|
||||
<ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">(bundled)</ConfigurationLocation>
|
||||
<ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">(bundled)</ConfigurationLocation>
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
|
@ -6,14 +6,10 @@
|
|||
<sourceOutputDir name="target/generated-sources/annotations" />
|
||||
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
||||
<outputRelativeToContentRoot value="true" />
|
||||
<module name="rets-io-client (1)" />
|
||||
<module name="rets-io-common" />
|
||||
<module name="rets-io-validation" />
|
||||
<module name="rets-io-common" />
|
||||
<module name="rets-io-client" />
|
||||
</profile>
|
||||
</annotationProcessing>
|
||||
<bytecodeTargetLevel>
|
||||
<module name="Rets-Io" target="11" />
|
||||
</bytecodeTargetLevel>
|
||||
</component>
|
||||
</project>
|
|
@ -6,11 +6,6 @@
|
|||
<option name="name" value="OSSEZ Private Snapshots" />
|
||||
<option name="url" value="https://repo.ossez.com/repository/maven-snapshots/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="ossrh-releases" />
|
||||
<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="ossez-repo-releases" />
|
||||
<option name="name" value="OSSEZ Private Releases" />
|
||||
|
@ -21,40 +16,15 @@
|
|||
<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" />
|
||||
<option name="url" value="https://repo.ossez.com/repository/maven-snapshots/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Maven Central repository" />
|
||||
<option name="url" value="https://repo1.maven.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="ossez-repo-releases" />
|
||||
<option name="name" value="Repository for JDK 1.4 builds" />
|
||||
<option name="url" value="https://repo.ossez.com/repository/maven-releases/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="jboss.community" />
|
||||
<option name="name" value="JBoss Community repository" />
|
||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="ossrh-snapshots" />
|
||||
<option name="name" value="OSSEZ Private Snapshots" />
|
||||
<option name="url" value="https://oss.sonatype.org/content/repositories/snapshots" />
|
||||
</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-central/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="ossrh-releases" />
|
||||
<option name="name" value="ossrh Releases" />
|
||||
<option name="url" value="https://repo.ossez.com/repository/maven-releases/" />
|
||||
</remote-repository>
|
||||
</component>
|
||||
</project>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="JpaBuddyIdeaProjectConfig">
|
||||
<option name="renamerInitialized" value="true" />
|
||||
</component>
|
||||
</project>
|
|
@ -1,12 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="MessDetectorOptionsConfiguration">
|
||||
<option name="transferred" value="true" />
|
||||
</component>
|
||||
<component name="PHPCSFixerOptionsConfiguration">
|
||||
<option name="transferred" value="true" />
|
||||
</component>
|
||||
<component name="PHPCodeSnifferOptionsConfiguration">
|
||||
<option name="transferred" value="true" />
|
||||
</component>
|
||||
</project>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ThriftCompiler">
|
||||
<compilers />
|
||||
</component>
|
||||
</project>
|
|
@ -2,6 +2,5 @@
|
|||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
<mapping directory="$PROJECT_DIR$/validation" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
|
@ -34,7 +34,7 @@
|
|||
<dependency>
|
||||
<groupId>xalan</groupId>
|
||||
<artifactId>xalan</artifactId>
|
||||
<version>2.7.2</version>
|
||||
<version>2.7.3</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
3
pom.xml
3
pom.xml
|
@ -49,6 +49,7 @@
|
|||
<modules>
|
||||
<module>common</module>
|
||||
<module>client</module>
|
||||
<module>validation</module>
|
||||
</modules>
|
||||
|
||||
<dependencies>
|
||||
|
@ -327,7 +328,7 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.4.1</version>
|
||||
<version>3.6.2</version>
|
||||
<configuration>
|
||||
<source>11</source>
|
||||
</configuration>
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
<dependency>
|
||||
<groupId>com.ossez.usreio</groupId>
|
||||
<artifactId>rets-io-common</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<version>0.0.2-SNAPSHOT</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
@ -61,18 +61,6 @@
|
|||
<version>5.7.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.ossez.usreio</groupId>
|
||||
<artifactId>rets-io-common</artifactId>
|
||||
<version>0.0.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.ossez.usreio</groupId>
|
||||
<artifactId>rets-io-common</artifactId>
|
||||
<version>0.0.2</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@ -88,19 +76,19 @@
|
|||
<release>${java.version}</release>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>2.9.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-javadocs</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.apache.maven.plugins</groupId>-->
|
||||
<!-- <artifactId>maven-javadoc-plugin</artifactId>-->
|
||||
<!-- <version>3.3.2</version>-->
|
||||
<!-- <executions>-->
|
||||
<!-- <execution>-->
|
||||
<!-- <id>attach-javadocs</id>-->
|
||||
<!-- <goals>-->
|
||||
<!-- <goal>jar</goal>-->
|
||||
<!-- </goals>-->
|
||||
<!-- </execution>-->
|
||||
<!-- </executions>-->
|
||||
<!-- </plugin>-->
|
||||
</plugins>
|
||||
|
||||
</build>
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
/* $Header: /usr/local/cvsroot/rets/validation/src/org/realtor/rets/validation/ValidationExpressionEvaluator.java,v 1.2 2003/12/04 15:28:33 rsegelman Exp $ */
|
||||
package org.realtor.rets.validation;
|
||||
|
||||
import org.realtor.rets.validation.operators.CloseParen;
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
/* $Header: /usr/local/cvsroot/rets/validation/src/org/realtor/rets/validation/terms/BooleanTerm.java,v 1.2 2003/12/04 15:28:33 rsegelman Exp $ */
|
||||
package org.realtor.rets.validation.terms;
|
||||
|
||||
|
||||
/**
|
||||
* BooleanTerm.java Created Aug 25, 2003
|
||||
* BooleanTerm.java Created Aug 25, 2003
|
||||
* <p>
|
||||
* <p>
|
||||
* Copyright 2003, Avantia inc.
|
||||
*
|
||||
*
|
||||
* Copyright 2003, Avantia inc.
|
||||
* @version $Revision: 1.2 $
|
||||
* @author scohen
|
||||
* @author scohen
|
||||
* @version $Revision: 1.2 $
|
||||
*/
|
||||
public class BooleanTerm extends AbstractTerm {
|
||||
public BooleanTerm(boolean b) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Header: /usr/local/cvsroot/rets/validation/src/org/realtor/rets/validation/terms/DateIntervalTerm.java,v 1.2 2003/12/04 15:28:33 rsegelman Exp $ */
|
||||
|
||||
package org.realtor.rets.validation.terms;
|
||||
|
||||
import java.text.ParseException;
|
||||
|
@ -7,12 +7,13 @@ import java.util.regex.*;
|
|||
|
||||
|
||||
/**
|
||||
* DateIntervalTerm.java Created Sep 17, 2003
|
||||
* DateIntervalTerm.java Created Sep 17, 2003
|
||||
* <p>
|
||||
* <p>
|
||||
* Copyright 2003, Avantia inc.
|
||||
*
|
||||
*
|
||||
* Copyright 2003, Avantia inc.
|
||||
* @version $Revision: 1.2 $
|
||||
* @author scohen
|
||||
* @author scohen
|
||||
* @version $Revision: 1.2 $
|
||||
*/
|
||||
public class DateIntervalTerm extends AbstractTerm {
|
||||
private static long MILLIS_PER_HOUR = 3600 * 1000;
|
||||
|
@ -37,7 +38,7 @@ public class DateIntervalTerm extends AbstractTerm {
|
|||
}
|
||||
|
||||
/**
|
||||
* @param l
|
||||
* @param interval
|
||||
*/
|
||||
public DateIntervalTerm(long interval) {
|
||||
this();
|
||||
|
@ -107,7 +108,7 @@ public class DateIntervalTerm extends AbstractTerm {
|
|||
}
|
||||
|
||||
private void appendTimeUnit(StringBuffer toAppend, int time, String label,
|
||||
boolean isTimeUnit) {
|
||||
boolean isTimeUnit) {
|
||||
if (time > 0) {
|
||||
if (isTimeUnit && (toAppend.indexOf("T") < 0)) {
|
||||
toAppend.append("T");
|
||||
|
@ -118,9 +119,9 @@ public class DateIntervalTerm extends AbstractTerm {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param interval
|
||||
* @return
|
||||
* @throws ParseException
|
||||
*/
|
||||
private void parseInterval() throws ParseException {
|
||||
String sVal = (String) getValue();
|
||||
|
@ -141,7 +142,7 @@ public class DateIntervalTerm extends AbstractTerm {
|
|||
weeks = 0;
|
||||
} else {
|
||||
throw new ParseException(sVal +
|
||||
" is not a valid Date interval", 0);
|
||||
" is not a valid Date interval", 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue