1.1 --- a/portalpack.servers.websynergy/src/org/netbeans/modules/portalpack/servers/websynergy/common/LiferayConstants.java	Fri Jul 08 10:53:41 2011 +0200
     1.2 +++ b/portalpack.servers.websynergy/src/org/netbeans/modules/portalpack/servers/websynergy/common/LiferayConstants.java	Sat Jul 09 18:41:11 2011 +0800
     1.3 @@ -45,5 +45,7 @@
     1.4      //Liferay Version
     1.5      public static final int LR_5_1_0 = 5100;
     1.6      public static final int LR_5_2_0 = 5200;
     1.7 -	public static final int LR_5_2_3 = 5230;
     1.8 +    public static final int LR_5_2_3 = 5230;
     1.9 +    public static final int LR_6_0_0 = 6000;
    1.10 +    public static final int LR_6_0_6 = 6006;
    1.11  }

     2.1 --- a/portalpack.servers.websynergy/src/org/netbeans/modules/portalpack/servers/websynergy/common/WebSpacePropertiesUtil.java	Fri Jul 08 10:53:41 2011 +0200
     2.2 +++ b/portalpack.servers.websynergy/src/org/netbeans/modules/portalpack/servers/websynergy/common/WebSpacePropertiesUtil.java	Sat Jul 09 18:41:11 2011 +0800
     2.3 @@ -98,4 +98,17 @@
     2.4              return 1;
     2.5          }
     2.6      }
     2.7 +    
     2.8 +    public static int getLiferayVersion(Project prj) {
     2.9 +        
    2.10 +        if(prj == null)
    2.11 +            return -1;
    2.12 +        
    2.13 +        PSConfigObject psConfig = getSelectedServerProperties(prj);
    2.14 +        
    2.15 +        if(psConfig == null)
    2.16 +            return -1;
    2.17 +        
    2.18 +        return getLiferayVersion(psConfig);
    2.19 +    }
    2.20  }

     3.1 --- a/portalpack.websynergy.portlets/src/org/netbeans/modules/portalpack/websynergy/portlets/hook/ui/HookDetailsPanel.java	Fri Jul 08 10:53:41 2011 +0200
     3.2 +++ b/portalpack.websynergy.portlets/src/org/netbeans/modules/portalpack/websynergy/portlets/hook/ui/HookDetailsPanel.java	Sat Jul 09 18:41:11 2011 +0800
     3.3 @@ -46,6 +46,8 @@
     3.4  import javax.swing.event.ChangeListener;
     3.5  import org.netbeans.api.project.Project;
     3.6  import org.netbeans.api.project.ProjectUtils;
     3.7 +import org.netbeans.modules.portalpack.servers.core.util.PSConfigObject;
     3.8 +import org.netbeans.modules.portalpack.servers.websynergy.common.LiferayConstants;
     3.9  import org.netbeans.modules.portalpack.servers.websynergy.common.WebSpacePropertiesUtil;
    3.10  import org.netbeans.modules.portalpack.websynergy.portlets.hook.api.HookType;
    3.11  import org.netbeans.modules.portalpack.websynergy.portlets.hook.api.HookTypeFactory;
    3.12 @@ -131,13 +133,19 @@
    3.13              }
    3.14          } else {
    3.15              String prjName = ProjectUtils.getInformation(project).getName();
    3.16 -            if(prjName != null && !prjName.endsWith("-hook")) {
    3.17 -                   if(wizard != null) {
    3.18 -                        wizard.putProperty("WizardPanel_errorMessage",
    3.19 -                                NbBundle.getMessage(
    3.20 -                                HookDetailsPanel.class, "HOOK_NOT_ALLOWED_WHEN_APP_NAME_NOT_ENDS_WITH_HOOK")); // NOI18N
    3.21 -                        return false;
    3.22 -                   }
    3.23 +            
    3.24 +            int lrVersion = WebSpacePropertiesUtil.getLiferayVersion(project);
    3.25 +                
    3.26 +            if(lrVersion < LiferayConstants.LR_6_0_0) {
    3.27 +            
    3.28 +                if(prjName != null && !prjName.endsWith("-hook")) {
    3.29 +                       if(wizard != null) {
    3.30 +                            wizard.putProperty("WizardPanel_errorMessage",
    3.31 +                                    NbBundle.getMessage(
    3.32 +                                    HookDetailsPanel.class, "HOOK_NOT_ALLOWED_WHEN_APP_NAME_NOT_ENDS_WITH_HOOK")); // NOI18N
    3.33 +                            return false;
    3.34 +                       }
    3.35 +                }
    3.36              }
    3.37              
    3.38          }