Skip to content

Commit 611cebb

Browse files
SidneyAllenSidneyAllen
committed
merge PR #52 
1 parent 66ace70 commit 611cebb

12 files changed

Lines changed: 206 additions & 61 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22
.classpath
33
.project
44
.settings
5-
/.DS_Store
6-
.idea/
7-
*.iml
5+
.DS_Store

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Add this dependency and repository to your POM.xml
1616
<dependency>
1717
<groupId>com.xero</groupId>
1818
<artifactId>xero-java-sdk</artifactId>
19-
<version>0.4.7</version>
19+
<version>0.5.0</version>
2020
</dependency>
2121

2222
<repositories>

example/src/main/java/com/xero/example-spring/SpringConfig.java renamed to example/src/main/java/example-spring/SpringConfig.java

File renamed without changes.

‎example/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,42 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
4-
version="2.5"
5-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6-
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
7-
8-
<servlet>
9-
<servlet-name>RequestTokenServlet</servlet-name>
10-
<servlet-class>com.xero.example.RequestTokenServlet</servlet-class>
11-
</servlet>
12-
<servlet-mapping>
13-
<servlet-name>RequestTokenServlet</servlet-name>
14-
<url-pattern>/RequestTokenServlet</url-pattern>
15-
</servlet-mapping>
16-
<servlet>
17-
<servlet-name>CallbackServlet</servlet-name>
18-
<servlet-class>com.xero.example.CallbackServlet</servlet-class>
19-
</servlet>
20-
<servlet>
21-
<servlet-name>OAuthAccessToken</servlet-name>
22-
<servlet-class>com.xero.api.OAuthAccessToken</servlet-class>
23-
</servlet>
24-
<servlet>
25-
<servlet-name>RequestResourceServlet</servlet-name>
26-
<servlet-class>com.xero.example.RequestResourceServlet</servlet-class>
27-
</servlet>
28-
<servlet-mapping>
29-
<servlet-name>CallbackServlet</servlet-name>
30-
<url-pattern>/CallbackServlet</url-pattern>
31-
</servlet-mapping>
32-
<servlet-mapping>
33-
<servlet-name>OAuthAccessToken</servlet-name>
34-
<url-pattern>/OAuthAccessToken</url-pattern>
35-
</servlet-mapping>
36-
<servlet-mapping>
37-
<servlet-name>RequestResourceServlet</servlet-name>
38-
<url-pattern>/RequestResourceServlet</url-pattern>
39-
</servlet-mapping>
40-
<welcome-file-list>
41-
<welcome-file>index.jsp</welcome-file>
42-
</welcome-file-list>
3+
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
6+
<display-name>Xero Java SDK - Sample App</display-name>
7+
<servlet>
8+
<servlet-name>RequestTokenServlet</servlet-name>
9+
<servlet-class>com.xero.example.RequestTokenServlet</servlet-class>
10+
</servlet>
11+
<servlet-mapping>
12+
<servlet-name>RequestTokenServlet</servlet-name>
13+
<url-pattern>/RequestTokenServlet</url-pattern>
14+
</servlet-mapping>
15+
<servlet>
16+
<servlet-name>CallbackServlet</servlet-name>
17+
<servlet-class>com.xero.example.CallbackServlet</servlet-class>
18+
</servlet>
19+
<servlet>
20+
<servlet-name>OAuthAccessToken</servlet-name>
21+
<servlet-class>com.xero.api.OAuthAccessToken</servlet-class>
22+
</servlet>
23+
<servlet>
24+
<servlet-name>RequestResourceServlet</servlet-name>
25+
<servlet-class>com.xero.example.RequestResourceServlet</servlet-class>
26+
</servlet>
27+
<servlet-mapping>
28+
<servlet-name>CallbackServlet</servlet-name>
29+
<url-pattern>/CallbackServlet</url-pattern>
30+
</servlet-mapping>
31+
<servlet-mapping>
32+
<servlet-name>OAuthAccessToken</servlet-name>
33+
<url-pattern>/OAuthAccessToken</url-pattern>
34+
</servlet-mapping>
35+
<servlet-mapping>
36+
<servlet-name>RequestResourceServlet</servlet-name>
37+
<url-pattern>/RequestResourceServlet</url-pattern>
38+
</servlet-mapping>
39+
<welcome-file-list>
40+
<welcome-file>index.jsp</welcome-file>
41+
</welcome-file-list>
4342
</web-app>

‎pom.xml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.xero</groupId>
55
<artifactId>xero-java-sdk</artifactId>
66
<packaging>jar</packaging>
7-
<version>0.4.7</version>
7+
<version>0.5.0</version>
88
<name>Xero-Java SDK</name>
99
<url>http://maven.apache.org</url>
1010
<dependencies>
@@ -28,6 +28,11 @@
2828
<artifactId>xero-accounting-api-schema</artifactId>
2929
<version>0.0.7</version>
3030
</dependency>
31+
<dependency>
32+
<groupId>javax.servlet</groupId>
33+
<artifactId>javax.servlet-api</artifactId>
34+
<version>3.0.1</version>
35+
</dependency>
3136
</dependencies>
3237
<repositories>
3338
<repository>
@@ -127,6 +132,25 @@
127132
<artifactId>findbugs-maven-plugin</artifactId>
128133
<version>3.0.4</version>
129134
</plugin>
135+
<plugin>
136+
<groupId>org.apache.maven.plugins</groupId>
137+
<artifactId>maven-war-plugin</artifactId>
138+
<version>3.1.0</version>
139+
<configuration>
140+
<webXml>example/src/main/webapp/WEB-INF/web.xml</webXml>
141+
<webResources>
142+
<resource>
143+
<!-- this is relative to the pom.xml directory -->
144+
<directory>example/src/main/webapp</directory>
145+
</resource>
146+
<resource>
147+
<!-- this is relative to the pom.xml directory -->
148+
<targetPath>WEB-INF/classes</targetPath>
149+
<directory>example/src/main/resources</directory>
150+
</resource>
151+
</webResources>
152+
</configuration>
153+
</plugin>
130154
</plugins>
131155
</build>
132156
<reporting>

‎src/main/java/com/xero/api/JsonConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public String getAccessTokenUrl() {
9595

9696
@Override
9797
public String getUserAgent() {
98-
return USER_AGENT + " [Xero-Java-0.4.7]";
98+
return USER_AGENT + " [Xero-Java-0.5.0]";
9999
}
100100

101101
@Override

example/src/main/java/com/xero/example/CallbackServlet.java renamed to src/main/java/com/xero/example/CallbackServlet.java

File renamed without changes.

0 commit comments

Comments
 (0)