Skip to content

Commit 2438639

Browse files
ramittalramittal
committed
Merge branch 'master' into vNext
2 parents dbb6e4b + 734bb1a commit 2438639

File tree

305 files changed

+4528
-1865
lines changed

Some content is hidden

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

305 files changed

+4528
-1865
lines changed

‎build.xml

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<project name="anet-java-sdk" default="compile" basedir=".">
3-
<property name="version" value="1.8.0" />
3+
<property name="version" value="1.8.2" />
44
<property name="dirs.base" value="${basedir}" />
55
<property name="src.dir" value="${basedir}/src/main/java" />
66
<property name="javadocs.dir" value="${basedir}/docs/javadocs" />
@@ -10,7 +10,10 @@
1010
<property name="src.tests" value="${basedir}/src/test/java" />
1111
<property name="resources.dir" value="${basedir}/resources" />
1212
<property name="reports.tests" value="${src.tests}/reports" />
13-
13+
<property name="javac.version" value="1.5" />
14+
<!--
15+
<property file="${resources.dir}/build.properties"/>
16+
-->
1417
<!-- build.properties related info -->
1518
<property file="${user.home}/build.properties" />
1619
<property file="${user.home}/${ant.project.name}.properties" />
@@ -24,6 +27,7 @@
2427

2528
<path id="classpath">
2629
<fileset dir="${lib.dir}" includes="**/*.jar" />
30+
<pathelement path="${resources.dir}" />
2731
</path>
2832

2933
<path id="junit-classpath">
@@ -33,20 +37,22 @@
3337
</path>
3438

3539
<target name="clean">
36-
<fileset dir="${build.dir}" includes="**/*.jar" />
37-
<delete dir="${classes.dir}" />
40+
<delete includeEmptyDirs="true" quiet="true">
41+
<fileset dir="${classes.dir}" includes="**/*.*" />
42+
<fileset dir="${build.dir}" includes="**/*.jar" />
43+
</delete>
3844
</target>
3945

4046
<target name="compile">
4147
<mkdir dir="${classes.dir}" />
42-
<javac srcdir="${src.dir}" destdir="${classes.dir}" debug="true" optimize="true" includes="**/*.java" classpathref="classpath" includeantruntime="false">
48+
<javac srcdir="${src.dir}" destdir="${classes.dir}" debug="true" optimize="true" includes="**/*.java" classpathref="classpath" includeantruntime="false" source="${javac.version}" target="${javac.version}">
4349
<compilerarg value="-Xlint" />
4450
</javac>
4551
</target>
4652

4753
<target name="compile-test" depends="compile">
4854
<mkdir dir="${classes.dir}" />
49-
<javac srcdir="${src.tests}" destdir="${classes.dir}" debug="true" optimize="false" includes="**/*.java" classpathref="classpath" includeantruntime="false">
55+
<javac srcdir="${src.tests}" destdir="${classes.dir}" debug="true" optimize="false" includes="**/*.java" classpathref="classpath" includeantruntime="false" source="${javac.version}" target="${javac.version}">
5056
<compilerarg value="-Xlint" />
5157
</javac>
5258
</target>
@@ -56,14 +62,26 @@
5662
<jar jarfile="${build.dir}/${ant.project.name}-${version}.jar">
5763
<fileset dir="${classes.dir}">
5864
<include name="**/*.class" />
59-
<exclude name="**/test/*.class" />
65+
<exclude name="**/*Test*.class" />
6066
</fileset>
6167
</jar>
62-
<jar jarfile="${build.dir}/${ant.project.name}-test.jar">
68+
<jar jarfile="${build.dir}/${ant.project.name}-test-${version}.jar">
6369
<fileset dir="${classes.dir}">
64-
<include name="**/test/*.class" />
70+
<include name="**/*Test*.class" />
71+
</fileset>
72+
</jar>
73+
74+
<jar jarfile="${build.dir}/${ant.project.name}-src-${version}.jar">
75+
<fileset dir="${src.dir}">
76+
<include name="**/*.java" />
77+
</fileset>
78+
<fileset dir="${src.tests}">
79+
<include name="**/*.java" />
6580
</fileset>
6681
</jar>
82+
<!-- Make VeraCode happy by giving same binary file name to verify -->
83+
<copy file="${build.dir}/${ant.project.name}-${version}.jar" tofile="${build.dir}/${ant.project.name}.jar"/>
84+
<copy file="${build.dir}/${ant.project.name}-test-${version}.jar" tofile="${build.dir}/${ant.project.name}-test.jar"/>
6785
</target>
6886

