diff -r fd8e9c5f6020 j2eeserver/apichanges.xml
--- a/j2eeserver/apichanges.xml	Fri Aug 09 15:05:35 2013 +0200
+++ b/j2eeserver/apichanges.xml	Fri Aug 09 16:58:19 2013 +0200
@@ -116,7 +116,25 @@
     <!-- ACTUAL CHANGES BEGIN HERE: -->
 
     <changes>
-    
+
+        <change id="beforeDeploymentHook">
+    	    <api name="devmodules"/>
+            <summary>
+                Provide a way to execute custom code just before actual deployment.
+            </summary>
+            <version major="1" minor="102"/>
+            <date day="16" month="8" year="2013"/>
+            <author login="phejl"/>
+            <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
+            <description>
+               <p>
+                   Additional Callable parameter allows execution of custom
+                   custom code just before the actual deployment.
+               </p>
+            </description>
+            <class package="org.netbeans.modules.j2ee.deployment.devmodules.api" name="Deployment"/>
+            <issue number="234194"/>
+       </change>
         <!-- not used for 7.3
         <change id="deployOnSaveListeners">
     	    <api name="devmodules"/>
diff -r fd8e9c5f6020 j2eeserver/nbproject/project.properties
--- a/j2eeserver/nbproject/project.properties	Fri Aug 09 15:05:35 2013 +0200
+++ b/j2eeserver/nbproject/project.properties	Fri Aug 09 16:58:19 2013 +0200
@@ -42,7 +42,7 @@
 
 is.autoload=true
 javac.source=1.6
-spec.version.base=1.101.0
+spec.version.base=1.102.0
 
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
diff -r fd8e9c5f6020 j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java
--- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java	Fri Aug 09 15:05:35 2013 +0200
+++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java	Fri Aug 09 16:58:19 2013 +0200
@@ -50,7 +50,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.Callable;
 import java.util.logging.Level;
+import org.netbeans.api.annotations.common.CheckForNull;
+import org.netbeans.api.annotations.common.NullAllowed;
 import org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance.Descriptor;
 import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener;
 import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
@@ -99,7 +102,7 @@
     private Deployment () {
     }
     
-    /*Deploys a web J2EE module to server.
+    /** Deploys a web J2EE module to server.
      * @param clientModuleUrl URL of module within a J2EE Application that 
      * should be used as a client (can be null for standalone modules)
      * <div class="nonnormative">
@@ -152,8 +155,29 @@
     public void resumeDeployOnSave(J2eeModuleProvider jmp) {
         DeployOnSaveManager.getDefault().resumeListening(jmp);
     }    
-    
-    public String deploy (J2eeModuleProvider jmp, Mode mode, String clientModuleUrl, String clientUrlPart, boolean forceRedeploy, Logger logger) throws DeploymentException {
+
+    public String deploy(J2eeModuleProvider jmp, Mode mode, String clientModuleUrl, String clientUrlPart,
+            boolean forceRedeploy, Logger logger) throws DeploymentException {
+        return deploy(jmp, mode, clientModuleUrl, clientUrlPart, forceRedeploy, logger, null);
+    }
+
+    /**
+     * Deploys the module represented by the module provider.
+     *
+     * @param jmp the representation of module to deploy
+     * @param mode the mode we are going to use for the server
+     * @param clientModuleUrl
+     * @param clientUrlPart
+     * @param forceRedeploy whether to use the force to redeploy
+     * @param logger logger where to log progress messages
+     * @param beforeDeploy the hook to be executed just before the actual module deploy
+     * @return the result url where the module is available
+     * @throws org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment.DeploymentException if the deployment fails
+     * @since 1.102
+     */
+    @CheckForNull
+    public String deploy(J2eeModuleProvider jmp, Mode mode, String clientModuleUrl, String clientUrlPart,
+            boolean forceRedeploy, Logger logger, @NullAllowed Callable<Void> beforeDeploy) throws DeploymentException {
         
         DeploymentTarget deploymentTarget = new DeploymentTarget(jmp, clientModuleUrl);
         TargetModule[] modules = null;
@@ -194,6 +218,10 @@
             DeploymentHelper.deployDatasources(jmp);
             DeploymentHelper.deployMessageDestinations(jmp);
 
+            if (beforeDeploy != null) {
+                beforeDeploy.call();
+            }
+
             modules = targetserver.deploy(progress, forceRedeploy);
             // inform the plugin about the deploy action, even if there was
             // really nothing needed to be deployed
@@ -244,9 +272,7 @@
             LOGGER.log(Level.INFO, null, ex);
             throw new DeploymentException(msg, ex);
         } finally {
-            if (progress != null) {
-                progress.finish();
-            }
+            progress.finish();
         }
     }
 
