You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by jr...@apache.org on 2010/08/06 04:56:32 UTC
svn commit: r982855 - in /openjpa/trunk/openjpa-integration/jmx: ./ src/
src/test/ src/test/java/ src/test/java/org/ src/test/java/org/apache/
src/test/java/org/apache/openjpa/
src/test/java/org/apache/openjpa/integration/
src/test/java/org/apache/open...
Author: jrbauer
Date: Fri Aug 6 02:56:32 2010
New Revision: 982855
URL: http://svn.apache.org/viewvc?rev=982855&view=rev
Log:
OPENJPA-1739 Adding JMX Platform MBean test module
Added:
openjpa/trunk/openjpa-integration/jmx/
openjpa/trunk/openjpa-integration/jmx/pom.xml (with props)
openjpa/trunk/openjpa-integration/jmx/src/
openjpa/trunk/openjpa-integration/jmx/src/test/
openjpa/trunk/openjpa-integration/jmx/src/test/java/
openjpa/trunk/openjpa-integration/jmx/src/test/java/org/
openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/
openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/
openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/
openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/
openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/CachedEntity.java (with props)
openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java (with props)
openjpa/trunk/openjpa-integration/jmx/src/test/resources/
openjpa/trunk/openjpa-integration/jmx/src/test/resources/META-INF/
openjpa/trunk/openjpa-integration/jmx/src/test/resources/META-INF/persistence.xml (with props)
Added: openjpa/trunk/openjpa-integration/jmx/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/jmx/pom.xml?rev=982855&view=auto
==============================================================================
--- openjpa/trunk/openjpa-integration/jmx/pom.xml (added)
+++ openjpa/trunk/openjpa-integration/jmx/pom.xml Fri Aug 6 02:56:32 2010
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!--
+ Please keep the project tag on one line to avoid confusing
+ the release plugin.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-integration</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>openjpa-integration-jmx</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenJPA Integration Tests - JMX Platform MBeans</name>
+ <description>OpenJPA Integration Tests - JMX Platform MBeans</description>
+
+ <properties>
+ <checkstyle.config.location>${project.basedir}/../../openjpa-project/checkstyle.xml</checkstyle.config.location>
+ <dbcp.maxActive>10</dbcp.maxActive>
+ <dbcp.maxIdle>5</dbcp.maxIdle>
+ <dbcp.minIdle>2</dbcp.minIdle>
+ <dbcp.maxWait>10000</dbcp.maxWait>
+ <dbcp.args>MaxActive=${dbcp.maxActive},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait}</dbcp.args>
+ <connection.driver.name>org.apache.derby.jdbc.EmbeddedDriver</connection.driver.name>
+ <connection.url>jdbc:derby:target/database/openjpa-derby-database;create=true</connection.url>
+ <connection.username />
+ <connection.password />
+ <test.jvm.maxpermsize>256m</test.jvm.maxpermsize>
+ <test.jvm.maxheapsize>1024m</test.jvm.maxheapsize>
+ <!-- Enable the JMX platform MBean provider -->
+ <test.jvm.jmxprovider>com.sun.management.jmxremote</test.jvm.jmxprovider>
+ <!-- Disable JMX platform MBean authentication -->
+ <test.jvm.jmxauth>com.sun.management.jmxremote.authenticate=false</test.jvm.jmxauth>
+ <test.jvm.arguments>-Xmx${test.jvm.maxheapsize} -XX:MaxPermSize=${test.jvm.maxpermsize} -D${test.jvm.jmxprovider} -D${test.jvm.jmxauth}</test.jvm.arguments>
+ <surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-all</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${project.version}</version>
+ <!-- <classifier>tests</classifier> -->
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- The jar plugin builds a jar containing the image gallery classes -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- The surefire plugin is used to run the jUnit tests -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <argLine>${surefire.jvm.args}</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ <systemProperties>
+ <property>
+ <name>openjpa.Log</name>
+ <value>${openjpa.Log}</value>
+ </property>
+ <property>
+ <name>openjpa.DynamicEnhancementAgent</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>openjpa.ConnectionDriverName</name>
+ <value>org.apache.commons.dbcp.BasicDataSource</value>
+ </property>
+ <property>
+ <name>derby.stream.error.file</name>
+ <value>target/derby.log</value>
+ </property>
+ <property>
+ <name>derby.locks.deadlockTimeout</name>
+ <value>5</value>
+ </property>
+ <property>
+ <name>derby.locks.waitTimeout</name>
+ <value>6</value>
+ </property>
+ <property>
+ <name>openjpa.ConnectionProperties</name>
+ <value>DriverClassName=${connection.driver.name},Url=${connection.url},Username=${connection.username},Password=${connection.password},${dbcp.args}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Use the openjpa maven plugin to enhance the domain model classes -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <includes>org/apache/openjpa/integration/jmx/*.class</includes>
+ <addDefaultConstructor>true</addDefaultConstructor>
+ <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+ <!-- persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile-->
+ </configuration>
+ <executions>
+ <execution>
+ <id>enhancer</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>test-enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-all</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: openjpa/trunk/openjpa-integration/jmx/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/CachedEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/CachedEntity.java?rev=982855&view=auto
==============================================================================
--- openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/CachedEntity.java (added)
+++ openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/CachedEntity.java Fri Aug 6 02:56:32 2010
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.integration.jmx;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="INT_CACHED_ENT")
+public class CachedEntity {
+
+ @Id
+ private int id;
+
+ @Basic
+ private String name;
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+}
Propchange: openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/CachedEntity.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java?rev=982855&view=auto
==============================================================================
--- openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java (added)
+++ openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java Fri Aug 6 02:56:32 2010
@@ -0,0 +1,150 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.integration.jmx;
+
+import java.lang.management.ManagementFactory;
+import java.util.Random;
+import java.util.Set;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.apache.openjpa.instrumentation.DataCacheInstrument;
+import org.apache.openjpa.instrumentation.InstrumentationManager;
+import org.apache.openjpa.instrumentation.jmx.JMXProvider;
+import org.apache.openjpa.lib.instrumentation.Instrument;
+import org.apache.openjpa.lib.instrumentation.InstrumentationProvider;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
+import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
+import org.apache.openjpa.persistence.test.AbstractPersistenceTestCase;
+
+public class TestJMXPlatformMBeans extends AbstractPersistenceTestCase {
+ /**
+ * Verifies the data cache metrics are available through simple instrumentation.
+ */
+
+ @SuppressWarnings("deprecation")
+ public void testDataCacheInstrument() {
+ OpenJPAEntityManagerFactorySPI oemf = createNamedEMF("openjpa-integration-jmx");
+
+ // Verify an EMF was created with the supplied instrumentation
+ assertNotNull(oemf);
+
+ // Verify an instrumentation manager is available
+ InstrumentationManager mgr = oemf.getConfiguration().getInstrumentationManagerInstance();
+ assertNotNull(mgr);
+
+ // Get the in-band data cache instrument
+ Set<InstrumentationProvider> providers = mgr.getProviders();
+ assertNotNull(providers);
+ assertEquals(1, providers.size());
+ InstrumentationProvider provider = providers.iterator().next();
+ assertEquals(provider.getClass(), JMXProvider.class);
+ Instrument inst = provider.getInstrumentByName("DataCache");
+ assertNotNull(inst);
+ assertTrue(inst instanceof DataCacheInstrument);
+ DataCacheInstrument dci = (DataCacheInstrument)inst;
+ assertEquals(dci.getCacheName(), "default");
+
+ OpenJPAEntityManagerSPI oem = oemf.createEntityManager();
+
+ CachedEntity ce = new CachedEntity();
+ int id = new Random().nextInt();
+ ce.setId(id);
+
+ oem.getTransaction().begin();
+ oem.persist(ce);
+ oem.getTransaction().commit();
+ oem.clear();
+ assertTrue(oemf.getCache().contains(CachedEntity.class, id));
+ ce = oem.find(CachedEntity.class, id);
+
+ // Thread out to do out-of-band MBean-based validation. This could
+ // have been done on the same thread, but threading out makes for a
+ // more realistic test.
+ Thread thr = new Thread(new DCMBeanThread());
+ thr.start();
+ try {
+ thr.join(60000); // Wait for 1 minute for the MBean thread to return.
+ if (thr.isAlive()) {
+ // MBean did not return within a minute, interrupt it.
+ thr.interrupt();
+ Thread.sleep(5000);
+ if (thr.isAlive()) {
+ // Attempt to hard kill the thread to prevent the test from hanging
+ thr.stop();
+ }
+ fail("DataCache MBean verification thread failed.");
+ }
+ } catch (Throwable t) {
+ fail("Caught unexpected throwable: " + t);
+ }
+
+ closeEMF(oemf);
+ }
+
+ public class DCMBeanThread implements Runnable {
+
+ public void run() {
+ MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ assertNotNull(mbs);
+ ObjectName objname = null;
+ try {
+ // Query for the DataCache bean
+ objname = new ObjectName("org.apache.openjpa:type=DataCache,cfgid=openjpa-integration-jmx,*");
+ Set<ObjectName> ons = mbs.queryNames(objname, null);
+ assertEquals(1, ons.size());
+ ObjectName on = ons.iterator().next();
+ // Assert data cache attributes can be accessed and are being updated through the MBean
+ long hitCount = (Long)mbs.getAttribute(on, "HitCount");
+ long readCount = (Long)mbs.getAttribute(on, "ReadCount");
+ long writeCount = (Long)mbs.getAttribute(on, "WriteCount");
+ assertTrue(hitCount > 0);
+ assertTrue(readCount > 0);
+ assertTrue(writeCount > 0);
+ // Assert data cache MBean methods can be invoked
+ Object[] parms = new Object[] { CachedEntity.class.getName() };
+ String[] sigs = new String[] { "java.lang.String" };
+ long clsHitCount = (Long)mbs.invoke(on, "getHitCount", parms, sigs);
+ long clsReadCount = (Long)mbs.invoke(on, "getReadCount", parms, sigs);
+ long clsWriteCount = (Long)mbs.invoke(on, "getWriteCount", parms, sigs);
+ assertTrue(clsHitCount > 0);
+ assertTrue(clsReadCount > 0);
+ assertTrue(clsWriteCount > 0);
+ // Invoke the reset method and recollect stats
+ mbs.invoke(on, "reset", null, null);
+ hitCount = (Long)mbs.getAttribute(on, "HitCount");
+ readCount = (Long)mbs.getAttribute(on, "ReadCount");
+ writeCount = (Long)mbs.getAttribute(on, "WriteCount");
+ assertEquals(0, hitCount);
+ assertEquals(0, readCount);
+ assertEquals(0, writeCount);
+
+ clsHitCount = (Long)mbs.invoke(on, "getHitCount", parms, sigs);
+ clsReadCount = (Long)mbs.invoke(on, "getReadCount", parms, sigs);
+ clsWriteCount = (Long)mbs.invoke(on, "getWriteCount", parms, sigs);
+ assertEquals(0, clsHitCount);
+ assertEquals(0, clsReadCount);
+ assertEquals(0, clsWriteCount);
+ } catch (Exception e) {
+ fail("Unexpected exception: " + e);
+ }
+ }
+ }
+}
\ No newline at end of file
Propchange: openjpa/trunk/openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: openjpa/trunk/openjpa-integration/jmx/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/jmx/src/test/resources/META-INF/persistence.xml?rev=982855&view=auto
==============================================================================
--- openjpa/trunk/openjpa-integration/jmx/src/test/resources/META-INF/persistence.xml (added)
+++ openjpa/trunk/openjpa-integration/jmx/src/test/resources/META-INF/persistence.xml Fri Aug 6 02:56:32 2010
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="2.0">
+ <persistence-unit name="openjpa-integration-jmx">
+ <description>PU for JMX Platform MBean Testing</description>
+ <class>org.apache.openjpa.integration.jmx.CachedEntity</class>
+ <properties>
+ <property name="openjpa.Instrumentation" value="jmx(Instrument=DataCache)"/>
+ <property name="openjpa.DataCache" value="true(EnableStatistics=true)"/>
+ <property name="openjpa.RemoteCommitProvider" value="sjvm"/>
+ <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
+ <property name="openjpa.DynamicEnhancementAgent" value="false"/>
+ </properties>
+ </persistence-unit>
+</persistence>
Propchange: openjpa/trunk/openjpa-integration/jmx/src/test/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
svn:eol-style = native