Restructure some package conventions and dependencies

thinqinc · Apr 21, 2017 · da65e8b · da65e8b
1 parent 17e56ed
commit da65e8b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 23 deletions.
diff --git a/demo/demo.iml b/demo/demo.iml
@@ -8,8 +8,5 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="twilio-thinQLCR-java" exported="" />
-    <orderEntry type="library" exported="" name="Maven: com.twilio.sdk:twilio-java-sdk:6.3.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
   </component>
 </module>
diff --git a/demo/src/Main.java b/demo/src/Main.java
@@ -1,7 +1,8 @@
 import com.twilio.sdk.TwilioRestException;
 import com.twilio.sdk.resource.instance.Call;
-import com.twilio.thinq.TwilioWrapperLibrary;
-import com.twilio.thinq.TwilioWrapperLibraryBuilder;
+import com.thinq.twilio.TwilioWrapperLibrary;
+import com.thinq.twilio.TwilioWrapperLibraryBuilder;
+
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
 
@@ -32,4 +33,4 @@ public static void main(String[] args) throws TwilioRestException {
         Call result = library.call(params); //return value is call sid if success, otherwise error message.
         System.out.println("result: " + result.getSid());
     }
-}
+}
diff --git a/pom.xml.asc b/pom.xml.asc
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQEzBAABCAAdFiEE82mhePHFTMuT9UDqxV81G8jM1/QFAlj3eX4ACgkQxV81G8jM
-1/SSHQgAhvg346bNcmLAM9PghQkM/TT39aWre8pC34WeI8S8dwGWK4CfSZcM/VQF
-tuJt5y3HQEznk7TXd8CZjfRmEbSt4OFXR8b6FhZHi6/KZbUH/7fwJDxD8owY/poU
-d7EyeOywIT6yZMuqFBFP0fY7FqfFaeSEY0pfGbvUsBNWg9HL7ZPQZ8wRyXjD1VO0
-uaibX7/CeU4bTH19F/pj5Q9Otkx+rOEpXMFw9flQPNA0ZvH//Vp43n/tFFATeKOo
-1Ja31+GFkj0v23Hoc4DqHkUelcuvFYQPqWnu8X40UcSQw/XeEwduDy6CZ6dN0K18
-K4vmZWKT2fG9Qg5sHsJZChCZP0DCxQ==
-=NXNA
+iQEzBAABCAAdFiEE82mhePHFTMuT9UDqxV81G8jM1/QFAlj5+YoACgkQxV81G8jM
+1/Rc5wf/dDIDe7Vupn5O3Q+X5rdGLavN5lg2bafdcgj2pBLJWi+j3jzaXBdS88Wk
+fteNnCXlek+rJGZ2lDT16LfwaZJ64J3qsH3fxRF75iEfqYPy+utrEbYJ9mBsfZzS
+fEjVvYeq7GP6zXf5D4yE3ym7Xy//kkWvZf3m0qZDw1buDBE38sH/oZhMNBAuAnYs
+t62Cb6Y7dvPCA9O8OSvCDI9iWUftL+O0X7nFCQI6HGFURvnDBdUwcu3ujKARXMsa
+wqr51P3WkyMnUmNzAa/Jt11/oqSJuhN5/X7wNKkXh5etpkn7ARdJwcBSBDgEZYDj
+Q8IL25O7xKv/BnG8V+T1Jxr+TtvxXQ==
+=f+l2
 -----END PGP SIGNATURE-----
diff --git a/...om/twilio/thinq/TwilioWrapperLibrary.java → ...om/thinq/twilio/TwilioWrapperLibrary.java b/...om/twilio/thinq/TwilioWrapperLibrary.java → ...om/thinq/twilio/TwilioWrapperLibrary.java
@@ -1,4 +1,4 @@
-package com.twilio.thinq;
+package com.thinq.twilio;
 
 import com.twilio.sdk.TwilioRestClient;
 import com.twilio.sdk.TwilioRestException;

diff --git a/...io/thinq/TwilioWrapperLibraryBuilder.java → ...q/twilio/TwilioWrapperLibraryBuilder.java b/...io/thinq/TwilioWrapperLibraryBuilder.java → ...q/twilio/TwilioWrapperLibraryBuilder.java
@@ -1,4 +1,4 @@
-package com.twilio.thinq;
+package com.thinq.twilio;
 
 public class TwilioWrapperLibraryBuilder {
     private String twilio_account_sid;

diff --git a/twilio-thinQLCR-java.iml b/twilio-thinQLCR-java.iml
@@ -4,14 +4,11 @@
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.twilio.sdk:twilio-java-sdk:6.3.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.twilio.sdk:twilio-java-sdk:6.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.3" level="project" />
@@ -20,9 +17,9 @@
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.6" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.4.2" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.8" level="project" />
   </component>