diff --git a/msp/toto/abdel.context b/msp/toto/abdel.context
new file mode 100644
index 0000000..95e9850
Binary files /dev/null and b/msp/toto/abdel.context differ
diff --git a/pom.xml b/pom.xml
index 38cffd1..41e27e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.monnethic
java-api
- 1.0-SNAPSHOT
+ 0.1
org.springframework.boot
@@ -15,30 +15,47 @@
-
- junit
- junit
- 4.12
-
+
+
+
org.hyperledger.fabric-sdk-java
fabric-sdk-java
1.2.1
+
+
+
org.springframework.boot
spring-boot-starter-web
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+
log4j
log4j
1.2.17
+
+ junit
+ junit
+ 4.12
+
+
+
+
org.bouncycastle
bcprov-jdk15on
1.60
+
diff --git a/src/main/java/Application/App.java b/src/main/java/Application/App.java
index 9ebf319..41421ed 100644
--- a/src/main/java/Application/App.java
+++ b/src/main/java/Application/App.java
@@ -1,7 +1,31 @@
package Application;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+@SpringBootApplication
public class App {
public static void main(String [ ] args){
- System.out.println("Welcome");
+ SpringApplication app = new SpringApplication(App.class);
+ app.setDefaultProperties(Collections.singletonMap("server.port","8083"));
+ app.run(args);
+ }
+
+ @Bean
+ public CommandLineRunner commandLineRunner(ApplicationContext ctx){
+ return args -> {
+ System.out.println("Spring Boot:");
+ String[] beanNames = ctx.getBeanDefinitionNames();
+ Arrays.sort(beanNames);
+ for (String beanName : beanNames) {
+ System.out.println(beanName);
+ }
+ };
}
}
diff --git a/src/main/java/restService/WelcomeController.java b/src/main/java/restService/WelcomeController.java
new file mode 100644
index 0000000..723d6ed
--- /dev/null
+++ b/src/main/java/restService/WelcomeController.java
@@ -0,0 +1,12 @@
+package restService;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class WelcomeController {
+
+ @RequestMapping("/")
+ public String index(){return "Welcome from Monnethic !";}
+
+}
\ No newline at end of file
diff --git a/target/classes/Application/App.class b/target/classes/Application/App.class
index 1c1ad9e..9bffa88 100644
Binary files a/target/classes/Application/App.class and b/target/classes/Application/App.class differ
diff --git a/target/classes/blockchain/query/QueryWrapper.class b/target/classes/blockchain/query/QueryWrapper.class
index d59212f..1b44d9d 100644
Binary files a/target/classes/blockchain/query/QueryWrapper.class and b/target/classes/blockchain/query/QueryWrapper.class differ
diff --git a/target/classes/restService/WelcomeController.class b/target/classes/restService/WelcomeController.class
new file mode 100644
index 0000000..d8eabe7
Binary files /dev/null and b/target/classes/restService/WelcomeController.class differ
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..df7824d
--- /dev/null
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,11 @@
+restService\WelcomeController.class
+blockchain\user\UserContext.class
+blockchain\client\CAClientWrapper.class
+blockchain\utility\Util.class
+blockchain\client\ChannelClientWrapper.class
+blockchain\user\CAEnrollement.class
+Application\App.class
+blockchain\configuration\Config.class
+blockchain\query\QueryWrapper.class
+blockchain\query\TransactionWrapper.class
+blockchain\client\FabricClientWrapper.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..34b86a6
--- /dev/null
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,11 @@
+B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\client\ChannelClientWrapper.java
+B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\client\FabricClientWrapper.java
+B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\user\CAEnrollement.java
+B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\client\CAClientWrapper.java
+B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\query\QueryWrapper.java
+B:\SCIENCES U\GroupProject\java-api\src\main\java\restService\WelcomeController.java
+B:\SCIENCES U\GroupProject\java-api\src\main\java\Application\App.java
+B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\configuration\Config.java
+B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\query\TransactionWrapper.java
+B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\user\UserContext.java
+B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\utility\Util.java
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
new file mode 100644
index 0000000..221c910
--- /dev/null
+++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
@@ -0,0 +1,11 @@
+blockchain\query\QueryTest.class
+blockchain\queryWrapper\QueryWrapperTest.class
+blockchain\query\QueryChannelTest.class
+blockchain\queryWrapper\TransactionWrapperTest.class
+blockchain\utility\UtilTest.class
+blockchain\client\TestEnrollAdmin.class
+blockchain\query\ChaincodeTransactionTest.class
+blockchain\utility\ReadUserTest.class
+blockchain\client\TestRegisterEnrollUser.class
+blockchain\query\CreateChaincodeUserTest.class
+blockchain\user\UserContextTest.class
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
new file mode 100644
index 0000000..91dce2d
--- /dev/null
+++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
@@ -0,0 +1,11 @@
+B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\client\TestRegisterEnrollUser.java
+B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\query\QueryTest.java
+B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\client\TestEnrollAdmin.java
+B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\query\CreateChaincodeUserTest.java
+B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\queryWrapper\TransactionWrapperTest.java
+B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\utility\UtilTest.java
+B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\query\QueryChannelTest.java
+B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\query\ChaincodeTransactionTest.java
+B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\utility\ReadUserTest.java
+B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\queryWrapper\QueryWrapperTest.java
+B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\user\UserContextTest.java
diff --git a/target/surefire/surefirebooter2244873732484001783.jar b/target/surefire/surefirebooter2244873732484001783.jar
new file mode 100644
index 0000000..2c9c94d
Binary files /dev/null and b/target/surefire/surefirebooter2244873732484001783.jar differ