From 1dd966b169d5a2e235d318d5fae4732d156fb2b9 Mon Sep 17 00:00:00 2001
From: Greg Burd <greg@burd.me>
Date: Wed, 11 Apr 2018 23:09:14 -0400
Subject: [PATCH] Cleanup, trying to get to a working known state again.

---
 README                                             |  5 +++++
 crud-jpa-tutorial.iml                              |  2 +-
 pom.xml                                            | 14 +++++++++++++-
 .../example/crud/metrics/MetricsConfiguration.java |  6 ++----
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/README b/README
index b0b0a9c..1211227 100644
--- a/README
+++ b/README
@@ -21,3 +21,8 @@ sudo route -v delete -inet 239.9.9.9
 
 mvn clean versions:use-latest-versions scm:checkin deploy -Dmessage="update versions" -DperformRelease=true
 http://www.mojohaus.org/versions-maven-plugin/index.html
+
+mvn exec:java -D"exec.mainClass"="com.example.crud.Main"
+mvn exec:java
+
+
diff --git a/crud-jpa-tutorial.iml b/crud-jpa-tutorial.iml
index 7b53f8b..b39da82 100644
--- a/crud-jpa-tutorial.iml
+++ b/crud-jpa-tutorial.iml
@@ -33,8 +33,8 @@
     <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" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources/META-INF" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/pom.xml b/pom.xml
index 6f03916..51d48e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
         <metrics.version>3.2.2</metrics.version>
         <spring.version>5.0.5.RELEASE</spring.version>
         <spring-data.version>1.4.6.RELEASE</spring-data.version>
+        <exec.mainClass>com.example.crud.Main</exec.mainClass>
     </properties>
 
     <repositories>
@@ -87,7 +88,7 @@
             <artifactId>jcl-over-slf4j</artifactId>
             <version>1.8.0-alpha2</version>
         </dependency>
-p        <dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>log4j-over-slf4j</artifactId>
             <version>1.8.0-alpha2</version>
@@ -361,6 +362,17 @@ p        <dependency>
     </dependencies>
 
     <build>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources/META-INF</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>persistence.xml</include>
+                </includes>
+            </resource>
+        </resources>
+
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
diff --git a/src/main/java/com/example/crud/metrics/MetricsConfiguration.java b/src/main/java/com/example/crud/metrics/MetricsConfiguration.java
index e7397bd..b01296a 100644
--- a/src/main/java/com/example/crud/metrics/MetricsConfiguration.java
+++ b/src/main/java/com/example/crud/metrics/MetricsConfiguration.java
@@ -7,6 +7,7 @@ import ch.qos.logback.core.joran.spi.JoranException;
 import com.codahale.metrics.*;
 import com.codahale.metrics.health.HealthCheckRegistry;
 import com.codahale.metrics.jvm.*;
+import com.codahale.metrics.logback.InstrumentedAppender;
 import com.datastax.driver.core.Cluster;
 import com.ryantenney.metrics.spring.config.annotation.EnableMetrics;
 import com.ryantenney.metrics.spring.config.annotation.MetricsConfigurerAdapter;
@@ -53,7 +54,6 @@ public class MetricsConfiguration extends MetricsConfigurerAdapter {
 
     @PostConstruct
     public void init() {
-/*
         final LoggerContext factory = (LoggerContext) LoggerFactory.getILoggerFactory();
         final Logger root = factory.getLogger("console");//Logger.ROOT_LOGGER_NAME);
 
@@ -61,7 +61,6 @@ public class MetricsConfiguration extends MetricsConfigurerAdapter {
         metrics.setContext(root.getLoggerContext());
         metrics.start();
         root.addAppender(metrics);
-*/
 
         LoggerContext loggerContext = (LoggerContext)LoggerFactory.getILoggerFactory();
         loggerContext.reset();
@@ -71,8 +70,7 @@ public class MetricsConfiguration extends MetricsConfigurerAdapter {
         } catch (JoranException e) {
             e.printStackTrace();
         }
-
-
+        
         log.debug("Registering JVM gauges");
         metricRegistry.registerAll(new OperatingSystemGaugeSet());
         metricRegistry.register(PROP_METRIC_REG_JVM_MEMORY, new MemoryUsageGaugeSet());