Skip to content

Commit a418c28

Browse files
grahamtriggsgrahamtriggs
committed
Initial port to Maven, and re-organisation ready for Orcid 2
1 parent 5d685ac commit a418c28

Some content is hidden

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

50 files changed

+867
-202
lines changed

‎.gitignore

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
1-
/bin
2-
.build
3-
.classpath
4-
.project
5-
distribute
1+
/.build/
2+
/deploy.properties
3+
/build.properties
4+
/runtime.properties
5+
/ontology/public/catalog-v0001.xml
6+
7+
rdf/auth/firsttime/test-user-model.owl
8+
utilities/solrtester/.work
9+
utilities/rdbmigration/.work
10+
11+
**/.idea
12+
**/*.iml
13+
**/target
14+
15+
**/overlays
16+
17+
# Eclipse artifacts
18+
**/.settings
19+
**/.classpath
20+
**/.project
21+
**/bin/

‎mockorcidapp/src/edu/cornell/mannlib/orcidclient/mockorcidapp/AddExternalIdAction.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
import org.apache.commons.logging.LogFactory;
1515

1616
import edu.cornell.mannlib.orcidclient.OrcidClientException;
17-
import edu.cornell.mannlib.orcidclient.orcidmessage.ExternalIdentifier;
18-
import edu.cornell.mannlib.orcidclient.orcidmessage.ExternalIdentifiers;
19-
import edu.cornell.mannlib.orcidclient.orcidmessage.OrcidBio;
20-
import edu.cornell.mannlib.orcidclient.orcidmessage.OrcidMessage;
21-
import edu.cornell.mannlib.orcidclient.orcidmessage.ScopePathType;
17+
import edu.cornell.mannlib.orcidclient.responses.message_1_2.ExternalIdentifier;
18+
import edu.cornell.mannlib.orcidclient.responses.message_1_2.ExternalIdentifiers;
19+
import edu.cornell.mannlib.orcidclient.responses.message_1_2.OrcidBio;
20+
import edu.cornell.mannlib.orcidclient.responses.message_1_2.OrcidMessage;
21+
import edu.cornell.mannlib.orcidclient.responses.message_1_2.ScopePathType;
2222

