Skip to content

Commit da65e8b

Browse files
author
Ben Conley
committed
Restructure some package conventions and dependencies
1 parent 17e56ed commit da65e8b

File tree

6 files changed

+18
-23
lines changed

6 files changed

+18
-23
lines changed

‎demo/demo.iml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,5 @@
88
<orderEntry type="inheritedJdk" />
99
<orderEntry type="sourceFolder" forTests="false" />
1010
<orderEntry type="module" module-name="twilio-thinQLCR-java" exported="" />
11-
<orderEntry type="library" exported="" name="Maven: com.twilio.sdk:twilio-java-sdk:6.3.0" level="project" />
12-
<orderEntry type="library" exported="" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
13-
<orderEntry type="library" exported="" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
1411
</component>
1512
</module>

‎demo/src/Main.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import com.twilio.sdk.TwilioRestException;
22
import com.twilio.sdk.resource.instance.Call;
3-
import com.twilio.thinq.TwilioWrapperLibrary;
4-
import com.twilio.thinq.TwilioWrapperLibraryBuilder;
3+
import com.thinq.twilio.TwilioWrapperLibrary;
4+
import com.thinq.twilio.TwilioWrapperLibraryBuilder;
5+
56
import org.apache.http.NameValuePair;
67
import org.apache.http.message.BasicNameValuePair;
78

@@ -32,4 +33,4 @@ public static void main(String[] args) throws TwilioRestException {
3233
Call result = library.call(params); //return value is call sid if success, otherwise error message.
3334
System.out.println("result: " + result.getSid());
3435
}
35-
}
36+
}

‎pom.xml.asc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
-----BEGIN PGP SIGNATURE-----
22

3-
iQEzBAABCAAdFiEE82mhePHFTMuT9UDqxV81G8jM1/QFAlj3eX4ACgkQxV81G8jM
4-
1/SSHQgAhvg346bNcmLAM9PghQkM/TT39aWre8pC34WeI8S8dwGWK4CfSZcM/VQF
5-
tuJt5y3HQEznk7TXd8CZjfRmEbSt4OFXR8b6FhZHi6/KZbUH/7fwJDxD8owY/poU
6-
d7EyeOywIT6yZMuqFBFP0fY7FqfFaeSEY0pfGbvUsBNWg9HL7ZPQZ8wRyXjD1VO0
7-
uaibX7/CeU4bTH19F/pj5Q9Otkx+rOEpXMFw9flQPNA0ZvH//Vp43n/tFFATeKOo
8-
1Ja31+GFkj0v23Hoc4DqHkUelcuvFYQPqWnu8X40UcSQw/XeEwduDy6CZ6dN0K18
9-
K4vmZWKT2fG9Qg5sHsJZChCZP0DCxQ==
10-
=NXNA
3+
iQEzBAABCAAdFiEE82mhePHFTMuT9UDqxV81G8jM1/QFAlj5+YoACgkQxV81G8jM
4+
1/Rc5wf/dDIDe7Vupn5O3Q+X5rdGLavN5lg2bafdcgj2pBLJWi+j3jzaXBdS88Wk
5+
fteNnCXlek+rJGZ2lDT16LfwaZJ64J3qsH3fxRF75iEfqYPy+utrEbYJ9mBsfZzS
6+
fEjVvYeq7GP6zXf5D4yE3ym7Xy//kkWvZf3m0qZDw1buDBE38sH/oZhMNBAuAnYs
7+
t62Cb6Y7dvPCA9O8OSvCDI9iWUftL+O0X7nFCQI6HGFURvnDBdUwcu3ujKARXMsa
8+
wqr51P3WkyMnUmNzAa/Jt11/oqSJuhN5/X7wNKkXh5etpkn7ARdJwcBSBDgEZYDj
9+
Q8IL25O7xKv/BnG8V+T1Jxr+TtvxXQ==
10+
=f+l2
1111
-----END PGP SIGNATURE-----

src/main/java/com/twilio/thinq/TwilioWrapperLibrary.java renamed to src/com/thinq/twilio/TwilioWrapperLibrary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.twilio.thinq;
1+
package com.thinq.twilio;
22

33
import com.twilio.sdk.TwilioRestClient;
44
import com.twilio.sdk.TwilioRestException;

src/main/java/com/twilio/thinq/TwilioWrapperLibraryBuilder.java renamed to src/com/thinq/twilio/TwilioWrapperLibraryBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.twilio.thinq;
1+
package com.thinq.twilio;
22

33
public class TwilioWrapperLibraryBuilder {
44
private String twilio_account_sid;

‎twilio-thinQLCR-java.iml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">
7-
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8-
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
9-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
10-
<excludeFolder url="file://$MODULE_DIR$/target" />
7+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
118
</content>
129
<orderEntry type="inheritedJdk" />
1310
<orderEntry type="sourceFolder" forTests="false" />
14-
<orderEntry type="library" name="Maven: com.twilio.sdk:twilio-java-sdk:6.3.0" level="project" />
11+
<orderEntry type="library" exported="" name="Maven: com.twilio.sdk:twilio-java-sdk:6.3.0" level="project" />
1512
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
1613
<orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1" level="project" />
1714
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.3" level="project" />
@@ -20,9 +17,9 @@
2017
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.6" level="project" />
2118
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.4.2" level="project" />
2219
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.4.0" level="project" />
23-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
20+
<orderEntry type="library" exported="" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
2421
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
25-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
22+
<orderEntry type="library" exported="" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
2623
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
2724
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.8" level="project" />
2825
</component>

0 commit comments

Comments
 (0)