rmannibucau

Index: container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
===================================================================
--- container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java	(revision 1569653)
+++ container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java	(working copy)
@@ -16,7 +16,6 @@
  */
 package org.apache.openejb.assembler.classic;
 
-import org.apache.catalina.LifecycleException;
 import org.apache.geronimo.connector.GeronimoBootstrapContext;

rmannibucau

Using CATALINA_BASE:   /home/rmannibucau/dev/Other/ticket-monster/demo/apache-tomee-webprofile-2.0.0-SNAPSHOT
Using CATALINA_HOME:   /home/rmannibucau/dev/Other/ticket-monster/demo/apache-tomee-webprofile-2.0.0-SNAPSHOT
Using CATALINA_TMPDIR: /home/rmannibucau/dev/Other/ticket-monster/demo/apache-tomee-webprofile-2.0.0-SNAPSHOT/temp
Using JRE_HOME:        /home/rmannibucau/softwares/jdk1.7.0_67
Using CLASSPATH:       /home/rmannibucau/dev/Other/ticket-monster/demo/apache-tomee-webprofile-2.0.0-SNAPSHOT/bin/bootstrap.jar:/home/rmannibucau/dev/Other/ticket-monster/demo/apache-tomee-webprofile-2.0.0-SNAPSHOT/bin/tomcat-juli.jar
INFOS - The APR based Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: /usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib
INFOS - Initializing ProtocolHandler ["http-nio-8080"]
INFOS - Using a shared selector for servlet write/read
INFOS - Initializing ProtocolHandler ["ajp-nio-8009"]
INFOS - Using a

rmannibucau

public class SimpleDeploymentExtension implements LoadableExtension {
    @Override
    public void register(final ExtensionBuilder extensionBuilder) {
        extensionBuilder.service(DeploymentScenarioGenerator.class, SimpleDeploymentScenarioGenerator.class);
    }

    public static class SimpleDeploymentScenarioGenerator implements DeploymentScenarioGenerator {
        private static final Method VALIDATE;
        private static final Method GENERATE;
        static {

rmannibucau

      <plugin>
        <groupId>org.apache.openejb</groupId>
        <artifactId>tomee-maven-plugin</artifactId>
        <version>0.0.1-SNAPSHOT</version>
        <configuration>
          <tomeeVersion>1.0.0-beta-2-SNAPSHOT</tomeeVersion>
          <libs>
            <lib>mysql:mysql-connector-java:5.1.18</lib>
          </libs>
        </configuration>

rmannibucau

    <plugin>
        <groupId>org.apache.karaf.tooling</groupId>
        <artifactId>karaf-maven-plugin</artifactId>
        <version>3.0.0-SNAPSHOT</version>
        <configuration>
        </configuration>
        <executions>
          <execution>
            <id>compile</id>
            <phase>compile</phase>

rmannibucau

diff -r 0170ba313366 galleria-ejb/pom.xml
--- a/galleria-ejb/pom.xml	Fri Mar 16 15:50:50 2012 +0530
+++ b/galleria-ejb/pom.xml	Sun Mar 18 19:12:37 2012 +0100
@@ -186,17 +186,13 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
+			<!--plugin>
 				<groupId>com.dbdeploy</groupId>

rmannibucau

Index: container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
===================================================================
--- container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java	(révision 1309375)
+++ container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java	(copie de travail)
@@ -1512,7 +1512,7 @@
             return ResourcesModule.class;
         }
 
-        if (descriptors.containsKey("application.xml") || path.endsWith(".ear")) {
+         if (descriptors.containsKey("application.xml") || path.endsWith(".ear")) {

rmannibucau

diff --git a/ejb/pom.xml b/ejb/pom.xml
index 7e73f14..6b32f74 100644
--- a/ejb/pom.xml
+++ b/ejb/pom.xml
@@ -90,9 +90,9 @@
                     <plugin>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <excludes>
+                            <!--excludes>

rmannibucau

     <plugin>
        <groupId>org.apache.openejb.maven</groupId>
        <artifactId>tomee-maven-plugin</artifactId>
        <version>1.0.0-SNAPSHOT</version> <!-- 1.0-alpha-1 for last release -->
        <configuration> <!-- all has default -->
          <tomeeVersion>1.1.0-SNAPSHOT</tomeeVersion> <!-- 1.0.0 -->
          <tomeeClassifier>plus</tomeeClassifier> <!-- default = webprofile -->
          <debug>false</debug>
          <debugPort>5005</debugPort>
          <args>-Dfoo=bar</args>

rmannibucau

/*
 * Copyright 2012 the original author or authors.
 *
 * Licensed 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