geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r417369 [8/8] - in /geronimo/sandbox/servlet-2.5: ./ etc/ modules/client-builder/src/java/org/apache/geronimo/client/builder/ modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ modules/j2ee-builder/src/java/org/apa...
Date Tue, 27 Jun 2006 08:13:13 GMT
Modified: geronimo/sandbox/servlet-2.5/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java?rev=417369&r1=417368&r2=417369&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
(original)
+++ geronimo/sandbox/servlet-2.5/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
Tue Jun 27 01:13:10 2006
@@ -38,7 +38,7 @@
 import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
 import org.mortbay.http.Authenticator;
-import org.mortbay.jetty.servlet.FormAuthenticator;
+import org.mortbay.jetty.security.FormAuthenticator;
 
 import java.net.URL;
 import java.security.PermissionCollection;

Modified: geronimo/sandbox/servlet-2.5/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?rev=417369&r1=417368&r2=417369&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
(original)
+++ geronimo/sandbox/servlet-2.5/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
Tue Jun 27 01:13:10 2006
@@ -61,19 +61,19 @@
 import org.apache.geronimo.xbeans.geronimo.naming.GerResourceEnvRefType;
 import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
 import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
-import org.apache.geronimo.xbeans.j2ee.EjbLocalRefType;
-import org.apache.geronimo.xbeans.j2ee.EjbRefType;
-import org.apache.geronimo.xbeans.j2ee.EnvEntryType;
-import org.apache.geronimo.xbeans.j2ee.MessageDestinationRefType;
-import org.apache.geronimo.xbeans.j2ee.MessageDestinationType;
-import org.apache.geronimo.xbeans.j2ee.ParamValueType;
-import org.apache.geronimo.xbeans.j2ee.PortComponentRefType;
-import org.apache.geronimo.xbeans.j2ee.ResourceEnvRefType;
-import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
-import org.apache.geronimo.xbeans.j2ee.ServiceRefHandlerType;
-import org.apache.geronimo.xbeans.j2ee.ServiceRefType;
-import org.apache.geronimo.xbeans.j2ee.XsdQNameType;
-import org.apache.geronimo.xbeans.j2ee.XsdStringType;
+import org.apache.geronimo.xbeans.javaee.EjbLocalRefType;
+import org.apache.geronimo.xbeans.javaee.EjbRefType;
+import org.apache.geronimo.xbeans.javaee.EnvEntryType;
+import org.apache.geronimo.xbeans.javaee.MessageDestinationRefType;
+import org.apache.geronimo.xbeans.javaee.MessageDestinationType;
+import org.apache.geronimo.xbeans.javaee.ParamValueType;
+import org.apache.geronimo.xbeans.javaee.PortComponentRefType;
+import org.apache.geronimo.xbeans.javaee.ResourceEnvRefType;
+import org.apache.geronimo.xbeans.javaee.ResourceRefType;
+import org.apache.geronimo.xbeans.javaee.ServiceRefHandlerType;
+import org.apache.geronimo.xbeans.javaee.ServiceRefType;
+import org.apache.geronimo.xbeans.javaee.XsdQNameType;
+import org.apache.geronimo.xbeans.javaee.XsdStringType;
 
 /**
  * @version $Rev:385232 $ $Date$
@@ -558,7 +558,7 @@
         List handlerInfos = new ArrayList();
         for (int i = 0; i < handlers.length; i++) {
             ServiceRefHandlerType handler = handlers[i];
-            org.apache.geronimo.xbeans.j2ee.String[] portNameArray = handler.getPortNameArray();
+            org.apache.geronimo.xbeans.javaee.String[] portNameArray = handler.getPortNameArray();
             List portNames = new ArrayList();
             for (int j = 0; j < portNameArray.length; j++) {
                 portNames.add(portNameArray[j].getStringValue().trim());
@@ -638,7 +638,7 @@
         return clazz;
     }
 
-    private static String getStringValue(org.apache.geronimo.xbeans.j2ee.String string) {
+    private static String getStringValue(org.apache.geronimo.xbeans.javaee.String string)
{
         if (string == null) {
             return null;
         }

Modified: geronimo/sandbox/servlet-2.5/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java?rev=417369&r1=417368&r2=417369&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java
(original)
+++ geronimo/sandbox/servlet-2.5/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java
Tue Jun 27 01:13:10 2006
@@ -36,8 +36,8 @@
 import org.apache.geronimo.kernel.Jsr77Naming;
 import org.apache.geronimo.naming.java.ComponentContextBuilder;
 import org.apache.geronimo.xbeans.geronimo.naming.GerMessageDestinationType;
-import org.apache.geronimo.xbeans.j2ee.MessageDestinationRefType;
-import org.apache.geronimo.xbeans.j2ee.MessageDestinationType;
+import org.apache.geronimo.xbeans.javaee.MessageDestinationRefType;
+import org.apache.geronimo.xbeans.javaee.MessageDestinationType;
 
 import javax.naming.Reference;
 import javax.xml.namespace.QName;

Modified: geronimo/sandbox/servlet-2.5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/servlet-2.5/pom.xml?rev=417369&r1=417368&r2=417369&view=diff
==============================================================================
--- geronimo/sandbox/servlet-2.5/pom.xml (original)
+++ geronimo/sandbox/servlet-2.5/pom.xml Tue Jun 27 01:13:10 2006
@@ -175,7 +175,7 @@
         <javaccVersion>2.1</javaccVersion>
         <jdbmVersion>0.20-dev</jdbmVersion>
         <jdomVersion>1.0</jdomVersion>
-        <jettyVersion>5.1.10</jettyVersion>
+        <jettyVersion>6.0-SNAPSHOT</jettyVersion>
         <jstlVersion>1.1.1</jstlVersion>
         <juddiVersion>0.9rc4</juddiVersion>
         <junitVersion>3.8.1</junitVersion>



Mime
View raw message