pom.xml review

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

pom.xml review

Bhakti Mehta-2
Jane/Snejzana,
Please can you review the following pom.xml
This is first phase of  incremental work with respect to the following task
http://aseng-wiki.us.oracle.com/asengwiki/display/GlassFish/DOL+Split
I have  started experimenting with webservices module and moved the
archvists related to Webservices from deployment/dol to
webservices/connector/archivists.
Index: appserver/webservices/connector/pom.xml
===================================================================
--- appserver/webservices/connector/pom.xml    (revision 48590)
+++ appserver/webservices/connector/pom.xml    (working copy)
@@ -70,5 +70,11 @@
             <artifactId>internal-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.deployment</groupId>
+            <artifactId>dol</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
     </dependencies>
 </project>


Here is a summary of my changes attached.

I have run QL  and also devtests before I commit
Regards,
Bhakti

Index: appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/WLEjbArchivist.java
===================================================================
--- appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/WLEjbArchivist.java (revision 48590)
+++ appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/WLEjbArchivist.java (working copy)
@@ -1,119 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-
-package com.sun.enterprise.deployment.archivist;
-
-import com.sun.enterprise.deployment.EjbBundleDescriptor;
-import org.glassfish.deployment.common.RootDeploymentDescriptor;
-import org.glassfish.deployment.common.XModuleType;
-import com.sun.enterprise.deployment.io.DeploymentDescriptorFile;
-import com.sun.enterprise.deployment.io.runtime.EjbRuntimeDDFile;
-import com.sun.enterprise.deployment.io.runtime.GFEjbRuntimeDDFile;
-import com.sun.enterprise.deployment.io.runtime.WLEjbRuntimeDDFile;
-import com.sun.enterprise.deployment.util.DOLUtils;
-import com.sun.enterprise.util.LocalStringManagerImpl;
-import org.glassfish.api.deployment.archive.ReadableArchive;
-import org.jvnet.hk2.annotations.Scoped;
-import org.jvnet.hk2.annotations.Service;
-import org.jvnet.hk2.component.PerLookup;
-import org.xml.sax.SAXParseException;
-
-import java.io.IOException;
-
-@Service
-@Scoped(PerLookup.class)
-public class WLEjbArchivist extends ExtensionsArchivist {
-    private static final LocalStringManagerImpl localStrings =
-            new LocalStringManagerImpl(WLEjbArchivist.class);
-
-    @Override                                                  
-    public DeploymentDescriptorFile getStandardDDFile(RootDeploymentDescriptor descriptor) {
-        return null;
-    }
-
-    @Override
-    public DeploymentDescriptorFile getConfigurationDDFile(RootDeploymentDescriptor descriptor) {
-        return new WLEjbRuntimeDDFile();
-    }
-
-    @Override
-    public boolean supportsModuleType(XModuleType moduleType) {
-        return XModuleType.EJB ==moduleType;
-    }
-
-    @Override
-    public XModuleType getModuleType() {
-        return XModuleType.EJB;
-    }
-
-    @Override
-    public Object open(Archivist main, ReadableArchive archive, RootDeploymentDescriptor descriptor) throws IOException, SAXParseException {
-        return descriptor;
-    }
-
-    @Override
-    public RootDeploymentDescriptor getDefaultDescriptor() {
-        return new EjbBundleDescriptor();
-    }
-
-    @Override
-    public DeploymentDescriptorFile getGFCounterPartConfigurationDDFile(RootDeploymentDescriptor descriptor) {
-        return new GFEjbRuntimeDDFile();
-    }
-
-    @Override
-    public DeploymentDescriptorFile getSunCounterPartConfigurationDDFile(RootDeploymentDescriptor descriptor) {
-        return new EjbRuntimeDDFile();
-    }
-
-    @Override
-    public Object readRuntimeDeploymentDescriptor(Archivist main, ReadableArchive archive, RootDeploymentDescriptor descriptor)
-            throws IOException, SAXParseException {
-        DeploymentDescriptorFile configDD = getConfigurationDDFile(descriptor);
-        String configDDPath = configDD.getDeploymentDescriptorPath();
-        if (archive.exists(configDDPath)) {
-            DOLUtils.getDefaultLogger().warning(
-                    localStrings.getLocalString("enterprise.deployment.archivist.DDNotSupported",
-                    "Ignore {0} as it is not supported in this release.", new Object[]{configDDPath}));
-        }
-        return descriptor;
-    }
-}
-
Index: appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/WLApplicationArchivist.java
===================================================================
--- appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/WLApplicationArchivist.java (revision 48590)
+++ appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/WLApplicationArchivist.java (working copy)
@@ -1,105 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-
-package com.sun.enterprise.deployment.archivist;
-
-import com.sun.enterprise.deployment.Application;
-import org.glassfish.deployment.common.RootDeploymentDescriptor;
-import org.glassfish.deployment.common.XModuleType;
-import com.sun.enterprise.deployment.io.DeploymentDescriptorFile;
-import com.sun.enterprise.deployment.io.runtime.WLApplicationRuntimeDDFile;
-import com.sun.enterprise.deployment.io.runtime.GFApplicationRuntimeDDFile;
-import com.sun.enterprise.deployment.io.runtime.ApplicationRuntimeDDFile;
-import org.glassfish.api.deployment.archive.ReadableArchive;
-import org.jvnet.hk2.annotations.Inject;
-import org.jvnet.hk2.annotations.Scoped;
-import org.jvnet.hk2.annotations.Service;
-import org.jvnet.hk2.component.Habitat;
-import org.jvnet.hk2.component.PerLookup;
-import org.xml.sax.SAXParseException;
-
-import java.io.IOException;
-
-@Service
-@Scoped(PerLookup.class)
-public class WLApplicationArchivist extends ExtensionsArchivist {
-    @Inject
-    private Habitat habitat;
-
-    @Override                                                  
-    public DeploymentDescriptorFile getStandardDDFile(RootDeploymentDescriptor descriptor) {
-        return null;
-    }
-
-    @Override
-    public DeploymentDescriptorFile getConfigurationDDFile(RootDeploymentDescriptor descriptor) {
-        return new WLApplicationRuntimeDDFile();
-    }
-
-    @Override
-    public boolean supportsModuleType(XModuleType moduleType) {
-        return XModuleType.EAR ==moduleType;
-    }
-
-    @Override
-    public XModuleType getModuleType() {
-        return XModuleType.EAR;
-    }
-
-    @Override
-    public Object open(Archivist main, ReadableArchive archive, RootDeploymentDescriptor descriptor) throws IOException, SAXParseException {
-        return descriptor;
-    }
-
-    public RootDeploymentDescriptor getDefaultDescriptor() {
-        return new Application(habitat);
-    }
-
-    @Override
-    public DeploymentDescriptorFile getGFCounterPartConfigurationDDFile(RootDeploymentDescriptor descriptor) {
-        return new GFApplicationRuntimeDDFile();
-    }
-
-    @Override
-    public DeploymentDescriptorFile getSunCounterPartConfigurationDDFile(RootDeploymentDescriptor descriptor) {
-        return new ApplicationRuntimeDDFile();
-    }
-}
-
Index: appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/WLWebArchivist.java
===================================================================
--- appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/WLWebArchivist.java (revision 48590)
+++ appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/WLWebArchivist.java (working copy)
@@ -1,101 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-
-package com.sun.enterprise.deployment.archivist;
-
-import com.sun.enterprise.deployment.WebBundleDescriptor;
-import org.glassfish.deployment.common.RootDeploymentDescriptor;
-import org.glassfish.deployment.common.XModuleType;
-import com.sun.enterprise.deployment.io.DeploymentDescriptorFile;
-import com.sun.enterprise.deployment.io.runtime.WLWebRuntimeDDFile;
-import com.sun.enterprise.deployment.io.runtime.WebRuntimeDDFile;
-import com.sun.enterprise.deployment.io.runtime.GFWebRuntimeDDFile;
-import org.glassfish.api.deployment.archive.ReadableArchive;
-import org.jvnet.hk2.annotations.Scoped;
-import org.jvnet.hk2.annotations.Service;
-import org.jvnet.hk2.component.PerLookup;
-import org.xml.sax.SAXParseException;
-
-import java.io.IOException;
-
-@Service
-@Scoped(PerLookup.class)
-public class WLWebArchivist extends ExtensionsArchivist {
-
-    @Override                                                  
-    public DeploymentDescriptorFile getStandardDDFile(RootDeploymentDescriptor descriptor) {
-        return null;
-    }
-
-    @Override
-    public DeploymentDescriptorFile getConfigurationDDFile(RootDeploymentDescriptor descriptor) {
-        return new WLWebRuntimeDDFile();
-    }
-
-    @Override
-    public boolean supportsModuleType(XModuleType moduleType) {
-        return XModuleType.WAR ==moduleType;
-    }
-
-    @Override
-    public XModuleType getModuleType() {
-        return XModuleType.WAR;
-    }
-
-    @Override
-    public Object open(Archivist main, ReadableArchive archive, RootDeploymentDescriptor descriptor) throws IOException, SAXParseException {
-        return descriptor;
-    }
-
-    public RootDeploymentDescriptor getDefaultDescriptor() {
-        return new WebBundleDescriptor();
-    }
-
-    @Override
-    public DeploymentDescriptorFile getGFCounterPartConfigurationDDFile(RootDeploymentDescriptor descriptor) {
-        return new GFWebRuntimeDDFile();
-    }
-
-    @Override
-    public DeploymentDescriptorFile getSunCounterPartConfigurationDDFile(RootDeploymentDescriptor descriptor) {
-        return new WebRuntimeDDFile();
-    }
-}
-
Index: appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/WebServicesArchivist.java
===================================================================
--- appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/WebServicesArchivist.java (revision 48590)
+++ appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/WebServicesArchivist.java (working copy)
@@ -1,94 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2009-2011 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-
-package com.sun.enterprise.deployment.archivist;
-
-import com.sun.enterprise.deployment.io.DeploymentDescriptorFile;
-import com.sun.enterprise.deployment.io.WebServicesDeploymentDescriptorFile;
-import org.glassfish.deployment.common.RootDeploymentDescriptor;
-import com.sun.enterprise.deployment.WebServicesDescriptor;
-import com.sun.enterprise.deployment.BundleDescriptor;
-import org.glassfish.deployment.common.XModuleType;
-import com.sun.enterprise.deployment.io.runtime.WLWebServicesDeploymentDescriptorFile;
-import org.glassfish.api.deployment.archive.ReadableArchive;
-import org.jvnet.hk2.annotations.Service;
-
-import java.io.IOException;
-import org.xml.sax.SAXParseException;
-
-/**
- * Extension Archivist for webservices.
- */
-@Service
-public class WebServicesArchivist extends ExtensionsArchivist {
-
-    public DeploymentDescriptorFile getStandardDDFile(RootDeploymentDescriptor descriptor) {
-        return new WebServicesDeploymentDescriptorFile(descriptor);
-    }
-
-    public DeploymentDescriptorFile getConfigurationDDFile(RootDeploymentDescriptor descriptor) {
-        return new WLWebServicesDeploymentDescriptorFile(descriptor);
-    }
-
-    public XModuleType getModuleType() {
-        return XModuleType.WebServices;
-    }
-
-    public boolean supportsModuleType(XModuleType moduleType) {
-        return (XModuleType.WAR==moduleType || XModuleType.EJB==moduleType
-                || XModuleType.EjbInWar==moduleType);
-    }
-
-    @Override
-    public Object open(Archivist main, ReadableArchive archive, RootDeploymentDescriptor descriptor) throws IOException, SAXParseException {
-        BundleDescriptor bundleDescriptor =
-            BundleDescriptor.class.cast(super.open(main, archive, descriptor));
-
-        if (bundleDescriptor != null) {
-            return bundleDescriptor.getWebServices();
-        } else {
-            return BundleDescriptor.class.cast(descriptor).getWebServices();
-        }
-    }
-
-    public RootDeploymentDescriptor getDefaultDescriptor() {
-        return new WebServicesDescriptor();
-    }
-}
Index: appserver/tests/quicklook/wsit/JaxwsFromWsdl/metadata/web.xml
===================================================================
--- appserver/tests/quicklook/wsit/JaxwsFromWsdl/metadata/web.xml (revision 48590)
+++ appserver/tests/quicklook/wsit/JaxwsFromWsdl/metadata/web.xml (working copy)
@@ -41,7 +41,7 @@
 
 -->
 