2323
/**
2424
* Add an exernal ID to the profile.

‎mockorcidapp/src/edu/cornell/mannlib/orcidclient/mockorcidapp/AuthorizationData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import edu.cornell.mannlib.orcidclient.auth.AccessToken;
66
import edu.cornell.mannlib.orcidclient.auth.AccessTokenFormatException;
7-
import edu.cornell.mannlib.orcidclient.orcidmessage.ScopePathType;
7+
import edu.cornell.mannlib.orcidclient.responses.message_1_2.ScopePathType;
88

99
/**
1010
* Hold all of the info regarding an Authorization. Created when an app requests

‎mockorcidapp/src/edu/cornell/mannlib/orcidclient/mockorcidapp/GetProfileAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.apache.commons.logging.LogFactory;
1515

1616
import edu.cornell.mannlib.orcidclient.OrcidClientException;
17-
import edu.cornell.mannlib.orcidclient.orcidmessage.OrcidMessage;
17+
import edu.cornell.mannlib.orcidclient.responses.message_1_2.OrcidMessage;
1818

1919
/**
2020
* Return the profile, including private parts.

‎mockorcidapp/src/edu/cornell/mannlib/orcidclient/mockorcidapp/OauthAuthorizeAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.apache.commons.logging.Log;
1212
import org.apache.commons.logging.LogFactory;
1313

14-
import edu.cornell.mannlib.orcidclient.orcidmessage.ScopePathType;
14+
import edu.cornell.mannlib.orcidclient.responses.message_1_2.ScopePathType;
1515

1616
/**
1717
* TODO

‎mockorcidapp/src/edu/cornell/mannlib/orcidclient/mockorcidapp/OrcidMessageUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.apache.commons.logging.LogFactory;
1818

1919
import edu.cornell.mannlib.orcidclient.OrcidClientException;
20-
import edu.cornell.mannlib.orcidclient.orcidmessage.OrcidMessage;
20+
import edu.cornell.mannlib.orcidclient.responses.message_1_2.OrcidMessage;
2121

2222
/**
2323
* TODO

‎mockorcidapp/src/edu/cornell/mannlib/orcidclient/mockorcidapp/OrcidProfiles.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.apache.commons.logging.LogFactory;
1818

1919
import edu.cornell.mannlib.orcidclient.OrcidClientException;
20-
import edu.cornell.mannlib.orcidclient.orcidmessage.OrcidMessage;
20+
import edu.cornell.mannlib.orcidclient.responses.message_1_2.OrcidMessage;
2121

2222
/**
2323
* Keep the ORCID profiles in memory.

‎mockorcidapp/src/edu/cornell/mannlib/orcidclient/mockorcidapp/OrcidSessionStatus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.apache.commons.logging.Log;
88
import org.apache.commons.logging.LogFactory;
99

10-
import edu.cornell.mannlib.orcidclient.orcidmessage.ScopePathType;
10+
import edu.cornell.mannlib.orcidclient.responses.message_1_2.ScopePathType;
1111

1212
/**
1313
* Hold the orcid status for this login session to the mock app.

‎mockorcidapp/src/edu/cornell/mannlib/orcidclient/mockorcidapp/PublicBioAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.apache.commons.logging.LogFactory;
1515

1616
import edu.cornell.mannlib.orcidclient.OrcidClientException;
17-
import edu.cornell.mannlib.orcidclient.orcidmessage.OrcidMessage;
17+
import edu.cornell.mannlib.orcidclient.responses.message_1_2.OrcidMessage;
1818

1919
/**
2020
* Handle a request for the public biography.

‎pom.xml

Lines changed: 241 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,241 @@
1+
<project
2+
xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
6+
<modelVersion>4.0.0</modelVersion>
7+
8+
<groupId>org.vivoweb</groupId>
9+
<artifactId>orcid-api-client</artifactId>
10+
<version>0.3</version>
11+
<packaging>jar</packaging>
12+
13+
<name>ORCiD Client API</name>
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>com.fasterxml.jackson.core</groupId>
18+
<artifactId>jackson-annotations</artifactId>
19+
<version>2.7.4</version>
20+
</dependency>
21+
<dependency>
22+
<groupId>com.fasterxml.jackson.core</groupId>
23+
<artifactId>jackson-core</artifactId>
24+
<version>2.7.4</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>com.fasterxml.jackson.core</groupId>
28+
<artifactId>jackson-databind</artifactId>
29+
<version>2.7.4</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.apache.httpcomponents</groupId>
33+
<artifactId>fluent-hc</artifactId>
34+
<version>4.5.2</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.apache.httpcomponents</groupId>
38+
<artifactId>httpclient</artifactId>
39+
<version>4.5.2</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>commons-logging</groupId>
43+
<artifactId>commons-logging</artifactId>
44+
<version>1.1.1</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>javax.servlet</groupId>
48+
<artifactId>servlet-api</artifactId>
49+
<version>2.5</version>
50+
<scope>provided</scope>
51+
</dependency>
52+
<dependency>
53+
<groupId>junit</groupId>
54+
<artifactId>junit</artifactId>
55+
<version>4.11</version>
56+
<scope>test</scope>
57+
</dependency>
58+
</dependencies>
59+
60+
<profiles>
61+
<profile>
62+
<id>doclint-java8-disable</id>
63+
<activation>
64+
<jdk>[1.8,)</jdk>
65+
</activation>
66+
<properties>
67+
<javadoc.opts>-Xdoclint:none</javadoc.opts>
68+
</properties>
69+
</profile>
70+
<profile>
71+
<id>release</id>
72+
<build>
73+
<plugins>
74+
<plugin>
75+
<groupId>org.apache.maven.plugins</groupId>
76+
<artifactId>maven-javadoc-plugin</artifactId>
77+
<executions>
78+
<execution>
79+
<id>attach-javadocs</id>
80+
<goals>
81+
<goal>jar</goal>
82+
</goals>
83+
</execution>
84+
</executions>
85+
<configuration>
86+
<quiet>true</quiet>
87+
<additionalparam>${javadoc.opts}</additionalparam>
88+
</configuration>
89+
</plugin>
90+
<plugin>
91+
<groupId>org.apache.maven.plugins</groupId>
92+
<artifactId>maven-source-plugin</artifactId>
93+
<executions>
94+
<execution>
95+
<id>attach-sources</id>
96+
<goals>
97+
<goal>jar-no-fork</goal>
98+
</goals>
99+
</execution>
100+
</executions>
101+
</plugin>
102+
<plugin>
103+
<groupId>org.apache.maven.plugins</groupId>
104+
<artifactId>maven-gpg-plugin</artifactId>
105+
<executions>
106+
<execution>
107+
<id>sign-artifacts</id>
108+
<phase>verify</phase>
109+
<goals>
110+
<goal>sign</goal>
111+
</goals>
112+
</execution>
113+
</executions>
114+
</plugin>
115+
<plugin>
116+
<groupId>org.sonatype.plugins</groupId>
117+
<artifactId>nexus-staging-maven-plugin</artifactId>
118+
<extensions>true</extensions>
119+
<configuration>
120+
<serverId>ossrh</serverId>
121+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
122+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
123+
</configuration>
124+
</plugin>
125+
<plugin>
126+
<groupId>org.codehaus.mojo</groupId>
127+
<artifactId>buildnumber-maven-plugin</artifactId>
128+
<executions>
129+
<execution>
130+
<phase>validate</phase>
131+
<goals>
132+
<goal>create</goal>
133+
</goals>
134+
</execution>
135+
</executions>
136+
<configuration>
137+
<doCheck>false</doCheck>
138+
<doUpdate>false</doUpdate>
139+
<shortRevisionLength>7</shortRevisionLength>
140+
<revisionOnScmFailure>true</revisionOnScmFailure>
141+
</configuration>
142+
</plugin>
143+
</plugins>
144+
</build>
145+
</profile>
146+
</profiles>
147+
148+
<build>
149+
<plugins>
150+
<plugin>
151+
<groupId>org.apache.maven.plugins</groupId>
152+
<artifactId>maven-compiler-plugin</artifactId>
153+
<configuration>
154+
<source>1.8</source>
155+
<target>1.8</target>
156+
<encoding>UTF-8</encoding>
157+
</configuration>
158+
</plugin>
159+
<plugin>
160+
<groupId>org.codehaus.mojo</groupId>
161+
<artifactId>jaxb2-maven-plugin</artifactId>
162+
<executions>
163+
<execution>
164+
<id>xjc</id>
165+
<phase>generate-sources</phase>
166+
<goals>
167+
<goal>xjc</goal>
168+
</goals>
169+
</execution>
170+
</executions>
171+
<configuration>
172+
<packageName>edu.cornell.mannlib.orcidclient.responses.message_1_2</packageName>
173+
<sources>
174+
<source>src/main/resources/orcid-message-1.2.xsd</source>
175+
</sources>
176+
<target>2.1</target>
177+
</configuration>
178+
</plugin>
179+
</plugins>
180+
<pluginManagement>
181+
<plugins>
182+
<plugin>
183+
<groupId>org.codehaus.mojo</groupId>
184+
<artifactId>jaxb2-maven-plugin</artifactId>
185+
<version>2.3.1</version>
186+
</plugin>
187+
<plugin>
188+
<artifactId>maven-clean-plugin</artifactId>
189+
<version>3.0.0</version>
190+
</plugin>
191+
<plugin>
192+
<groupId>org.apache.maven.plugins</groupId>
193+
<artifactId>maven-compiler-plugin</artifactId>
194+
<version>3.5.1</version>
195+
</plugin>
196+
<plugin>
197+
<groupId>org.apache.maven.plugins</groupId>
198+
<artifactId>maven-gpg-plugin</artifactId>
199+
<version>1.6</version>
200+
</plugin>
201+
<plugin>
202+
<groupId>org.apache.maven.plugins</groupId>
203+
<artifactId>maven-jar-plugin</artifactId>
204+
<version>2.6</version>
205+
</plugin>
206+
<plugin>
207+
<groupId>org.apache.maven.plugins</groupId>
208+
<artifactId>maven-javadoc-plugin</artifactId>
209+
<version>2.9.1</version>
210+
</plugin>
211+
<plugin>
212+
<groupId>org.apache.maven.plugins</groupId>
213+
<artifactId>maven-source-plugin</artifactId>
214+
<version>2.2.1</version>
215+
</plugin>
216+
<plugin>
217+
<groupId>org.codehaus.mojo</groupId>
218+
<artifactId>build-helper-maven-plugin</artifactId>
219+
<version>1.9.1</version>
220+
</plugin>
221+
<plugin>
222+
<groupId>org.codehaus.mojo</groupId>
223+
<artifactId>buildnumber-maven-plugin</artifactId>
224+
<version>1.4</version>
225+
</plugin>
226+
<plugin>
227+
<groupId>org.sonatype.plugins</groupId>
228+
<artifactId>nexus-staging-maven-plugin</artifactId>
229+
<version>1.6.3</version>
230+
</plugin>
231+
</plugins>
232+
</pluginManagement>
233+
</build>
234+
235+
<distributionManagement>
236+
<snapshotRepository>
237+
<id>ossrh</id>
238+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
239+
</snapshotRepository>
240+
</distributionManagement>
241+
</project>

‎src/edu/cornell/mannlib/orcidclient/actions/ActionManager.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/edu/cornell/mannlib/orcidclient/OrcidClientException.java renamed to ‎src/main/java/edu/cornell/mannlib/orcidclient/OrcidClientException.java

File renamed without changes.

0 commit comments

Comments
 (0)