Add portlet 2.0 library to maven web project
authorsatyaranjan@netbeans.org
Sat, 09 Jul 2011 22:13:28 +0800
changeset 1751583d13f873ba5
parent 17514 19e2cf7e8a22
child 17517 ac9c634ac976
Add portlet 2.0 library to maven web project
portalpack.portlets.genericportlets/src/org/netbeans/modules/portalpack/portlets/genericportlets/core/actions/util/PortletProjectUtils.java
portalpack.portlets.genericportlets/src/org/netbeans/modules/portalpack/portlets/genericportlets/frameworks/jsr168/JSR168WebFrameworkProvider.java
portalpack.portlets.genericportlets/src/org/netbeans/modules/portalpack/portlets/genericportlets/portlet20lib.xml
     1.1 --- a/portalpack.portlets.genericportlets/src/org/netbeans/modules/portalpack/portlets/genericportlets/core/actions/util/PortletProjectUtils.java	Sat Jul 09 18:41:11 2011 +0800
     1.2 +++ b/portalpack.portlets.genericportlets/src/org/netbeans/modules/portalpack/portlets/genericportlets/core/actions/util/PortletProjectUtils.java	Sat Jul 09 22:13:28 2011 +0800
     1.3 @@ -646,7 +646,14 @@
     1.4                      
     1.5                   method.invoke(modifierObj, new Object[]{libs});
     1.6               } else {
     1.7 -                 ProjectClassPathModifier.addLibraries(new Library[]{bpLibrary}, getSourceRoot(project), ClassPath.COMPILE);
     1.8 +                 String classpathType = ClassPath.COMPILE;
     1.9 +                 //check if maven project
    1.10 +                 FileObject pom = project.getProjectDirectory().getFileObject("pom.xml");//NOI18N
    1.11 +                 if(pom != null) {
    1.12 +                     classpathType = "classpath/compile_only";
    1.13 +                 }
    1.14 +                 
    1.15 +                 ProjectClassPathModifier.addLibraries(new Library[]{bpLibrary}, getSourceRoot(project), classpathType);
    1.16               }
    1.17  
    1.18           }catch(Exception e){
     2.1 --- a/portalpack.portlets.genericportlets/src/org/netbeans/modules/portalpack/portlets/genericportlets/frameworks/jsr168/JSR168WebFrameworkProvider.java	Sat Jul 09 18:41:11 2011 +0800
     2.2 +++ b/portalpack.portlets.genericportlets/src/org/netbeans/modules/portalpack/portlets/genericportlets/frameworks/jsr168/JSR168WebFrameworkProvider.java	Sat Jul 09 22:13:28 2011 +0800
     2.3 @@ -99,7 +99,16 @@
     2.4                      
     2.5                      method.invoke(modifierObj, new Object[]{libs});
     2.6                  }else {
     2.7 -                    ProjectClassPathModifier.addLibraries(new Library[]{bpLibrary}, getSourceRoot(project), ClassPath.COMPILE);
     2.8 +                    
     2.9 +                    String classpathType = ClassPath.COMPILE;
    2.10 +                    //check if maven project
    2.11 +                    FileObject pom = project.getProjectDirectory().getFileObject("pom.xml");//NOI18N
    2.12 +                    if(pom != null) {
    2.13 +                        classpathType = "classpath/compile_only";
    2.14 +                    } 
    2.15 +
    2.16 +                    ProjectClassPathModifier.addLibraries(new Library[]{bpLibrary}, 
    2.17 +                            getSourceRoot(project), classpathType);
    2.18                  }
    2.19                  
    2.20                
     3.1 --- a/portalpack.portlets.genericportlets/src/org/netbeans/modules/portalpack/portlets/genericportlets/portlet20lib.xml	Sat Jul 09 18:41:11 2011 +0800
     3.2 +++ b/portalpack.portlets.genericportlets/src/org/netbeans/modules/portalpack/portlets/genericportlets/portlet20lib.xml	Sat Jul 09 22:13:28 2011 +0800
     3.3 @@ -34,6 +34,6 @@
     3.4      
     3.5      <volume>
     3.6          <type>maven-pom</type>
     3.7 -        <resource>http://download.java.net/maven/2/javax/portlet/portlet-api/2.0/portlet-api-2.0.pom</resource>
     3.8 +        <resource>http://repo1.maven.org/maven2/javax/portlet/portlet-api/2.0/portlet-api-2.0.pom</resource>
     3.9      </volume>
    3.10  </library>
    3.11 \ No newline at end of file