commit ac5f96cbfabd19d585d35a8061eca177e6973694
author Jean-Louis Monteiro <jlmonteiro@tomitribe.com> Wed Dec 16 12:02:23 2020 +0100
committer Jean-Louis Monteiro <jlmonteiro@tomitribe.com> Wed Dec 16 12:02:23 2020 +0100
tree f745f22a83f13d7097eb4e729774cfff079997c0
parent 9a156bbcad366644de8a47b4adfea960ef012678

Some improvements on configuration

pom.xml

diff --git a/pom.xml b/pom.xml
index 0d30eba..7c07e4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,6 @@
     <tomee.version>8.0.6-SNAPSHOT</tomee.version>
 
     <tomcat.version>9.0.40</tomcat.version>
-    <johnzon.version>1.2.9-SNAPSHOT</johnzon.version>
     <derby.version>10.14.2.0</derby.version>
 
     <!--
@@ -98,12 +97,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.johnzon</groupId>
-      <artifactId>johnzon-jsonp-strict</artifactId>
-      <version>${johnzon.version}</version>
-    </dependency>
-
-    <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-ra</artifactId>
       <version>${version.activemq}</version>
@@ -827,7 +820,7 @@
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
               <excludeTransitive>true</excludeTransitive>
-              <includeArtifactIds>tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer,johnzon-jsonp-strict</includeArtifactIds>
+              <includeArtifactIds>tsharness,tssv,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer</includeArtifactIds>
             </configuration>
           </execution>
         </executions>

src/test/tomee-plume/conf/context.xml

diff --git a/src/test/tomee-plume/conf/context.xml b/src/test/tomee-plume/conf/context.xml
index 484d69a..5d42cfe 100644
--- a/src/test/tomee-plume/conf/context.xml
+++ b/src/test/tomee-plume/conf/context.xml
@@ -38,4 +38,8 @@
            jaspicCallbackHandlerClass="org.apache.openejb.cts.CallbackHandlerImpl"
     />
     -->
+
+    <Environment name="myUrl" value="http://google.com"
+                 type="java.net.URL" override="false"/>
+
 </Context>

src/test/tomee-plume/conf/tomcat-users.xml

diff --git a/src/test/tomee-plume/conf/tomcat-users.xml b/src/test/tomee-plume/conf/tomcat-users.xml
index d3b8b14..3bc8788 100644
--- a/src/test/tomee-plume/conf/tomcat-users.xml
+++ b/src/test/tomee-plume/conf/tomcat-users.xml
@@ -26,6 +26,4 @@
   <user name="j2ee" password="j2ee" roles="Administrator,Employee,mgr,asadmin"/>
 
   <user name="CN=CTS, OU=Java Software, O=Sun Microsystems Inc., L=Burlington, ST=MA, C=US" roles="Administrator"/>
-  <user name="j2ee" password="j2ee" roles="Administrator,Employee" />
-  <user name="javajoe" password="javajoe" roles="VP,Manager" />
 </tomcat-users>