Author: rmannibucau
Date: Thu Jul 7 20:51:35 2011
New Revision: 1144029
URL: http://svn.apache.org/viewvc?rev=1144029&view=rev
Log:
fixing jetty version and a bit of conf since cxf uses a higher version
Modified:
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBConfiguration.java
Modified:
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml?rev=1144029&r1=1144028&r2=1144029&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml
(original)
+++ openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/pom.xml
Thu Jul 7 20:51:35 2011
@@ -97,31 +97,26 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>7.0.2.v20100331</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>7.0.2.v20100331</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
- <version>7.0.2.v20100331</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>
- <version>7.0.2.v20100331</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jsp-2.1</artifactId>
- <version>7.0.2.v20100331</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified:
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBConfiguration.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBConfiguration.java?rev=1144029&r1=1144028&r2=1144029&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBConfiguration.java
(original)
+++
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-common/src/main/java/org/apache/openejb/jetty/common/OpenEJBConfiguration.java
Thu Jul 7 20:51:35 2011
@@ -22,7 +22,15 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.InjectionBuilder;
import org.apache.openejb.assembler.classic.WebAppInfo;
-import org.apache.openejb.config.*;
+import org.apache.openejb.config.AnnotationDeployer;
+import org.apache.openejb.config.AppModule;
+import org.apache.openejb.config.ClientModule;
+import org.apache.openejb.config.ConfigurationFactory;
+import org.apache.openejb.config.DeploymentLoader;
+import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.config.ReadDescriptors;
+import org.apache.openejb.config.UnknownModuleTypeException;
+import org.apache.openejb.config.WebModule;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
@@ -30,24 +38,23 @@ import org.apache.openejb.util.LogCatego
import org.apache.openejb.util.URLs;
import org.apache.xbean.finder.ResourceFinder;
import org.apache.xbean.finder.UrlSet;
-import org.eclipse.jetty.webapp.Configuration;
-import org.eclipse.jetty.webapp.WebAppContext;
import org.eclipse.jetty.plus.annotation.InjectionCollection;
+import org.eclipse.jetty.webapp.AbstractConfiguration;
+import org.eclipse.jetty.webapp.WebAppContext;
import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.naming.NamingException;
import javax.servlet.ServletContext;
import java.io.File;
import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
import java.net.URL;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-public class OpenEJBConfiguration implements Configuration {
+public class OpenEJBConfiguration extends AbstractConfiguration {
private ConfigurationFactory configurationFactory;
private Assembler assembler;
private static final org.apache.openejb.util.Logger logger =
org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB.createChild("jetty"),
"org.apache.openejb.util.resources");
@@ -138,12 +145,6 @@ public class OpenEJBConfiguration implem
return null;
}
- public void postConfigure(WebAppContext context) throws Exception {
- }
-
- public void deconfigure(WebAppContext context) throws Exception {
- }
-
/**
* Creates an openejb {@link AppModule} instance
* from given tomcat context.