6987
<target name="unit-test" depends="jar">
@@ -83,13 +101,16 @@
83101
<batchtest fork="yes" todir="${reports.tests}">
84102
<fileset dir="${classes.dir}">
85103
<include name="**/*Test*.class" />
86-
<exclude name="**/UnitTestData.class" />
104+
<!--include name="net/authorize/cim/functional_test/*Test*.class" /-->
105+
<exclude name="**/UnitTestData.class, **/MyTest.class" />
87106
</fileset>
88107
</batchtest>
89108
</junit>
90109
<fail message="test failed" if="test.failure" />
91110
</target>
92111

112+
<target name="test" depends="unit-test" />
113+
93114
<target name="javadoc" description="Create javadocs for all files">
94115
<delete dir="${javadocs.dir}" />
95116
<mkdir dir="${javadocs.dir}" />

‎docs/javadocs/allclasses-frame.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_05) on Thu May 01 13:33:03 PDT 2014 -->
5+
<!-- Generated by javadoc (1.8.0_05) on Thu May 15 16:07:13 PDT 2014 -->
66
<title>All Classes (Authorize.Net Java SDK)</title>
7-
<meta name="date" content="2014-05-01">
7+
<meta name="date" content="2014-05-15">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>
@@ -49,6 +49,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
4949
<li><a href="net/authorize/util/HttpClient.html" title="class in net.authorize.util" target="classFrame">HttpClient</a></li>
5050
<li><a href="net/authorize/sim/button/ImageButton.html" title="class in net.authorize.sim.button" target="classFrame">ImageButton</a></li>
5151
<li><a href="net/authorize/sim/LinkMethod.html" title="enum in net.authorize.sim" target="classFrame">LinkMethod</a></li>
52+
<li><a href="net/authorize/util/LogHelper.html" title="class in net.authorize.util" target="classFrame">LogHelper</a></li>
5253
<li><a href="net/authorize/util/Luhn.html" title="class in net.authorize.util" target="classFrame">Luhn</a></li>
5354
<li><a href="net/authorize/MarketType.html" title="enum in net.authorize" target="classFrame">MarketType</a></li>
5455
<li><a href="net/authorize/Merchant.html" title="class in net.authorize" target="classFrame">Merchant</a></li>
@@ -77,9 +78,11 @@ <h1 class="bar">All&nbsp;Classes</h1>
7778
<li><a href="net/authorize/sim/Result.html" title="class in net.authorize.sim" target="classFrame">Result</a></li>
7879
<li><a href="net/authorize/xml/Result.html" title="class in net.authorize.xml" target="classFrame">Result</a></li>
7980
<li><a href="net/authorize/data/echeck/ReturnCode.html" title="enum in net.authorize.data.echeck" target="classFrame">ReturnCode</a></li>
81+
<li><a href="net/authorize/data/reporting/ReturnedItem.html" title="class in net.authorize.data.reporting" target="classFrame">ReturnedItem</a></li>
8082
<li><a href="net/authorize/data/xml/reporting/SettlementStateType.html" title="enum in net.authorize.data.xml.reporting" target="classFrame">SettlementStateType</a></li>
8183
<li><a href="net/authorize/data/ShippingAddress.html" title="class in net.authorize.data" target="classFrame">ShippingAddress</a></li>
8284
<li><a href="net/authorize/data/ShippingCharges.html" title="class in net.authorize.data" target="classFrame">ShippingCharges</a></li>
85+
<li><a href="net/authorize/data/reporting/Solution.html" title="class in net.authorize.data.reporting" target="classFrame">Solution</a></li>
8386
<li><a href="net/authorize/cim/SplitTenderStatus.html" title="enum in net.authorize.cim" target="classFrame">SplitTenderStatus</a></li>
8487
<li><a href="net/authorize/util/StringUtils.html" title="class in net.authorize.util" target="classFrame">StringUtils</a></li>
8588
<li><a href="net/authorize/data/arb/Subscription.html" title="class in net.authorize.data.arb" target="classFrame">Subscription</a></li>

