1.1 --- a/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/deploy/WLIncrementalDeployment.java Wed Aug 25 17:55:36 2010 +0200
1.2 +++ b/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/deploy/WLIncrementalDeployment.java Wed Aug 25 22:59:11 2010 +0200
1.3 @@ -111,12 +111,14 @@
1.4
1.5 @Override
1.6 public ProgressObject incrementalDeploy(TargetModuleID module, AppChangeDescriptor changes) {
1.7 - boolean redeploy = changes.classesChanged() || changes.descriptorChanged()
1.8 + // HOTFIX 189774 - TODO need to go back to this and fix properly
1.9 + boolean redeploy = true;
1.10 + /*changes.classesChanged() || changes.descriptorChanged()
1.11 || changes.ejbsChanged() || changes.manifestChanged() || changes.serverDescriptorChanged();
1.12 if (changes instanceof DeploymentChangeDescriptor) {
1.13 DeploymentChangeDescriptor deploymentChanges = (DeploymentChangeDescriptor) changes;
1.14 redeploy = redeploy || deploymentChanges.serverResourcesChanged();
1.15 - }
1.16 + }*/
1.17
1.18 if (!redeploy) {
1.19 WLProgressObject progress = new WLProgressObject(module);
2.1 --- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ProgressObjectUtil.java Wed Aug 25 17:55:36 2010 +0200
2.2 +++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ProgressObjectUtil.java Wed Aug 25 22:59:11 2010 +0200
2.3 @@ -49,6 +49,7 @@
2.4 import java.util.concurrent.atomic.AtomicBoolean;
2.5 import java.util.logging.Level;
2.6 import java.util.logging.Logger;
2.7 +import javax.enterprise.deploy.shared.StateType;
2.8 import javax.enterprise.deploy.spi.status.DeploymentStatus;
2.9 import javax.enterprise.deploy.spi.status.ProgressEvent;
2.10 import javax.enterprise.deploy.spi.status.ProgressListener;
2.11 @@ -89,10 +90,10 @@
2.12 ProgressListener listener = new ProgressListener() {
2.13 public void handleProgressEvent(ProgressEvent progressEvent) {
2.14 DeploymentStatus status = progressEvent.getDeploymentStatus();
2.15 - if (status.isCompleted()) {
2.16 + if (status.isCompleted() || status.getState() == StateType.RELEASED) {
2.17 completed.set(true);
2.18 }
2.19 - if (status.isCompleted() || status.isFailed()) {
2.20 + if (status.isCompleted() || status.isFailed() || status.getState() == StateType.RELEASED) {
2.21 progressFinished.countDown();
2.22 }
2.23 }
2.24 @@ -102,7 +103,7 @@
2.25 // the completion event might have arrived before the progress listener
2.26 // was registered, wait only if not yet finished
2.27 DeploymentStatus status = po.getDeploymentStatus();
2.28 - if (!status.isCompleted() && !status.isFailed()) {
2.29 + if (!status.isCompleted() && !status.isFailed() && status.getState() != StateType.RELEASED) {
2.30 try {
2.31 if (timeout == 0) {
2.32 progressFinished.await();
3.1 --- a/maven.jaxws/src/org/netbeans/modules/maven/jaxws/wizards/JaxWsServiceCreator.java Wed Aug 25 17:55:36 2010 +0200
3.2 +++ b/maven.jaxws/src/org/netbeans/modules/maven/jaxws/wizards/JaxWsServiceCreator.java Wed Aug 25 22:59:11 2010 +0200
3.3 @@ -542,9 +542,11 @@
3.4
3.5 DataFolder df = DataFolder.findFolder(pkg);
3.6 FileObject template = Templates.getTemplate(wiz);
3.7 + FileObject templateParent = template.getParent();
3.8 if ((Boolean)wiz.getProperty(WizardProperties.IS_STATELESS_BEAN)) {
3.9 - FileObject templateParent = template.getParent();
3.10 - template = templateParent.getFileObject("EjbWebService", "java"); //NOI18N
3.11 + template = templateParent.getFileObject("EjbWebServiceNoOp", "java"); //NOI18N
3.12 + } else {
3.13 + template = templateParent.getFileObject("WebServiceNoOp", "java"); //NOI18N
3.14 }
3.15 DataObject dTemplate = DataObject.find(template);
3.16 DataObject dobj = dTemplate.createFromTemplate(df, wsName);
4.1 --- a/websvc.core/src/org/netbeans/modules/websvc/core/dev/resources/EjbWebService.template Wed Aug 25 17:55:36 2010 +0200
4.2 +++ b/websvc.core/src/org/netbeans/modules/websvc/core/dev/resources/EjbWebService.template Wed Aug 25 22:59:11 2010 +0200
4.3 @@ -8,6 +8,8 @@
4.4
4.5 </#if>
4.6 import javax.jws.WebService;
4.7 +import javax.jws.WebMethod;
4.8 +import javax.jws.WebParam;
4.9 import javax.ejb.Stateless;
4.10
4.11 /**
4.12 @@ -18,4 +20,9 @@
4.13 @Stateless()
4.14 public class ${name} {
4.15
4.16 + /** This is a sample web service operation */
4.17 + @WebMethod(operationName="hello")
4.18 + public String hello(@WebParam(name="name") String txt) {
4.19 + return "Hello "+txt+" !";
4.20 + }
4.21 }
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/websvc.core/src/org/netbeans/modules/websvc/core/dev/resources/EjbWebServiceNoOp.template Wed Aug 25 22:59:11 2010 +0200
5.3 @@ -0,0 +1,21 @@
5.4 +<#assign licenseFirst = "/*">
5.5 +<#assign licensePrefix = " * ">
5.6 +<#assign licenseLast = " */">
5.7 +<#include "../Licenses/license-${project.license}.txt">
5.8 +
5.9 +<#if package?? && package != "">
5.10 +package ${package};
5.11 +
5.12 +</#if>
5.13 +import javax.jws.WebService;
5.14 +import javax.ejb.Stateless;
5.15 +
5.16 +/**
5.17 + *
5.18 + * @author ${user}
5.19 + */
5.20 +@WebService(serviceName="${name}")
5.21 +@Stateless()
5.22 +public class ${name} {
5.23 +
5.24 +}
6.1 --- a/websvc.core/src/org/netbeans/modules/websvc/core/dev/resources/WebService.template Wed Aug 25 17:55:36 2010 +0200
6.2 +++ b/websvc.core/src/org/netbeans/modules/websvc/core/dev/resources/WebService.template Wed Aug 25 22:59:11 2010 +0200
6.3 @@ -8,6 +8,8 @@
6.4
6.5 </#if>
6.6 import javax.jws.WebService;
6.7 +import javax.jws.WebMethod;
6.8 +import javax.jws.WebParam;
6.9
6.10 /**
6.11 *
6.12 @@ -16,4 +18,9 @@
6.13 @WebService(serviceName="${name}")
6.14 public class ${name} {
6.15
6.16 + /** This is a sample web service operation */
6.17 + @WebMethod(operationName="hello")
6.18 + public String hello(@WebParam(name="name") String txt) {
6.19 + return "Hello "+txt+" !";
6.20 + }
6.21 }
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/websvc.core/src/org/netbeans/modules/websvc/core/dev/resources/WebServiceNoOp.template Wed Aug 25 22:59:11 2010 +0200
7.3 @@ -0,0 +1,19 @@
7.4 +<#assign licenseFirst = "/*">
7.5 +<#assign licensePrefix = " * ">
7.6 +<#assign licenseLast = " */">
7.7 +<#include "../Licenses/license-${project.license}.txt">
7.8 +
7.9 +<#if package?? && package != "">
7.10 +package ${package};
7.11 +
7.12 +</#if>
7.13 +import javax.jws.WebService;
7.14 +
7.15 +/**
7.16 + *
7.17 + * @author ${user}
7.18 + */
7.19 +@WebService(serviceName="${name}")
7.20 +public class ${name} {
7.21 +
7.22 +}
8.1 --- a/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreator.java Wed Aug 25 17:55:36 2010 +0200
8.2 +++ b/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/JaxWsServiceCreator.java Wed Aug 25 22:59:11 2010 +0200
8.3 @@ -417,10 +417,11 @@
8.4
8.5 DataFolder df = DataFolder.findFolder(pkg);
8.6 FileObject template = Templates.getTemplate(wiz);
8.7 -
8.8 + FileObject templateParent = template.getParent();
8.9 if ((Boolean)wiz.getProperty(WizardProperties.IS_STATELESS_BEAN)) { //EJB Web Service
8.10 - FileObject templateParent = template.getParent();
8.11 - template = templateParent.getFileObject("EjbWebService", "java"); //NOI18N
8.12 + template = templateParent.getFileObject("EjbWebServiceNoOp", "java"); //NOI18N
8.13 + } else {
8.14 + template = templateParent.getFileObject("WebServiceNoOp", "java"); //NOI18N
8.15 }
8.16 DataObject dTemplate = DataObject.find(template);
8.17 DataObject dobj = dTemplate.createFromTemplate(df, wsName);
9.1 --- a/websvc.core/src/org/netbeans/modules/websvc/core/resources/mf-layer.xml Wed Aug 25 17:55:36 2010 +0200
9.2 +++ b/websvc.core/src/org/netbeans/modules/websvc/core/resources/mf-layer.xml Wed Aug 25 22:59:11 2010 +0200
9.3 @@ -75,6 +75,14 @@
9.4 <attr name="javax.script.ScriptEngine" stringvalue="freemarker"/>
9.5 <attr name="position" intvalue="0"/>
9.6 </file>
9.7 + <file name="WebServiceNoOp.java" url="nbres:/org/netbeans/modules/websvc/core/dev/resources/WebServiceNoOp.template">
9.8 + <attr name="javax.script.ScriptEngine" stringvalue="freemarker"/>
9.9 + <attr name="position" intvalue="1"/>
9.10 + </file>
9.11 + <file name="EjbWebServiceNoOp.java" url="nbres:/org/netbeans/modules/websvc/core/dev/resources/EjbWebServiceNoOp.template">
9.12 + <attr name="javax.script.ScriptEngine" stringvalue="freemarker"/>
9.13 + <attr name="position" intvalue="2"/>
9.14 + </file>
9.15 <file name="WebServiceFromWSDL.java" url="nbres:/org/netbeans/modules/websvc/core/dev/resources/WebServiceFromWSDL.template">
9.16 <attr name="template" boolvalue="true"/>
9.17 <attr name="position" intvalue="200"/>