-<web-app version="2.4" mlns="http://java.sun.com/xml/ns/j2ee">
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
   <display-name>JaxwsFromWsdl</display-name>
   <description>JaxwsFromWsdl</description>
   <listener>
Index: appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceEjbEndpointRegistry.java
===================================================================
--- appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceEjbEndpointRegistry.java (revision 48590)
+++ appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceEjbEndpointRegistry.java (working copy)
@@ -96,12 +96,12 @@
     public void registerEndpoint(WebServiceEndpoint webserviceEndpoint,
                                   EjbEndpointFacade ejbContainer,
                                   Object servant, Class tieClass)  {
-        String ctxtRoot = null;
+        String uri = null;
         EjbRuntimeEndpointInfo endpoint = createEjbEndpointInfo(webserviceEndpoint, ejbContainer,servant,tieClass);
         synchronized(webServiceEjbEndpoints) {
             String uriRaw = endpoint.getEndpointAddressUri();
             if (uriRaw != null ) {
-                String uri = (uriRaw.charAt(0)=='/') ? uriRaw.substring(1) : uriRaw;
+                uri = (uriRaw.charAt(0)=='/') ? uriRaw.substring(1) : uriRaw;
                 if (webServiceEjbEndpoints.containsKey(uri)) {
                     logger.log(Level.SEVERE,
                             format(rb.getString("enterprise.webservice.duplicateService"),
@@ -109,10 +109,10 @@
                 }
                 webServiceEjbEndpoints.put(uri, endpoint);
                 regenerateEjbContextRoots();
-                ctxtRoot = getContextRootForUri(uri);
-                if(adapterListMap.get(ctxtRoot) == null) {
+
+                if(adapterListMap.get(uri) == null) {
                     ServletAdapterList list = new ServletAdapterList();
-                    adapterListMap.put(ctxtRoot, list);
+                    adapterListMap.put(uri, list);
                 }
             } else throw new WebServiceException(rb.getString("ejb.endpointuri.error"));
         }
@@ -125,7 +125,7 @@
         } else {
             engine.createHandler(endpoint.getEndpoint());
             try {
-                endpoint.initRuntimeInfo((ServletAdapterList)adapterListMap.get(ctxtRoot));
+                endpoint.initRuntimeInfo((ServletAdapterList)adapterListMap.get(uri));
             } catch (Exception e) {
                 logger.log(Level.WARNING,
                        "Unexpected error in EJB WebService endpoint post processing", e);
@@ -141,8 +141,8 @@
         synchronized(webServiceEjbEndpoints) {
             String uriRaw = endpointAddressUri;
             String uri = (uriRaw.charAt(0)=='/') ? uriRaw.substring(1) : uriRaw;
-            String ctxtRoot = getContextRootForUri(uri);
-            ServletAdapterList list = (ServletAdapterList)adapterListMap.get(ctxtRoot);
+
+            ServletAdapterList list = (ServletAdapterList)adapterListMap.get(uri);
             if (list != null) {
              //bug12540102: remove only the data related to the endpoint that is unregistered
              Iterator<ServletAdapter> it = list.iterator();
@@ -155,7 +155,7 @@
                 }
                 //Fix for issue 9523
                 if (list.isEmpty()) {
-                 adapterListMap.remove(ctxtRoot);
+                 adapterListMap.remove(uri);
                 }
             }
             endpoint = (EjbRuntimeEndpointInfo) webServiceEjbEndpoints.remove(uri);
Index: appserver/webservices/connector/src/main/java/org/glassfish/webservices/archivist/WLEjbArchivist.java
===================================================================
--- appserver/webservices/connector/src/main/java/org/glassfish/webservices/archivist/WLEjbArchivist.java (revision 0)
+++ appserver/webservices/connector/src/main/java/org/glassfish/webservices/archivist/WLEjbArchivist.java (working copy)
@@ -38,7 +38,7 @@
  * holder.
  */
 
-package com.sun.enterprise.deployment.archivist;
+package  org.glassfish.webservices.archivist;
 
 import com.sun.enterprise.deployment.EjbBundleDescriptor;
 import org.glassfish.deployment.common.RootDeploymentDescriptor;
@@ -48,6 +48,9 @@
 import com.sun.enterprise.deployment.io.runtime.GFEjbRuntimeDDFile;
 import com.sun.enterprise.deployment.io.runtime.WLEjbRuntimeDDFile;
 import com.sun.enterprise.deployment.util.DOLUtils;
+import com.sun.enterprise.deployment.archivist.ExtensionsArchivist;
+import com.sun.enterprise.deployment.archivist.Archivist;
+
 import com.sun.enterprise.util.LocalStringManagerImpl;
 import org.glassfish.api.deployment.archive.ReadableArchive;
 import org.jvnet.hk2.annotations.Scoped;
Index: appserver/webservices/connector/src/main/java/org/glassfish/webservices/archivist/WLApplicationArchivist.java
===================================================================
--- appserver/webservices/connector/src/main/java/org/glassfish/webservices/archivist/WLApplicationArchivist.java (revision 0)
+++ appserver/webservices/connector/src/main/java/org/glassfish/webservices/archivist/WLApplicationArchivist.java (working copy)
@@ -38,7 +38,7 @@
  * holder.
  */
 
-package com.sun.enterprise.deployment.archivist;
+package org.glassfish.webservices.archivist;
 
 import com.sun.enterprise.deployment.Application;
 import org.glassfish.deployment.common.RootDeploymentDescriptor;
@@ -47,6 +47,8 @@
 import com.sun.enterprise.deployment.io.runtime.WLApplicationRuntimeDDFile;
 import com.sun.enterprise.deployment.io.runtime.GFApplicationRuntimeDDFile;
 import com.sun.enterprise.deployment.io.runtime.ApplicationRuntimeDDFile;
+import com.sun.enterprise.deployment.archivist.ExtensionsArchivist;
+import com.sun.enterprise.deployment.archivist.Archivist;
 import org.glassfish.api.deployment.archive.ReadableArchive;
 import org.jvnet.hk2.annotations.Inject;
 import org.jvnet.hk2.annotations.Scoped;
Index: appserver/webservices/connector/src/main/java/org/glassfish/webservices/archivist/WLWebArchivist.java
===================================================================
--- appserver/webservices/connector/src/main/java/org/glassfish/webservices/archivist/WLWebArchivist.java (revision 0)
+++ appserver/webservices/connector/src/main/java/org/glassfish/webservices/archivist/WLWebArchivist.java (working copy)
@@ -38,7 +38,7 @@
  * holder.
  */
 
-package com.sun.enterprise.deployment.archivist;
+package  org.glassfish.webservices.archivist;
 
 import com.sun.enterprise.deployment.WebBundleDescriptor;
 import org.glassfish.deployment.common.RootDeploymentDescriptor;
@@ -47,6 +47,9 @@
 import com.sun.enterprise.deployment.io.runtime.WLWebRuntimeDDFile;
 import com.sun.enterprise.deployment.io.runtime.WebRuntimeDDFile;
 import com.sun.enterprise.deployment.io.runtime.GFWebRuntimeDDFile;
+import com.sun.enterprise.deployment.archivist.ExtensionsArchivist;
+import com.sun.enterprise.deployment.archivist.Archivist;
+
 import org.glassfish.api.deployment.archive.ReadableArchive;
 import org.jvnet.hk2.annotations.Scoped;
 import org.jvnet.hk2.annotations.Service;
Index: appserver/webservices/connector/src/main/java/org/glassfish/webservices/archivist/WebServicesArchivist.java
===================================================================
--- appserver/webservices/connector/src/main/java/org/glassfish/webservices/archivist/WebServicesArchivist.java (revision 0)
+++ appserver/webservices/connector/src/main/java/org/glassfish/webservices/archivist/WebServicesArchivist.java (working copy)
@@ -38,7 +38,7 @@
  * holder.
  */
 
-package com.sun.enterprise.deployment.archivist;
+package org.glassfish.webservices.archivist;
 
 import com.sun.enterprise.deployment.io.DeploymentDescriptorFile;
 import com.sun.enterprise.deployment.io.WebServicesDeploymentDescriptorFile;
@@ -49,7 +49,10 @@
 import com.sun.enterprise.deployment.io.runtime.WLWebServicesDeploymentDescriptorFile;
 import org.glassfish.api.deployment.archive.ReadableArchive;
 import org.jvnet.hk2.annotations.Service;
+import com.sun.enterprise.deployment.archivist.ExtensionsArchivist;
+import com.sun.enterprise.deployment.archivist.Archivist;
 
+
 import java.io.IOException;
 import org.xml.sax.SAXParseException;
 
Index: appserver/webservices/connector/pom.xml
===================================================================
--- appserver/webservices/connector/pom.xml (revision 48590)
+++ appserver/webservices/connector/pom.xml (working copy)
@@ -70,5 +70,11 @@
             <artifactId>internal-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.deployment</groupId>
+            <artifactId>dol</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
     </dependencies>
 </project>
Loading...