‎docs/javadocs/allclasses-noframe.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_05) on Thu May 01 13:33:03 PDT 2014 -->
5+
<!-- Generated by javadoc (1.8.0_05) on Thu May 15 16:07:13 PDT 2014 -->
66
<title>All Classes (Authorize.Net Java SDK)</title>
7-
<meta name="date" content="2014-05-01">
7+
<meta name="date" content="2014-05-15">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>
@@ -49,6 +49,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
4949
<li><a href="net/authorize/util/HttpClient.html" title="class in net.authorize.util">HttpClient</a></li>
5050
<li><a href="net/authorize/sim/button/ImageButton.html" title="class in net.authorize.sim.button">ImageButton</a></li>
5151
<li><a href="net/authorize/sim/LinkMethod.html" title="enum in net.authorize.sim">LinkMethod</a></li>
52+
<li><a href="net/authorize/util/LogHelper.html" title="class in net.authorize.util">LogHelper</a></li>
5253
<li><a href="net/authorize/util/Luhn.html" title="class in net.authorize.util">Luhn</a></li>
5354
<li><a href="net/authorize/MarketType.html" title="enum in net.authorize">MarketType</a></li>
5455
<li><a href="net/authorize/Merchant.html" title="class in net.authorize">Merchant</a></li>
@@ -77,9 +78,11 @@ <h1 class="bar">All&nbsp;Classes</h1>
7778
<li><a href="net/authorize/sim/Result.html" title="class in net.authorize.sim">Result</a></li>
7879
<li><a href="net/authorize/xml/Result.html" title="class in net.authorize.xml">Result</a></li>
7980
<li><a href="net/authorize/data/echeck/ReturnCode.html" title="enum in net.authorize.data.echeck">ReturnCode</a></li>
81+
<li><a href="net/authorize/data/reporting/ReturnedItem.html" title="class in net.authorize.data.reporting">ReturnedItem</a></li>
8082
<li><a href="net/authorize/data/xml/reporting/SettlementStateType.html" title="enum in net.authorize.data.xml.reporting">SettlementStateType</a></li>
8183
<li><a href="net/authorize/data/ShippingAddress.html" title="class in net.authorize.data">ShippingAddress</a></li>
8284
<li><a href="net/authorize/data/ShippingCharges.html" title="class in net.authorize.data">ShippingCharges</a></li>
85+
<li><a href="net/authorize/data/reporting/Solution.html" title="class in net.authorize.data.reporting">Solution</a></li>
8386
<li><a href="net/authorize/cim/SplitTenderStatus.html" title="enum in net.authorize.cim">SplitTenderStatus</a></li>
8487
<li><a href="net/authorize/util/StringUtils.html" title="class in net.authorize.util">StringUtils</a></li>
8588
<li><a href="net/authorize/data/arb/Subscription.html" title="class in net.authorize.data.arb">Subscription</a></li>

‎docs/javadocs/constant-values.html

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_05) on Thu May 01 13:33:02 PDT 2014 -->
5+
<!-- Generated by javadoc (1.8.0_05) on Thu May 15 16:07:11 PDT 2014 -->
66
<title>Constant Field Values (Authorize.Net Java SDK)</title>
7-
<meta name="date" content="2014-05-01">
7+
<meta name="date" content="2014-05-15">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>
@@ -116,6 +116,25 @@ <h2 title="net.authorize">net.authorize.*</h2>
116116
</li>
117117
<li class="blockList">
118118
<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
119+
<caption><span>net.authorize.<a href="net/authorize/Result.html" title="class in net.authorize">Result</a>&lt;<a href="net/authorize/Result.html" title="type parameter in Result">T</a>&gt;</span><span class="tabEnd">&nbsp;</span></caption>
120+
<tr>
121+
<th class="colFirst" scope="col">Modifier and Type</th>
122+
<th scope="col">Constant Field</th>
123+
<th class="colLast" scope="col">Value</th>
124+
</tr>
125+
<tbody>
126+
<tr class="altColor">
127+
<td class="colFirst"><a name="net.authorize.Result.MessageDigestAlgorithm">
128+
<!-- -->
129+
</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
130+
<td><code><a href="net/authorize/Result.html#MessageDigestAlgorithm">MessageDigestAlgorithm</a></code></td>
131+
<td class="colLast"><code>"MD5"</code></td>
132+
</tr>
133+
</tbody>
134+
</table>
135+
</li>
136+
<li class="blockList">
137+
<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
119138
<caption><span>net.authorize.<a href="net/authorize/Transaction.html" title="class in net.authorize">Transaction</a></span><span class="tabEnd">&nbsp;</span></caption>
120139
<tr>
121140
<th class="colFirst" scope="col">Modifier and Type</th>

‎docs/javadocs/deprecated-list.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_05) on Thu May 01 13:33:03 PDT 2014 -->
5+
<!-- Generated by javadoc (1.8.0_05) on Thu May 15 16:07:13 PDT 2014 -->
66
<title>Deprecated List (Authorize.Net Java SDK)</title>
7-
<meta name="date" content="2014-05-01">
7+
<meta name="date" content="2014-05-15">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>

‎docs/javadocs/help-doc.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_05) on Thu May 01 13:33:03 PDT 2014 -->
5+
<!-- Generated by javadoc (1.8.0_05) on Thu May 15 16:07:13 PDT 2014 -->
66
<title>API Help (Authorize.Net Java SDK)</title>
7-
<meta name="date" content="2014-05-01">
7+
<meta name="date" content="2014-05-15">
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy