svn commit: r1590564 - in /commons/proper/jcs/trunk: src/main/java/org/apache/commons/jcs/jcache/jmx/JMXs.java tck.xml

[olamy]

Author: olamy
Date: Mon Apr 28 06:48:51 2014
New Revision: 1590564

URL: http://svn.apache.org/r1590564
Log:
fix tck.xml

Modified:
    
commons/proper/jcs/trunk/src/main/java/org/apache/commons/jcs/jcache/jmx/JMXs.java
    commons/proper/jcs/trunk/tck.xml

Modified: 
commons/proper/jcs/trunk/src/main/java/org/apache/commons/jcs/jcache/jmx/JMXs.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/main/java/org/apache/commons/jcs/jcache/jmx/JMXs.java?rev=1590564&r1=1590563&r2=1590564&view=diff
==============================================================================
--- 
commons/proper/jcs/trunk/src/main/java/org/apache/commons/jcs/jcache/jmx/JMXs.java
 (original)
+++ 
commons/proper/jcs/trunk/src/main/java/org/apache/commons/jcs/jcache/jmx/JMXs.java
 Mon Apr 28 06:48:51 2014
@@ -5,8 +5,6 @@ import javax.management.MBeanServerFacto
 import javax.management.ObjectName;
 import java.lang.management.ManagementFactory;
 
-import static com.sun.jmx.defaults.JmxProperties.JMX_INITIAL_BUILDER;
-
 public class JMXs {
     private static final MBeanServer SERVER = findMBeanServer();
 
@@ -35,7 +33,7 @@ public class JMXs {
     }
 
     private static MBeanServer findMBeanServer() {
-        if (System.getProperty(JMX_INITIAL_BUILDER) != null) {
+        if (System.getProperty("javax.management.builder.initial") != null) {
             return MBeanServerFactory.createMBeanServer();
         }
         return ManagementFactory.getPlatformMBeanServer();

Modified: commons/proper/jcs/trunk/tck.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/tck.xml?rev=1590564&r1=1590563&r2=1590564&view=diff
==============================================================================
--- commons/proper/jcs/trunk/tck.xml (original)
+++ commons/proper/jcs/trunk/tck.xml Mon Apr 28 06:48:51 2014
@@ -17,6 +17,8 @@
   <name>JCache TCK</name>
 
   <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
     <jsr107.api.version>1.0.0</jsr107.api.version>
 
     <implementation-groupId>${project.groupId}</implementation-groupId>
@@ -36,6 +38,51 @@
   </properties>
 
   <dependencies>
+    <!-- just cause now we compile even main jcs build but not needed for tcks 
-->
+    <dependency>
+       <groupId>commons-httpclient</groupId>
+       <artifactId>commons-httpclient</artifactId>
+       <version>3.0.1</version>
+       <optional>true</optional>
+    </dependency>
+    <dependency>
+       <groupId>javax.servlet</groupId>
+       <artifactId>servlet-api</artifactId>
+       <version>2.5</version>
+       <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>1.3</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>1.5.4</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.7.3.3</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity-tools</artifactId>
+      <version>2.0</version>
+      <optional>true</optional>
+    </dependency>
+    <!-- end of jcs dependencies "forced" == block can be removed once 
jcache/tck in another module -->
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>commons-jcs</artifactId>