diff --git a/.classpath b/.classpath deleted file mode 100644 index aa8f268..0000000 --- a/.classpath +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index b55ed5a..7648b24 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ *.class .settings/ +.classpath +.project # Package Files # *.war diff --git a/.project b/.project deleted file mode 100644 index cc45e9d..0000000 --- a/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - java-figo - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - - diff --git a/figo-client-sdk/.gitignore b/figo-client-sdk/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/figo-client-sdk/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/figo-client-sdk/pom.xml b/figo-client-sdk/pom.xml new file mode 100644 index 0000000..63b280b --- /dev/null +++ b/figo-client-sdk/pom.xml @@ -0,0 +1,14 @@ + + 4.0.0 + + + me.figo + figo-sdk-parent + 1.3.3 + + + sdk + + jar + diff --git a/src/main/java/me/figo/FigoApi.java b/figo-client-sdk/src/main/java/me/figo/FigoApi.java similarity index 100% rename from src/main/java/me/figo/FigoApi.java rename to figo-client-sdk/src/main/java/me/figo/FigoApi.java diff --git a/src/main/java/me/figo/FigoConnection.java b/figo-client-sdk/src/main/java/me/figo/FigoConnection.java similarity index 100% rename from src/main/java/me/figo/FigoConnection.java rename to figo-client-sdk/src/main/java/me/figo/FigoConnection.java diff --git a/src/main/java/me/figo/FigoException.java b/figo-client-sdk/src/main/java/me/figo/FigoException.java similarity index 100% rename from src/main/java/me/figo/FigoException.java rename to figo-client-sdk/src/main/java/me/figo/FigoException.java diff --git a/src/main/java/me/figo/FigoPinException.java b/figo-client-sdk/src/main/java/me/figo/FigoPinException.java similarity index 100% rename from src/main/java/me/figo/FigoPinException.java rename to figo-client-sdk/src/main/java/me/figo/FigoPinException.java diff --git a/src/main/java/me/figo/FigoSession.java b/figo-client-sdk/src/main/java/me/figo/FigoSession.java similarity index 100% rename from src/main/java/me/figo/FigoSession.java rename to figo-client-sdk/src/main/java/me/figo/FigoSession.java diff --git a/src/main/java/me/figo/internal/AccountOrderRequest.java b/figo-client-sdk/src/main/java/me/figo/internal/AccountOrderRequest.java similarity index 100% rename from src/main/java/me/figo/internal/AccountOrderRequest.java rename to figo-client-sdk/src/main/java/me/figo/internal/AccountOrderRequest.java diff --git a/src/main/java/me/figo/internal/CreateUserRequest.java b/figo-client-sdk/src/main/java/me/figo/internal/CreateUserRequest.java similarity index 100% rename from src/main/java/me/figo/internal/CreateUserRequest.java rename to figo-client-sdk/src/main/java/me/figo/internal/CreateUserRequest.java diff --git a/src/main/java/me/figo/internal/CreateUserResponse.java b/figo-client-sdk/src/main/java/me/figo/internal/CreateUserResponse.java similarity index 100% rename from src/main/java/me/figo/internal/CreateUserResponse.java rename to figo-client-sdk/src/main/java/me/figo/internal/CreateUserResponse.java diff --git a/src/main/java/me/figo/internal/CredentialLoginRequest.java b/figo-client-sdk/src/main/java/me/figo/internal/CredentialLoginRequest.java similarity index 100% rename from src/main/java/me/figo/internal/CredentialLoginRequest.java rename to figo-client-sdk/src/main/java/me/figo/internal/CredentialLoginRequest.java diff --git a/src/main/java/me/figo/internal/FakeTrustManager.java b/figo-client-sdk/src/main/java/me/figo/internal/FakeTrustManager.java similarity index 100% rename from src/main/java/me/figo/internal/FakeTrustManager.java rename to figo-client-sdk/src/main/java/me/figo/internal/FakeTrustManager.java diff --git a/src/main/java/me/figo/internal/FigoTrustManager.java b/figo-client-sdk/src/main/java/me/figo/internal/FigoTrustManager.java similarity index 100% rename from src/main/java/me/figo/internal/FigoTrustManager.java rename to figo-client-sdk/src/main/java/me/figo/internal/FigoTrustManager.java diff --git a/src/main/java/me/figo/internal/GsonAdapter.java b/figo-client-sdk/src/main/java/me/figo/internal/GsonAdapter.java similarity index 100% rename from src/main/java/me/figo/internal/GsonAdapter.java rename to figo-client-sdk/src/main/java/me/figo/internal/GsonAdapter.java diff --git a/src/main/java/me/figo/internal/SetupAccountRequest.java b/figo-client-sdk/src/main/java/me/figo/internal/SetupAccountRequest.java similarity index 100% rename from src/main/java/me/figo/internal/SetupAccountRequest.java rename to figo-client-sdk/src/main/java/me/figo/internal/SetupAccountRequest.java diff --git a/src/main/java/me/figo/internal/StandingOrderIntervalType.java b/figo-client-sdk/src/main/java/me/figo/internal/StandingOrderIntervalType.java similarity index 100% rename from src/main/java/me/figo/internal/StandingOrderIntervalType.java rename to figo-client-sdk/src/main/java/me/figo/internal/StandingOrderIntervalType.java diff --git a/src/main/java/me/figo/internal/SubmitPaymentRequest.java b/figo-client-sdk/src/main/java/me/figo/internal/SubmitPaymentRequest.java similarity index 100% rename from src/main/java/me/figo/internal/SubmitPaymentRequest.java rename to figo-client-sdk/src/main/java/me/figo/internal/SubmitPaymentRequest.java diff --git a/src/main/java/me/figo/internal/SyncTokenRequest.java b/figo-client-sdk/src/main/java/me/figo/internal/SyncTokenRequest.java similarity index 100% rename from src/main/java/me/figo/internal/SyncTokenRequest.java rename to figo-client-sdk/src/main/java/me/figo/internal/SyncTokenRequest.java diff --git a/src/main/java/me/figo/internal/TaskResponseType.java b/figo-client-sdk/src/main/java/me/figo/internal/TaskResponseType.java similarity index 100% rename from src/main/java/me/figo/internal/TaskResponseType.java rename to figo-client-sdk/src/main/java/me/figo/internal/TaskResponseType.java diff --git a/src/main/java/me/figo/internal/TaskStatusRequest.java b/figo-client-sdk/src/main/java/me/figo/internal/TaskStatusRequest.java similarity index 100% rename from src/main/java/me/figo/internal/TaskStatusRequest.java rename to figo-client-sdk/src/main/java/me/figo/internal/TaskStatusRequest.java diff --git a/src/main/java/me/figo/internal/TaskStatusResponse.java b/figo-client-sdk/src/main/java/me/figo/internal/TaskStatusResponse.java similarity index 100% rename from src/main/java/me/figo/internal/TaskStatusResponse.java rename to figo-client-sdk/src/main/java/me/figo/internal/TaskStatusResponse.java diff --git a/src/main/java/me/figo/internal/TaskTokenResponse.java b/figo-client-sdk/src/main/java/me/figo/internal/TaskTokenResponse.java similarity index 100% rename from src/main/java/me/figo/internal/TaskTokenResponse.java rename to figo-client-sdk/src/main/java/me/figo/internal/TaskTokenResponse.java diff --git a/src/main/java/me/figo/internal/TokenRequest.java b/figo-client-sdk/src/main/java/me/figo/internal/TokenRequest.java similarity index 100% rename from src/main/java/me/figo/internal/TokenRequest.java rename to figo-client-sdk/src/main/java/me/figo/internal/TokenRequest.java diff --git a/src/main/java/me/figo/internal/TokenResponse.java b/figo-client-sdk/src/main/java/me/figo/internal/TokenResponse.java similarity index 100% rename from src/main/java/me/figo/internal/TokenResponse.java rename to figo-client-sdk/src/main/java/me/figo/internal/TokenResponse.java diff --git a/src/main/java/me/figo/internal/VisitedRequest.java b/figo-client-sdk/src/main/java/me/figo/internal/VisitedRequest.java similarity index 100% rename from src/main/java/me/figo/internal/VisitedRequest.java rename to figo-client-sdk/src/main/java/me/figo/internal/VisitedRequest.java diff --git a/src/main/java/me/figo/models/Account.java b/figo-client-sdk/src/main/java/me/figo/models/Account.java similarity index 100% rename from src/main/java/me/figo/models/Account.java rename to figo-client-sdk/src/main/java/me/figo/models/Account.java diff --git a/src/main/java/me/figo/models/AccountBalance.java b/figo-client-sdk/src/main/java/me/figo/models/AccountBalance.java similarity index 100% rename from src/main/java/me/figo/models/AccountBalance.java rename to figo-client-sdk/src/main/java/me/figo/models/AccountBalance.java diff --git a/src/main/java/me/figo/models/Bank.java b/figo-client-sdk/src/main/java/me/figo/models/Bank.java similarity index 100% rename from src/main/java/me/figo/models/Bank.java rename to figo-client-sdk/src/main/java/me/figo/models/Bank.java diff --git a/src/main/java/me/figo/models/BusinessProcess.java b/figo-client-sdk/src/main/java/me/figo/models/BusinessProcess.java similarity index 100% rename from src/main/java/me/figo/models/BusinessProcess.java rename to figo-client-sdk/src/main/java/me/figo/models/BusinessProcess.java diff --git a/src/main/java/me/figo/models/Challenge.java b/figo-client-sdk/src/main/java/me/figo/models/Challenge.java similarity index 100% rename from src/main/java/me/figo/models/Challenge.java rename to figo-client-sdk/src/main/java/me/figo/models/Challenge.java diff --git a/src/main/java/me/figo/models/Credential.java b/figo-client-sdk/src/main/java/me/figo/models/Credential.java similarity index 100% rename from src/main/java/me/figo/models/Credential.java rename to figo-client-sdk/src/main/java/me/figo/models/Credential.java diff --git a/src/main/java/me/figo/models/LoginSettings.java b/figo-client-sdk/src/main/java/me/figo/models/LoginSettings.java similarity index 100% rename from src/main/java/me/figo/models/LoginSettings.java rename to figo-client-sdk/src/main/java/me/figo/models/LoginSettings.java diff --git a/src/main/java/me/figo/models/Notification.java b/figo-client-sdk/src/main/java/me/figo/models/Notification.java similarity index 100% rename from src/main/java/me/figo/models/Notification.java rename to figo-client-sdk/src/main/java/me/figo/models/Notification.java diff --git a/src/main/java/me/figo/models/Payment.java b/figo-client-sdk/src/main/java/me/figo/models/Payment.java similarity index 100% rename from src/main/java/me/figo/models/Payment.java rename to figo-client-sdk/src/main/java/me/figo/models/Payment.java diff --git a/src/main/java/me/figo/models/PaymentContainer.java b/figo-client-sdk/src/main/java/me/figo/models/PaymentContainer.java similarity index 100% rename from src/main/java/me/figo/models/PaymentContainer.java rename to figo-client-sdk/src/main/java/me/figo/models/PaymentContainer.java diff --git a/src/main/java/me/figo/models/PaymentProposal.java b/figo-client-sdk/src/main/java/me/figo/models/PaymentProposal.java similarity index 100% rename from src/main/java/me/figo/models/PaymentProposal.java rename to figo-client-sdk/src/main/java/me/figo/models/PaymentProposal.java diff --git a/src/main/java/me/figo/models/PaymentType.java b/figo-client-sdk/src/main/java/me/figo/models/PaymentType.java similarity index 100% rename from src/main/java/me/figo/models/PaymentType.java rename to figo-client-sdk/src/main/java/me/figo/models/PaymentType.java diff --git a/src/main/java/me/figo/models/ProcessOption.java b/figo-client-sdk/src/main/java/me/figo/models/ProcessOption.java similarity index 100% rename from src/main/java/me/figo/models/ProcessOption.java rename to figo-client-sdk/src/main/java/me/figo/models/ProcessOption.java diff --git a/src/main/java/me/figo/models/ProcessStep.java b/figo-client-sdk/src/main/java/me/figo/models/ProcessStep.java similarity index 100% rename from src/main/java/me/figo/models/ProcessStep.java rename to figo-client-sdk/src/main/java/me/figo/models/ProcessStep.java diff --git a/src/main/java/me/figo/models/ProcessToken.java b/figo-client-sdk/src/main/java/me/figo/models/ProcessToken.java similarity index 100% rename from src/main/java/me/figo/models/ProcessToken.java rename to figo-client-sdk/src/main/java/me/figo/models/ProcessToken.java diff --git a/src/main/java/me/figo/models/Security.java b/figo-client-sdk/src/main/java/me/figo/models/Security.java similarity index 100% rename from src/main/java/me/figo/models/Security.java rename to figo-client-sdk/src/main/java/me/figo/models/Security.java diff --git a/src/main/java/me/figo/models/Service.java b/figo-client-sdk/src/main/java/me/figo/models/Service.java similarity index 100% rename from src/main/java/me/figo/models/Service.java rename to figo-client-sdk/src/main/java/me/figo/models/Service.java diff --git a/src/main/java/me/figo/models/StandingOrder.java b/figo-client-sdk/src/main/java/me/figo/models/StandingOrder.java similarity index 100% rename from src/main/java/me/figo/models/StandingOrder.java rename to figo-client-sdk/src/main/java/me/figo/models/StandingOrder.java diff --git a/src/main/java/me/figo/models/SynchronizationStatus.java b/figo-client-sdk/src/main/java/me/figo/models/SynchronizationStatus.java similarity index 100% rename from src/main/java/me/figo/models/SynchronizationStatus.java rename to figo-client-sdk/src/main/java/me/figo/models/SynchronizationStatus.java diff --git a/src/main/java/me/figo/models/TanScheme.java b/figo-client-sdk/src/main/java/me/figo/models/TanScheme.java similarity index 100% rename from src/main/java/me/figo/models/TanScheme.java rename to figo-client-sdk/src/main/java/me/figo/models/TanScheme.java diff --git a/src/main/java/me/figo/models/Transaction.java b/figo-client-sdk/src/main/java/me/figo/models/Transaction.java similarity index 100% rename from src/main/java/me/figo/models/Transaction.java rename to figo-client-sdk/src/main/java/me/figo/models/Transaction.java diff --git a/src/main/java/me/figo/models/User.java b/figo-client-sdk/src/main/java/me/figo/models/User.java similarity index 100% rename from src/main/java/me/figo/models/User.java rename to figo-client-sdk/src/main/java/me/figo/models/User.java diff --git a/src/test/java/me/figo/GeneralTest.java b/figo-client-sdk/src/test/java/me/figo/GeneralTest.java similarity index 100% rename from src/test/java/me/figo/GeneralTest.java rename to figo-client-sdk/src/test/java/me/figo/GeneralTest.java diff --git a/src/test/java/me/figo/SessionTest.java b/figo-client-sdk/src/test/java/me/figo/SessionTest.java similarity index 100% rename from src/test/java/me/figo/SessionTest.java rename to figo-client-sdk/src/test/java/me/figo/SessionTest.java diff --git a/src/test/java/me/figo/TrustManagerTest.java b/figo-client-sdk/src/test/java/me/figo/TrustManagerTest.java similarity index 100% rename from src/test/java/me/figo/TrustManagerTest.java rename to figo-client-sdk/src/test/java/me/figo/TrustManagerTest.java diff --git a/src/test/java/me/figo/WritingTest.java b/figo-client-sdk/src/test/java/me/figo/WritingTest.java similarity index 100% rename from src/test/java/me/figo/WritingTest.java rename to figo-client-sdk/src/test/java/me/figo/WritingTest.java diff --git a/figo-demo-console/.gitignore b/figo-demo-console/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/figo-demo-console/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/figo-demo-console/pom.xml b/figo-demo-console/pom.xml new file mode 100644 index 0000000..fbc2ca7 --- /dev/null +++ b/figo-demo-console/pom.xml @@ -0,0 +1,22 @@ + + 4.0.0 + + + me.figo + figo-sdk-parent + 1.3.3 + + + figo-demo-console + + jar + + + + me.figo + sdk + ${project.version} + + + diff --git a/src/console_demo/java/me/figo/console_demo/ConsoleDemo.java b/figo-demo-console/src/main/java/me/figo/console_demo/ConsoleDemo.java similarity index 100% rename from src/console_demo/java/me/figo/console_demo/ConsoleDemo.java rename to figo-demo-console/src/main/java/me/figo/console_demo/ConsoleDemo.java diff --git a/figo-demo-web/.gitignore b/figo-demo-web/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/figo-demo-web/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/figo-demo-web/pom.xml b/figo-demo-web/pom.xml new file mode 100644 index 0000000..a5b2456 --- /dev/null +++ b/figo-demo-web/pom.xml @@ -0,0 +1,41 @@ + + 4.0.0 + + + me.figo + figo-sdk-parent + 1.3.3 + + + figo-demo-web + + jar + + + 2.0.0 + + 1.8 + 1.8 + + + + + me.figo + sdk + ${project.version} + + + + com.sparkjava + spark-core + ${spark.version} + + + + com.sparkjava + spark-template-velocity + ${spark.version} + + + diff --git a/src/web_demo/java/me/figo/web_demo/WebDemo.java b/figo-demo-web/src/main/java/me/figo/web_demo/WebDemo.java similarity index 100% rename from src/web_demo/java/me/figo/web_demo/WebDemo.java rename to figo-demo-web/src/main/java/me/figo/web_demo/WebDemo.java diff --git a/src/web_demo/java/me/figo/web_demo/index.wm b/figo-demo-web/src/main/java/me/figo/web_demo/index.wm similarity index 100% rename from src/web_demo/java/me/figo/web_demo/index.wm rename to figo-demo-web/src/main/java/me/figo/web_demo/index.wm diff --git a/pom.xml b/pom.xml index 9b06e72..59eb83c 100755 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ 4.0.0 me.figo - sdk + figo-sdk-parent 1.3.3 - jar + pom Figo Java SDK This SDK eases the development of Java applications and web services consuming the figo connect API. Figo connect allows developers simple access to users bank data on a trustworthy basis. Users can grant your application access to certain parts of their bank accounts and you can access them without worrying about the inner workings of online banking. http://figo.io - + figo GmbH http://figo.io @@ -24,8 +24,17 @@ + 1.7 + 1.7 false + UTF-8 + + + figo-client-sdk + figo-demo-console + figo-demo-web + git://github.com/figo-connect/java-figo.git @@ -52,29 +61,22 @@ gson 2.4 - - junit - junit - 4.11 - test - commons-codec commons-codec 1.10 + + + junit + junit + 4.11 + test + - - org.apache.maven.plugins - maven-compiler-plugin - - 1.7 - 1.7 - - org.apache.maven.plugins maven-surefire-plugin @@ -121,6 +123,6 @@ - + diff --git a/src/web_demo/lib/commons-collections-3.2.1.jar b/src/web_demo/lib/commons-collections-3.2.1.jar deleted file mode 100644 index c35fa1f..0000000 Binary files a/src/web_demo/lib/commons-collections-3.2.1.jar and /dev/null differ diff --git a/src/web_demo/lib/commons-lang-2.4.jar b/src/web_demo/lib/commons-lang-2.4.jar deleted file mode 100644 index 532939e..0000000 Binary files a/src/web_demo/lib/commons-lang-2.4.jar and /dev/null differ diff --git a/src/web_demo/lib/javax.servlet-3.0.0.v201112011016.jar b/src/web_demo/lib/javax.servlet-3.0.0.v201112011016.jar deleted file mode 100644 index b135409..0000000 Binary files a/src/web_demo/lib/javax.servlet-3.0.0.v201112011016.jar and /dev/null differ diff --git a/src/web_demo/lib/jetty-http-9.0.2.v20130417.jar b/src/web_demo/lib/jetty-http-9.0.2.v20130417.jar deleted file mode 100644 index 45f048d..0000000 Binary files a/src/web_demo/lib/jetty-http-9.0.2.v20130417.jar and /dev/null differ diff --git a/src/web_demo/lib/jetty-io-9.0.2.v20130417.jar b/src/web_demo/lib/jetty-io-9.0.2.v20130417.jar deleted file mode 100644 index baeaa7c..0000000 Binary files a/src/web_demo/lib/jetty-io-9.0.2.v20130417.jar and /dev/null differ diff --git a/src/web_demo/lib/jetty-server-9.0.2.v20130417.jar b/src/web_demo/lib/jetty-server-9.0.2.v20130417.jar deleted file mode 100644 index 004e3f6..0000000 Binary files a/src/web_demo/lib/jetty-server-9.0.2.v20130417.jar and /dev/null differ diff --git a/src/web_demo/lib/jetty-util-9.0.2.v20130417.jar b/src/web_demo/lib/jetty-util-9.0.2.v20130417.jar deleted file mode 100644 index 711fe33..0000000 Binary files a/src/web_demo/lib/jetty-util-9.0.2.v20130417.jar and /dev/null differ diff --git a/src/web_demo/lib/jetty-webapp-9.0.2.v20130417.jar b/src/web_demo/lib/jetty-webapp-9.0.2.v20130417.jar deleted file mode 100644 index 1fef74b..0000000 Binary files a/src/web_demo/lib/jetty-webapp-9.0.2.v20130417.jar and /dev/null differ diff --git a/src/web_demo/lib/slf4j-api-1.7.2.jar b/src/web_demo/lib/slf4j-api-1.7.2.jar deleted file mode 100644 index 1a88708..0000000 Binary files a/src/web_demo/lib/slf4j-api-1.7.2.jar and /dev/null differ diff --git a/src/web_demo/lib/slf4j-simple-1.7.2.jar b/src/web_demo/lib/slf4j-simple-1.7.2.jar deleted file mode 100644 index 2498c44..0000000 Binary files a/src/web_demo/lib/slf4j-simple-1.7.2.jar and /dev/null differ diff --git a/src/web_demo/lib/spark-core-2.0.0.jar b/src/web_demo/lib/spark-core-2.0.0.jar deleted file mode 100644 index 4fece4c..0000000 Binary files a/src/web_demo/lib/spark-core-2.0.0.jar and /dev/null differ diff --git a/src/web_demo/lib/spark-template-velocity-2.0.0.jar b/src/web_demo/lib/spark-template-velocity-2.0.0.jar deleted file mode 100644 index d1149a7..0000000 Binary files a/src/web_demo/lib/spark-template-velocity-2.0.0.jar and /dev/null differ diff --git a/src/web_demo/lib/velocity-1.7.jar b/src/web_demo/lib/velocity-1.7.jar deleted file mode 100644 index ae936d3..0000000 Binary files a/src/web_demo/lib/velocity-1.7.jar and /dev/null differ