You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/04/04 16:09:08 UTC
svn commit: r1309396 - in /openejb/trunk/openejb: ./
container/openejb-core/src/main/java/org/apache/openejb/core/managed/
container/openejb-core/src/main/java/org/apache/openejb/core/mdb/
container/openejb-core/src/main/java/org/apache/openejb/core/si...
Author: rmannibucau
Date: Wed Apr 4 14:09:07 2012
New Revision: 1309396
URL: http://svn.apache.org/viewvc?rev=1309396&view=rev
Log:
some cleanup regarding maven integration in our build
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
openejb/trunk/openejb/examples/polling-parent/polling-web/pom.xml
openejb/trunk/openejb/examples/webapps/rest-example/pom.xml
openejb/trunk/openejb/maven/dd-maven-plugin/pom.xml
openejb/trunk/openejb/maven/maven-util/pom.xml
openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/pom.xml
openejb/trunk/openejb/maven/pom.xml
openejb/trunk/openejb/maven/spi-helper-jee6-profile/pom.xml
openejb/trunk/openejb/maven/spi-helper-maven-plugin/pom.xml
openejb/trunk/openejb/maven/tomee-maven-plugin/pom.xml
openejb/trunk/openejb/pom.xml
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java Wed Apr 4 14:09:07 2012
@@ -268,26 +268,28 @@ public class ManagedContainer implements
beanContext.setContainerData(data);
// Create stats interceptor
- StatsInterceptor stats = new StatsInterceptor(beanContext.getBeanClass());
- beanContext.addSystemInterceptor(stats);
+ if (StatsInterceptor.isStatsActivated()) {
+ StatsInterceptor stats = new StatsInterceptor(beanContext.getBeanClass());
+ beanContext.addSystemInterceptor(stats);
+
+ MBeanServer server = LocalMBeanServer.get();
+
+ ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb.management");
+ jmxName.set("J2EEServer", "openejb");
+ jmxName.set("J2EEApplication", null);
+ jmxName.set("EJBModule", beanContext.getModuleID());
+ jmxName.set("StatelessSessionBean", beanContext.getEjbName());
+ jmxName.set("j2eeType", "");
+ jmxName.set("name", beanContext.getEjbName());
- MBeanServer server = LocalMBeanServer.get();
-
- ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb.management");
- jmxName.set("J2EEServer", "openejb");
- jmxName.set("J2EEApplication", null);
- jmxName.set("EJBModule", beanContext.getModuleID());
- jmxName.set("StatelessSessionBean", beanContext.getEjbName());
- jmxName.set("j2eeType", "");
- jmxName.set("name", beanContext.getEjbName());
-
- // register the invocation stats interceptor
- try {
- ObjectName objectName = jmxName.set("j2eeType", "Invocations").build();
- server.registerMBean(new ManagedMBean(stats), objectName);
- data.jmxNames.add(objectName);
- } catch (Exception e) {
- logger.error("Unable to register MBean ", e);
+ // register the invocation stats interceptor
+ try {
+ ObjectName objectName = jmxName.set("j2eeType", "Invocations").build();
+ server.registerMBean(new ManagedMBean(stats), objectName);
+ data.jmxNames.add(objectName);
+ } catch (Exception e) {
+ logger.error("Unable to register MBean ", e);
+ }
}
try {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java Wed Apr 4 14:09:07 2012
@@ -152,26 +152,28 @@ public class MdbContainer implements Rpc
deployments.put(deploymentId, beanContext);
// Create stats interceptor
- StatsInterceptor stats = new StatsInterceptor(beanContext.getBeanClass());
- beanContext.addSystemInterceptor(stats);
+ if (StatsInterceptor.isStatsActivated()) {
+ StatsInterceptor stats = new StatsInterceptor(beanContext.getBeanClass());
+ beanContext.addSystemInterceptor(stats);
+
+ MBeanServer server = LocalMBeanServer.get();
+
+ ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb.management");
+ jmxName.set("J2EEServer", "openejb");
+ jmxName.set("J2EEApplication", null);
+ jmxName.set("EJBModule", beanContext.getModuleID());
+ jmxName.set("StatelessSessionBean", beanContext.getEjbName());
+ jmxName.set("j2eeType", "");
+ jmxName.set("name", beanContext.getEjbName());
- MBeanServer server = LocalMBeanServer.get();
-
- ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb.management");
- jmxName.set("J2EEServer", "openejb");
- jmxName.set("J2EEApplication", null);
- jmxName.set("EJBModule", beanContext.getModuleID());
- jmxName.set("StatelessSessionBean", beanContext.getEjbName());
- jmxName.set("j2eeType", "");
- jmxName.set("name", beanContext.getEjbName());
-
- // register the invocation stats interceptor
- try {
- ObjectName objectName = jmxName.set("j2eeType", "Invocations").build();
- server.registerMBean(new ManagedMBean(stats), objectName);
- endpointFactory.jmxNames.add(objectName);
- } catch (Exception e) {
- logger.error("Unable to register MBean ", e);
+ // register the invocation stats interceptor
+ try {
+ ObjectName objectName = jmxName.set("j2eeType", "Invocations").build();
+ server.registerMBean(new ManagedMBean(stats), objectName);
+ endpointFactory.jmxNames.add(objectName);
+ } catch (Exception e) {
+ logger.error("Unable to register MBean ", e);
+ }
}
// activate the endpoint
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java Wed Apr 4 14:09:07 2012
@@ -290,26 +290,28 @@ public class SingletonInstanceManager {
beanContext.set(EJBContext.class, this.sessionContext);
// Create stats interceptor
- StatsInterceptor stats = new StatsInterceptor(beanContext.getBeanClass());
- beanContext.addSystemInterceptor(stats);
+ if (StatsInterceptor.isStatsActivated()) {
+ StatsInterceptor stats = new StatsInterceptor(beanContext.getBeanClass());
+ beanContext.addSystemInterceptor(stats);
+
+ MBeanServer server = LocalMBeanServer.get();
+
+ ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb.management");
+ jmxName.set("J2EEServer", "openejb");
+ jmxName.set("J2EEApplication", null);
+ jmxName.set("EJBModule", beanContext.getModuleID());
+ jmxName.set("SingletonSessionBean", beanContext.getEjbName());
+ jmxName.set("j2eeType", "");
+ jmxName.set("name", beanContext.getEjbName());
- MBeanServer server = LocalMBeanServer.get();
-
- ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb.management");
- jmxName.set("J2EEServer", "openejb");
- jmxName.set("J2EEApplication", null);
- jmxName.set("EJBModule", beanContext.getModuleID());
- jmxName.set("SingletonSessionBean", beanContext.getEjbName());
- jmxName.set("j2eeType", "");
- jmxName.set("name", beanContext.getEjbName());
-
- // register the invocation stats interceptor
- try {
- ObjectName objectName = jmxName.set("j2eeType", "Invocations").build();
- server.registerMBean(new ManagedMBean(stats), objectName);
- data.add(objectName);
- } catch (Exception e) {
- logger.error("Unable to register MBean ", e);
+ // register the invocation stats interceptor
+ try {
+ ObjectName objectName = jmxName.set("j2eeType", "Invocations").build();
+ server.registerMBean(new ManagedMBean(stats), objectName);
+ data.add(objectName);
+ } catch (Exception e) {
+ logger.error("Unable to register MBean ", e);
+ }
}
try {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java Wed Apr 4 14:09:07 2012
@@ -287,26 +287,28 @@ public class StatefulContainer implement
beanContext.setContainerData(data);
// Create stats interceptor
- StatsInterceptor stats = new StatsInterceptor(beanContext.getBeanClass());
- beanContext.addSystemInterceptor(stats);
+ if (StatsInterceptor.isStatsActivated()) {
+ StatsInterceptor stats = new StatsInterceptor(beanContext.getBeanClass());
+ beanContext.addSystemInterceptor(stats);
+
+ MBeanServer server = LocalMBeanServer.get();
+
+ ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb.management");
+ jmxName.set("J2EEServer", "openejb");
+ jmxName.set("J2EEApplication", null);
+ jmxName.set("EJBModule", beanContext.getModuleID());
+ jmxName.set("StatefulSessionBean", beanContext.getEjbName());
+ jmxName.set("j2eeType", "");
+ jmxName.set("name", beanContext.getEjbName());
- MBeanServer server = LocalMBeanServer.get();
-
- ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb.management");
- jmxName.set("J2EEServer", "openejb");
- jmxName.set("J2EEApplication", null);
- jmxName.set("EJBModule", beanContext.getModuleID());
- jmxName.set("StatefulSessionBean", beanContext.getEjbName());
- jmxName.set("j2eeType", "");
- jmxName.set("name", beanContext.getEjbName());
-
- // register the invocation stats interceptor
- try {
- ObjectName objectName = jmxName.set("j2eeType", "Invocations").build();
- server.registerMBean(new ManagedMBean(stats), objectName);
- data.jmxNames.add(objectName);
- } catch (Exception e) {
- logger.error("Unable to register MBean ", e);
+ // register the invocation stats interceptor
+ try {
+ ObjectName objectName = jmxName.set("j2eeType", "Invocations").build();
+ server.registerMBean(new ManagedMBean(stats), objectName);
+ data.jmxNames.add(objectName);
+ } catch (Exception e) {
+ logger.error("Unable to register MBean ", e);
+ }
}
try {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java Wed Apr 4 14:09:07 2012
@@ -16,6 +16,30 @@
*/
package org.apache.openejb.core.stateless;
+import java.io.Flushable;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import javax.ejb.ConcurrentAccessTimeoutException;
+import javax.ejb.EJBContext;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.naming.Context;
+import javax.naming.NamingException;
import org.apache.openejb.ApplicationException;
import org.apache.openejb.BeanContext;
import org.apache.openejb.OpenEJBException;
@@ -41,32 +65,6 @@ import org.apache.openejb.util.SafeToolk
import org.apache.xbean.recipe.ObjectRecipe;
import org.apache.xbean.recipe.Option;
-import javax.ejb.ConcurrentAccessTimeoutException;
-import javax.ejb.EJBContext;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import java.io.Flushable;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
public class StatelessInstanceManager {
private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources");
private static final Method removeSessionBeanMethod;
@@ -325,13 +323,7 @@ public class StatelessInstanceManager {
long maxAge = builder.getMaxAge().getTime(TimeUnit.MILLISECONDS);
double maxAgeOffset = builder.getMaxAgeOffset();
- // Create stats interceptor
- StatsInterceptor stats = new StatsInterceptor(beanContext.getBeanClass());
- beanContext.addSystemInterceptor(stats);
-
- MBeanServer server = LocalMBeanServer.get();
-
- ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb.management");
+ final ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb.management");
jmxName.set("J2EEServer", "openejb");
jmxName.set("J2EEApplication", null);
jmxName.set("EJBModule", beanContext.getModuleID());
@@ -339,13 +331,21 @@ public class StatelessInstanceManager {
jmxName.set("j2eeType", "");
jmxName.set("name", beanContext.getEjbName());
- // register the invocation stats interceptor
- try {
- ObjectName objectName = jmxName.set("j2eeType", "Invocations").build();
- server.registerMBean(new ManagedMBean(stats), objectName);
- data.add(objectName);
- } catch (Exception e) {
- logger.error("Unable to register MBean ", e);
+ final MBeanServer server = LocalMBeanServer.get();
+
+ // Create stats interceptor
+ if (StatsInterceptor.isStatsActivated()) {
+ StatsInterceptor stats = new StatsInterceptor(beanContext.getBeanClass());
+ beanContext.addSystemInterceptor(stats);
+
+ // register the invocation stats interceptor
+ try {
+ ObjectName objectName = jmxName.set("j2eeType", "Invocations").build();
+ server.registerMBean(new ManagedMBean(stats), objectName);
+ data.add(objectName);
+ } catch (Exception e) {
+ logger.error("Unable to register MBean ", e);
+ }
}
// register the pool
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java Wed Apr 4 14:09:07 2012
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.monitoring;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.math.stat.descriptive.SynchronizedDescriptiveStatistics;
import org.apache.xbean.finder.ClassFinder;
import org.apache.openejb.api.Monitor;
@@ -42,6 +43,7 @@ import java.util.concurrent.atomic.Atomi
* @version $Rev$ $Date$
*/
public class StatsInterceptor {
+ private static final String DISABLE_STAT_INTERCEPTOR_PROPERTY = "openejb.stats.interceptor.disable";
public static final InterceptorData metadata = InterceptorData.scan(StatsInterceptor.class);
@@ -343,4 +345,8 @@ public class StatsInterceptor {
}
}
+
+ public static boolean isStatsActivated() {
+ return SystemInstance.get().getOptions().get(DISABLE_STAT_INTERCEPTOR_PROPERTY, false);
+ }
}
Modified: openejb/trunk/openejb/examples/polling-parent/polling-web/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/polling-parent/polling-web/pom.xml?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/polling-parent/polling-web/pom.xml (original)
+++ openejb/trunk/openejb/examples/polling-parent/polling-web/pom.xml Wed Apr 4 14:09:07 2012
@@ -62,7 +62,7 @@
<plugin>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.0.0-beta-3-SNAPSHOT</version>
<configuration>
<tomeeClassifier>plus</tomeeClassifier>
</configuration>
Modified: openejb/trunk/openejb/examples/webapps/rest-example/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/rest-example/pom.xml?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webapps/rest-example/pom.xml (original)
+++ openejb/trunk/openejb/examples/webapps/rest-example/pom.xml Wed Apr 4 14:09:07 2012
@@ -69,7 +69,7 @@
<plugin>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.0.0-beta-3-SNAPSHOT</version>
<configuration>
<tomeeVersion>1.0.0-beta-3-SNAPSHOT</tomeeVersion>
</configuration>
Modified: openejb/trunk/openejb/maven/dd-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/dd-maven-plugin/pom.xml?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/dd-maven-plugin/pom.xml (original)
+++ openejb/trunk/openejb/maven/dd-maven-plugin/pom.xml Wed Apr 4 14:09:07 2012
@@ -3,15 +3,15 @@
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">
<parent>
- <artifactId>maven-plugins-parent</artifactId>
+ <artifactId>maven</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>dd-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>OpenEJB Maven Plugins :: DD Maven Plugin</name>
+ <name>OpenEJB :: Maven Plugins :: DD Maven Plugin</name>
<dependencies>
<dependency>
Modified: openejb/trunk/openejb/maven/maven-util/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/maven-util/pom.xml?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/maven-util/pom.xml (original)
+++ openejb/trunk/openejb/maven/maven-util/pom.xml Wed Apr 4 14:09:07 2012
@@ -3,14 +3,14 @@
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">
<parent>
- <artifactId>maven-plugins-parent</artifactId>
+ <artifactId>maven</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-util</artifactId>
- <name>OpenEJB Maven Plugins :: Util</name>
+ <name>OpenEJB :: Maven Plugins :: Util</name>
<dependencies>
<dependency>
Modified: openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/pom.xml?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/pom.xml (original)
+++ openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/pom.xml Wed Apr 4 14:09:07 2012
@@ -3,15 +3,15 @@
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">
<parent>
- <artifactId>maven-plugins-parent</artifactId>
+ <artifactId>maven</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-embedded-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>OpenEJB Maven Plugins :: OpenEJB Embedded Maven Plugin</name>
+ <name>OpenEJB :: Maven Plugins :: OpenEJB Embedded Maven Plugin</name>
<dependencies>
<dependency>
@@ -36,4 +36,4 @@
<properties>
<maven-plugin.prefix>openejb-embedded</maven-plugin.prefix>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: openejb/trunk/openejb/maven/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/pom.xml?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/pom.xml (original)
+++ openejb/trunk/openejb/maven/pom.xml Wed Apr 4 14:09:07 2012
@@ -22,16 +22,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>10</version>
+ <artifactId>openejb</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>4.0.0-beta-3-SNAPSHOT</version>
</parent>
- <groupId>org.apache.openejb</groupId>
- <artifactId>maven-plugins-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <artifactId>maven</artifactId>
<packaging>pom</packaging>
- <name>OpenEJB Maven Plugins</name>
+ <name>OpenEJB :: Maven Plugins</name>
<modules>
<module>tomee-maven-plugin</module>
@@ -67,35 +65,23 @@
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-api</artifactId>
- <version>1.8</version>
+ <version>${aether.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>${openejb.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${openejb.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder-shaded</artifactId>
- <version>3.10-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.version>2.2.1</maven.version>
- <openejb.version>4.0.0-beta-3-SNAPSHOT</openejb.version>
</properties>
<build>
@@ -108,14 +94,6 @@
<goalPrefix>${maven-plugin.prefix}</goalPrefix>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: openejb/trunk/openejb/maven/spi-helper-jee6-profile/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/spi-helper-jee6-profile/pom.xml?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/spi-helper-jee6-profile/pom.xml (original)
+++ openejb/trunk/openejb/maven/spi-helper-jee6-profile/pom.xml Wed Apr 4 14:09:07 2012
@@ -3,12 +3,12 @@
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">
<parent>
- <artifactId>maven-plugins-parent</artifactId>
+ <artifactId>maven</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spi-helper-jee6-profile</artifactId>
- <name>OpenEJB Maven Plugins :: JEE6 profile</name>
+ <name>OpenEJB :: Maven Plugins :: JEE6 profile</name>
</project>
Modified: openejb/trunk/openejb/maven/spi-helper-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/spi-helper-maven-plugin/pom.xml?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/spi-helper-maven-plugin/pom.xml (original)
+++ openejb/trunk/openejb/maven/spi-helper-maven-plugin/pom.xml Wed Apr 4 14:09:07 2012
@@ -3,15 +3,15 @@
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">
<parent>
- <artifactId>maven-plugins-parent</artifactId>
+ <artifactId>maven</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.0.0-beta-3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spi-helper-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>OpenEJB Maven Plugins :: SPI Maven Plugin</name>
+ <name>OpenEJB :: Maven Plugins :: SPI Maven Plugin</name>
<dependencies>
<dependency>
Modified: openejb/trunk/openejb/maven/tomee-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/pom.xml?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/tomee-maven-plugin/pom.xml (original)
+++ openejb/trunk/openejb/maven/tomee-maven-plugin/pom.xml Wed Apr 4 14:09:07 2012
@@ -22,14 +22,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
+ <artifactId>maven</artifactId>
<groupId>org.apache.openejb</groupId>
- <artifactId>maven-plugins-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.0.0-beta-3-SNAPSHOT</version>
</parent>
<artifactId>tomee-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>OpenEJB Maven Plugins :: TomEE Maven Plugin</name>
+ <name>OpenEJB :: Maven Plugins :: TomEE Maven Plugin</name>
<dependencies>
<dependency>
Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1309396&r1=1309395&r2=1309396&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Wed Apr 4 14:09:07 2012
@@ -251,6 +251,12 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>bundle</supportedProjectType>
+ <supportedProjectType>jar</supportedProjectType>
+ <!-- because we specify the MANIFEST.MF from this plugin and we don't want to break everything for maven -->
+ <supportedProjectType>maven-plugin</supportedProjectType>
+ </supportedProjectTypes>
<instructions>
<Bundle-Name>Apache ${project.name}</Bundle-Name>
<Bundle-Activator>${openejb.bundle.activator}</Bundle-Activator>
@@ -315,6 +321,7 @@
<modules>
<module>deps</module>
<module>itests</module>
+ <module>maven</module>
<module>container</module>
<module>server</module>
<module>examples</module>
@@ -330,6 +337,7 @@
<id>quick</id>
<modules>
<module>deps</module>
+ <module>maven</module>
<module>container</module>
<module>server</module>
<module>assembly</module>
@@ -343,6 +351,7 @@
<modules>
<module>deps</module>
<module>itests</module>
+ <module>maven</module>
<module>container</module>
<module>server</module>
<module>examples</module>