svn commit: r1153909 - in /openejb/trunk/openejb3: assembly/openejb-jetty/openejb-jetty-webapp/src/main/assembly/war.xml tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java

[rmannibucau]

Author: rmannibucau
Date: Thu Aug  4 15:29:49 2011
New Revision: 1153909

URL: http://svn.apache.org/viewvc?rev=1153909&view=rev
Log:
jetty regex exclusion fixed

Modified:
    
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-webapp/src/main/assembly/war.xml
    
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java

Modified: 
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-webapp/src/main/assembly/war.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-webapp/src/main/assembly/war.xml?rev=1153909&r1=1153908&r2=1153909&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-webapp/src/main/assembly/war.xml
 (original)
+++ 
openejb/trunk/openejb3/assembly/openejb-jetty/openejb-jetty-webapp/src/main/assembly/war.xml
 Thu Aug  4 15:29:49 2011
@@ -71,7 +71,7 @@
       <outputDirectory>lib</outputDirectory>
       <scope>runtime</scope>
       <excludes>
-          <exclude>org.eclipse.jetty:jetty</exclude>
+          <exclude>org.eclipse.jetty:jetty*</exclude>
       </excludes>
     </dependencySet>
     <dependencySet>

Modified: 
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java?rev=1153909&r1=1153908&r2=1153909&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
 (original)
+++ 
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
 Thu Aug  4 15:29:49 2011
@@ -55,8 +55,7 @@ public class ContainersImplTomEE impleme
         final Options options = new Options(System.getProperties());
         Properties props = new Properties();
         props.put(Context.INITIAL_CONTEXT_FACTORY, 
RemoteInitialContextFactory.class.getName());
-        props.put(Context.PROVIDER_URL,
-options.get(Context.PROVIDER_URL,"http://localhost:7180/openejb/ejb";));
+        props.put(Context.PROVIDER_URL, 
options.get(Context.PROVIDER_URL,"http://localhost:7180/openejb/ejb";));
         try {
             InitialContext context = new InitialContext(props);
             return (Deployer) context.lookup("openejb/DeployerBusinessRemote");