diff -r fd8e9c5f6020 maven.j2ee/nbproject/project.xml
--- a/maven.j2ee/nbproject/project.xml	Fri Aug 09 15:05:35 2013 +0200
+++ b/maven.j2ee/nbproject/project.xml	Fri Aug 09 16:58:19 2013 +0200
@@ -185,7 +185,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>4</release-version>
-                        <specification-version>1.59</specification-version>
+                        <specification-version>1.102</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r fd8e9c5f6020 maven.j2ee/src/org/netbeans/modules/maven/j2ee/ExecutionChecker.java
--- a/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ExecutionChecker.java	Fri Aug 09 15:05:35 2013 +0200
+++ b/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ExecutionChecker.java	Fri Aug 09 16:58:19 2013 +0200
@@ -44,6 +44,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.util.concurrent.Callable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.maven.model.Build;
@@ -123,7 +124,7 @@
     }
 
     private void performDeploy(
-            ExecutionContext res,
+            final ExecutionContext res,
             boolean debugmode,
             boolean profilemode,
             String clientModuleUri,
@@ -134,7 +135,7 @@
         FileUtil.refreshFor(FileUtil.toFile(project.getProjectDirectory()));
         OutputWriter err = res.getInputOutput().getErr();
         OutputWriter out = res.getInputOutput().getOut();
-        J2eeModuleProvider jmp = project.getLookup().lookup(J2eeModuleProvider.class);
+        final J2eeModuleProvider jmp = project.getLookup().lookup(J2eeModuleProvider.class);
         if (jmp == null) {
             err.println();
             err.println();
@@ -167,7 +168,35 @@
                 mode = Deployment.Mode.PROFILE;
             }
 
-            String clientUrl = Deployment.getDefault().deploy(jmp, mode, clientModuleUri, clientUrlPart, forceRedeploy, new DLogger(out));
+            Callable<Void> debuggerHook = null;
+            if (debugmode) {
+                debuggerHook = new Callable<Void>() {
+
+                    @Override
+                    public Void call() throws Exception {
+                        ServerDebugInfo sdi = jmp.getServerDebugInfo();
+
+                        if (sdi != null) { //fix for bug 57854, this can be null
+                            String h = sdi.getHost();
+                            String transport = sdi.getTransport();
+                            String address;
+
+                            if (transport.equals(ServerDebugInfo.TRANSPORT_SHMEM)) {
+                                address = sdi.getShmemName();
+                            } else {
+                                address = Integer.toString(sdi.getPort());
+                            }
+                            MavenDebugger deb = project.getLookup().lookup(MavenDebugger.class);
+                            deb.attachDebugger(res.getInputOutput(), "Debug Deployed app", transport, h, address); // NOI18N
+                        }
+                        return null;
+                    }
+                };
+
+            }
+
+            String clientUrl = Deployment.getDefault().deploy(jmp, mode, clientModuleUri,
+                    clientUrlPart, forceRedeploy, new DLogger(out), debuggerHook);
             if (clientUrl != null) {
                 FileObject fo = project.getProjectDirectory();
                 boolean show = showInBrowser;
@@ -191,23 +220,6 @@
                     }
                 }
             }
-            if (debugmode) {
-                ServerDebugInfo sdi = jmp.getServerDebugInfo();
-
-                if (sdi != null) { //fix for bug 57854, this can be null
-                    String h = sdi.getHost();
-                    String transport = sdi.getTransport();
-                    String address;
-
-                    if (transport.equals(ServerDebugInfo.TRANSPORT_SHMEM)) {
-                        address = sdi.getShmemName();
-                    } else {
-                        address = Integer.toString(sdi.getPort());
-                    }
-                    MavenDebugger deb = project.getLookup().lookup(MavenDebugger.class);
-                    deb.attachDebugger(res.getInputOutput(), "Debug Deployed app", transport, h, address); // NOI18N
-                }
-            }
         } catch (Deployment.DeploymentException ex) {
             ex.printStackTrace(err);
             Logger.getLogger(ExecutionChecker.class.getName()).log(Level.FINE, "Exception occured wile deploying to Application Server.", ex); //NOI18N