aboutsummaryrefslogtreecommitdiff
path: root/kamon-examples/kamon-annotation-example/scala/src
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2017-04-24 13:54:40 +0200
committerIvan Topolnjak <ivantopo@gmail.com>2017-04-24 13:54:40 +0200
commit4d828e1a3195e55365c865aa3a78af9668742643 (patch)
tree07fff2683933c96297a8ba577bbdc89888da16e1 /kamon-examples/kamon-annotation-example/scala/src
parent469c11dc1ddb140f407a33f48033e533bf60611c (diff)
downloadKamon-4d828e1a3195e55365c865aa3a78af9668742643.tar.gz
Kamon-4d828e1a3195e55365c865aa3a78af9668742643.tar.bz2
Kamon-4d828e1a3195e55365c865aa3a78af9668742643.zip
Prepare for the major cleanup
Moved all the original files from src/main to src/legacy-main, same with test files. Also removed the autoweave module, examples and bench as I'm planning to have them in separate repositories.
Diffstat (limited to 'kamon-examples/kamon-annotation-example/scala/src')
-rw-r--r--kamon-examples/kamon-annotation-example/scala/src/main/resources/META-INF/aop.xml8
-rw-r--r--kamon-examples/kamon-annotation-example/scala/src/main/resources/application.conf10
-rw-r--r--kamon-examples/kamon-annotation-example/scala/src/main/resources/logback.xml19
-rw-r--r--kamon-examples/kamon-annotation-example/scala/src/main/scala/kamon/annotation/KamonController.scala17
-rw-r--r--kamon-examples/kamon-annotation-example/scala/src/main/scala/kamon/annotation/KamonSpringApplication.scala10
5 files changed, 0 insertions, 64 deletions
diff --git a/kamon-examples/kamon-annotation-example/scala/src/main/resources/META-INF/aop.xml b/kamon-examples/kamon-annotation-example/scala/src/main/resources/META-INF/aop.xml
deleted file mode 100644
index 9b144860..00000000
--- a/kamon-examples/kamon-annotation-example/scala/src/main/resources/META-INF/aop.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd">
-
-<aspectj>
- <weaver options="-Xlint:ignore">
- <include within="kamon..*"/>
- <exclude within="org.aspectj.*"/>
- </weaver>
-</aspectj>
diff --git a/kamon-examples/kamon-annotation-example/scala/src/main/resources/application.conf b/kamon-examples/kamon-annotation-example/scala/src/main/resources/application.conf
deleted file mode 100644
index 595f9b89..00000000
--- a/kamon-examples/kamon-annotation-example/scala/src/main/resources/application.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-###############################
-# Kamon related configuration #
-###############################
-
-kamon {
- modules {
- kamon-annotation.auto-start = yes
- kamon-log-reporter.auto-start = yes
- }
-} \ No newline at end of file
diff --git a/kamon-examples/kamon-annotation-example/scala/src/main/resources/logback.xml b/kamon-examples/kamon-annotation-example/scala/src/main/resources/logback.xml
deleted file mode 100644
index fac5ad3d..00000000
--- a/kamon-examples/kamon-annotation-example/scala/src/main/resources/logback.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
- <property name="CONSOLE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%t] --- %-40.40logger{39} : %m%n%wex"/>
-
- <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>${CONSOLE_LOG_PATTERN}</pattern>
- </encoder>
- </appender>
-
- <root level="INFO">
- <appender-ref ref="CONSOLE" />
- </root>
-
- <!-- logger name="org.springframework" level="DEBUG"/ -->
-
-</configuration>
diff --git a/kamon-examples/kamon-annotation-example/scala/src/main/scala/kamon/annotation/KamonController.scala b/kamon-examples/kamon-annotation-example/scala/src/main/scala/kamon/annotation/KamonController.scala
deleted file mode 100644
index 00c88715..00000000
--- a/kamon-examples/kamon-annotation-example/scala/src/main/scala/kamon/annotation/KamonController.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package kamon.annotation
-
-import org.springframework.boot.autoconfigure._
-import org.springframework.stereotype._
-import org.springframework.web.bind.annotation._
-
-@Controller
-@EnableAutoConfiguration
-@RequestMapping(Array("/kamon"))
-@EnableKamon
-class KamonController {
-
- @RequestMapping(Array("/counter"))
- @ResponseBody
- @Count(name = "awesomeCounter")
- def counter(): String = "count!!!"
-} \ No newline at end of file
diff --git a/kamon-examples/kamon-annotation-example/scala/src/main/scala/kamon/annotation/KamonSpringApplication.scala b/kamon-examples/kamon-annotation-example/scala/src/main/scala/kamon/annotation/KamonSpringApplication.scala
deleted file mode 100644
index 595900a8..00000000
--- a/kamon-examples/kamon-annotation-example/scala/src/main/scala/kamon/annotation/KamonSpringApplication.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package kamon.annotation
-
-import kamon.Kamon
-import org.springframework.boot.SpringApplication
-
-object KamonSpringApplication extends App {
- Kamon.start()
-
- SpringApplication.run(classOf[KamonController])
-}