From 0fe81045d504510cd037dd766f7c5119846c5e09 Mon Sep 17 00:00:00 2001 From: Zellweger Christof Ralf Date: Wed, 27 May 2015 16:59:20 +0200 Subject: [PATCH] initial commit --- .classpath | 16 ++---- .gitignore | 2 + .gradle/2.2.1/taskArtifacts/cache.properties | 1 + .../2.2.1/taskArtifacts/cache.properties.lock | Bin 0 -> 17 bytes .gradle/2.2.1/taskArtifacts/fileHashes.bin | Bin 0 -> 18790 bytes .gradle/2.2.1/taskArtifacts/fileSnapshots.bin | Bin 0 -> 19763 bytes .../2.2.1/taskArtifacts/outputFileStates.bin | Bin 0 -> 18602 bytes .gradle/2.2.1/taskArtifacts/taskArtifacts.bin | Bin 0 -> 21707 bytes .gradle/2.3/taskArtifacts/cache.properties | 1 + .../2.3/taskArtifacts/cache.properties.lock | Bin 0 -> 17 bytes .gradle/2.3/taskArtifacts/fileHashes.bin | Bin 0 -> 21062 bytes .gradle/2.3/taskArtifacts/fileSnapshots.bin | Bin 0 -> 18561 bytes .../2.3/taskArtifacts/outputFileStates.bin | Bin 0 -> 18512 bytes .gradle/2.3/taskArtifacts/taskArtifacts.bin | Bin 0 -> 18621 bytes .project | 10 ++-- ...springsource.ide.eclipse.gradle.core.prefs | 5 ++ .settings/org.eclipse.jdt.core.prefs | 13 +++++ build.gradle | 49 ++++++++++++++++++ settings.gradle | 1 + .../java/ch/psi/daq/rest/DaqController.java | 13 +++++ .../ch/psi/daq/rest/DaqRestApplication.java | 45 ++++++++++++++++ 21 files changed, 138 insertions(+), 18 deletions(-) create mode 100644 .gitignore create mode 100644 .gradle/2.2.1/taskArtifacts/cache.properties create mode 100644 .gradle/2.2.1/taskArtifacts/cache.properties.lock create mode 100644 .gradle/2.2.1/taskArtifacts/fileHashes.bin create mode 100644 .gradle/2.2.1/taskArtifacts/fileSnapshots.bin create mode 100644 .gradle/2.2.1/taskArtifacts/outputFileStates.bin create mode 100644 .gradle/2.2.1/taskArtifacts/taskArtifacts.bin create mode 100644 .gradle/2.3/taskArtifacts/cache.properties create mode 100644 .gradle/2.3/taskArtifacts/cache.properties.lock create mode 100644 .gradle/2.3/taskArtifacts/fileHashes.bin create mode 100644 .gradle/2.3/taskArtifacts/fileSnapshots.bin create mode 100644 .gradle/2.3/taskArtifacts/outputFileStates.bin create mode 100644 .gradle/2.3/taskArtifacts/taskArtifacts.bin create mode 100644 .settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 build.gradle create mode 100644 settings.gradle create mode 100644 src/main/java/ch/psi/daq/rest/DaqController.java create mode 100644 src/main/java/ch/psi/daq/rest/DaqRestApplication.java diff --git a/.classpath b/.classpath index cf2b0ce..f5c5351 100644 --- a/.classpath +++ b/.classpath @@ -2,15 +2,9 @@ - - - - - - - - - - - + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..83ccc54 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/build/ +/bin/ diff --git a/.gradle/2.2.1/taskArtifacts/cache.properties b/.gradle/2.2.1/taskArtifacts/cache.properties new file mode 100644 index 0000000..f110f4b --- /dev/null +++ b/.gradle/2.2.1/taskArtifacts/cache.properties @@ -0,0 +1 @@ +#Tue May 26 17:53:04 CEST 2015 diff --git a/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/.gradle/2.2.1/taskArtifacts/cache.properties.lock new file mode 100644 index 0000000000000000000000000000000000000000..0fedbf5b37a5cef89fa749dd0420b9fc33e60684 GIT binary patch literal 17 UcmZR+td;#*`0|zG3=m)g06QxM6aWAK literal 0 HcmV?d00001 diff --git a/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/.gradle/2.2.1/taskArtifacts/fileHashes.bin new file mode 100644 index 0000000000000000000000000000000000000000..0620824b26a3e0362e6fd29c951e174062bcc603 GIT binary patch literal 18790 zcmeI%O(=vx9LMpoNM6b=lHAsXmAtJMNg>KhTMk^j-M_rlePV`i%|VUuj{j_ zZwS7he5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{ z1Q0*~0R#|0009IL_zMA#RsPi?yIFPP(9Yh~Y5b!jWu&*@yDsn|M3jBLsoy0xWwWS5 z;^xfT77-i0%d2+wrB*dAG+uTer@w{A37(X>WX2zrk&H-+S1e`;6P0 z@noAguA+3oesD`3SJM;uC5PCB00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafK;Rz{ z$ok9+DWMlrQMY1oXLh>iL^jTG)vL|Jb$yRcO~pdJ_vsia&}|t>uAG>-OsXq z!}BBkA($Vay=6V?59LWKd)KnATpCMwpI`2h6<4%wT@6S?l)3~}4+~}#G@=`#AVmYZdCKVG?-i#V7ryOoH{X}z z2A;Z-1*c#xT;LRIBty>E_N938oh(w0)= zq?D7KoGAVQX6#Ju{sAufym~Y5eZSL8?{l4KAqa|v?{oxhqaNOWwrwp55FkK+009C7 z2oNAZfB*pk1PBlyK!5;&eOP7Nf?#?e-sY}%^3}%K$WZH< zrQPgL!o>bt{p7HmOY@a1uP%$3?@E9G0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72>gXWG#kIQ5YOIZUiO58 sr(cz|YyPwkXhEm_9r{$gb_GnrTD0Q8I zc{>>8^;dJ;rdWEYPCuPD^*lChRQb%F&d@Ijg=_2DmKF`yD((9APIo>5y4Dk39q+009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHaf zKmY;|fB*y_009U<00Izz00bZa0SG_<0{=q5zlHYNPU9jA-uSw^_-t>>X05lV%I1AM z)5E(Yt6-IkW(N`6jw-9&DGPQp5s1lQcgsY`Cr%<6JtR*#);Nr^>^6FAhFoHDu@mf{ z0el}XmdHes#X90}R1+(a3?|V`4iksVT|t~4(QK^TSnZO^>32;;G}#2VY!_&wAQ9Ok z3Z_uEv@?!NDNvmY=6#nQ++@Lbw4H41$+W~xW@xUB9*i3IEi7%V+4FnCql-*fCLWL7 zX_ZBmN64zo>=7smg_MXzW+UNNC2C#4p|sM2CKh}>f9vZ=>G$5g3%mq+ z$yG*7e~hPhk>hbIowAfUU+S^rEN8xehK7Y|d|GM_?410zb@g=i*b$#5?50gb%Rt@{g#J~SyDGj@Y0xQ|yctW>L ze7eW3yegGO5)1XV>_GDNQvgCZv10ekizD1n5HXf`xiW jzs~S1Gk)+xYQ_1u*(=_#T7B_oSm;aqukVoJZ2pCx8eaRq literal 0 HcmV?d00001 diff --git a/.gradle/2.3/taskArtifacts/cache.properties b/.gradle/2.3/taskArtifacts/cache.properties new file mode 100644 index 0000000..1b70971 --- /dev/null +++ b/.gradle/2.3/taskArtifacts/cache.properties @@ -0,0 +1 @@ +#Wed May 27 09:37:38 CEST 2015 diff --git a/.gradle/2.3/taskArtifacts/cache.properties.lock b/.gradle/2.3/taskArtifacts/cache.properties.lock new file mode 100644 index 0000000000000000000000000000000000000000..8ae5af2e2927deb3d39da92f59f453368bfedda9 GIT binary patch literal 17 TcmZP;cIgfB_Tih#00Axl9wh>} literal 0 HcmV?d00001 diff --git a/.gradle/2.3/taskArtifacts/fileHashes.bin b/.gradle/2.3/taskArtifacts/fileHashes.bin new file mode 100644 index 0000000000000000000000000000000000000000..fdd90f603df707185b1850688783d26632ff186e GIT binary patch literal 21062 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 jTU9NyM>pME)hJOt=U9UB literal 0 HcmV?d00001 diff --git a/.gradle/2.3/taskArtifacts/fileSnapshots.bin b/.gradle/2.3/taskArtifacts/fileSnapshots.bin new file mode 100644 index 0000000000000000000000000000000000000000..4bf7ffa5a71bc5e542b618afff05eb3adb6c626b GIT binary patch literal 18561 zcmeI(A&UY*7zW@uk1L+RsM%x_4ot=iMnU`!W;wWUXf+BJoBBtDYjUu~pxtB^L2T!& z>w>@F!ts1Cvor55Ec4XiOWs4Mlz;CP9%{DwIX-MH2@oJafB*pk1PBlyK!5-N0t5&U zAV7csfqx>9^x{E^* zK6|N+s4lN>MOMQ!KeK2gK!5-N0t5&UAV7cs0RjXF5FkK+009C7{zM?%K8Ku-W2)w~ z59?C&sf)OlTg*QP_xdp&yE*{^1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ YfB*pk1PBlyK!5-N0t5&UAn?lqZ%Sty1ONa4 literal 0 HcmV?d00001 diff --git a/.gradle/2.3/taskArtifacts/taskArtifacts.bin b/.gradle/2.3/taskArtifacts/taskArtifacts.bin new file mode 100644 index 0000000000000000000000000000000000000000..9bc00d4cd2f224efcc767bc4c9e87244f5e871ed GIT binary patch literal 18621 zcmeI%F-yZh6u|L|)I}T|qu}INI0}M@;8Fq=yOdJtSdQcjK}kXqXuJ3|{2G3NLYGns znTxAK5!y-U(5+rgEBy!}|ATk;?(Plue(U9q5cbJ>JH+029ZbIVwxkFkfB*srAbJFds1L0u@ui - ch.psi.daq.rest + rest + @@ -9,14 +10,9 @@ - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.m2e.core.maven2Nature + org.springsource.ide.eclipse.gradle.core.nature org.eclipse.jdt.core.javanature diff --git a/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs new file mode 100644 index 0000000..342c291 --- /dev/null +++ b/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs @@ -0,0 +1,5 @@ +#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences +#Tue May 26 17:48:59 CEST 2015 +build.family.org.gradle.tooling.model.eclipse.HierarchicalEclipseProject=; +org.springsource.ide.eclipse.gradle.linkedresources= +org.springsource.ide.eclipse.gradle.rootprojectloc= diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..fe60f11 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,13 @@ +# +#Wed May 27 10:41:51 CEST 2015 +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..6885fa5 --- /dev/null +++ b/build.gradle @@ -0,0 +1,49 @@ +apply plugin: 'java' +apply plugin: 'eclipse' + +sourceCompatibility = 1.8 +version = '1.0.0' +group = 'ch.psi.daq' + +repositories { + mavenLocal() + mavenCentral() + maven { url "http://slsyoke4.psi.ch:8081/artifactory/libs-releases" } + maven { url "http://slsyoke4.psi.ch:8081/artifactory/libs-snapshots" } +} + +dependencies { + compile 'ch.psi.daq:cassandra:1.0.0' + compile 'org.springframework.boot:spring-boot-starter-web:1.2.3.RELEASE' + compile 'org.apache.commons:commons-lang3:3.4' + testCompile group: 'junit', name: 'junit', version: '4.+' +} + +apply plugin: 'maven' + +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = 'sources' + from sourceSets.main.allSource +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir +} + +artifacts { + archives sourcesJar + archives javadocJar +} + +uploadArchives { + repositories { + mavenDeployer { + repository(url: "http://slsyoke4.psi.ch:8081/artifactory/libs-snapshots-local"){ + authentication(userName: "upload", password: "{DESede}eWKHxAtQ2Dc=") + } + pom.groupId = 'ch.psi.daq' + pom.artifactId = 'rest' + } + } +} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..85ed6d8 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'rest' \ No newline at end of file diff --git a/src/main/java/ch/psi/daq/rest/DaqController.java b/src/main/java/ch/psi/daq/rest/DaqController.java new file mode 100644 index 0000000..326a09c --- /dev/null +++ b/src/main/java/ch/psi/daq/rest/DaqController.java @@ -0,0 +1,13 @@ +package ch.psi.daq.rest; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RestController; + +import ch.psi.daq.cassandra.writer.CassandraWriter; + +@RestController +public class DaqController { + + @Autowired + private CassandraWriter writer; +} diff --git a/src/main/java/ch/psi/daq/rest/DaqRestApplication.java b/src/main/java/ch/psi/daq/rest/DaqRestApplication.java new file mode 100644 index 0000000..4d15523 --- /dev/null +++ b/src/main/java/ch/psi/daq/rest/DaqRestApplication.java @@ -0,0 +1,45 @@ +package ch.psi.daq.rest; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.context.web.SpringBootServletInitializer; +import org.springframework.context.annotation.ComponentScan; + +/** + * Entry point to our rest-frontend of the Swissfel application which most importantly wires all the @RestController annotated classes. + *

+ * + * This acts as a @Configuration class for Spring. As such it has @ComponentScan + * annotation that enables scanning for another Spring components in current + * package and its subpackages. + *

+ * Another annotation is @EnableAutoConfiguration which tells Spring Boot to run + * autoconfiguration. + *

+ * It also extends SpringBootServletInitializer which will configure Spring + * servlet for us, and overrides the configure() method to point to itself, so + * Spring can find the main configuration. + *

+ * Finally, the main() method consists of single static call to + * SpringApplication.run(). + *

+ * Methods annotated with {@link @Bean} are Java beans that are + * container-managed, i.e. managed by Spring. Whenever there are @Autowire, @Inject + * or similar annotations found in the code (which is being scanned through the @ComponentScan + * annotation), the container then knows how to create those beans and inject + * them accordingly. + */ +@SpringBootApplication +@ComponentScan(basePackages = { "ch.psi.daq" }) +public class DaqRestApplication extends SpringBootServletInitializer { + + public static void main(final String[] args) { + SpringApplication.run(DaqRestApplication.class, args); + } + + @Override + protected final SpringApplicationBuilder configure(final SpringApplicationBuilder application) { + return application.sources(DaqRestApplication.class); + } +}