1.1 --- a/j2ee.blueprints/docs/todo.txt	Fri Jan 07 17:37:01 2005 +0000
     1.2 +++ b/j2ee.blueprints/docs/todo.txt	Fri Jan 07 17:59:58 2005 +0000
     1.3 @@ -4,29 +4,31 @@
     1.4  another feature freeze for 4.1 in 3rd week of jan
     1.5  branch for ea 2 won't be done before jan 5
     1.6  
     1.7 +[ ] About / Info tab that shows usingTxt and usingTxt1 from bundle.properties
     1.8 +    Also points to web site, etc.
     1.9  [ ] deploy and test all included apps on 4.1
    1.10 -    [ ] clientside-state is not picking up base64.lib even if I move 
    1.11 -        it to WEB-INF/lib
    1.12 +    [.] clientside-state is not picking up base64.lib even if I move 
    1.13 +        it to WEB-INF/lib 
    1.14 +        (disabled this example for now)
    1.15      [ ] non-web apps
    1.16 -[ ] Fix Lukas' bug list
    1.17 -    [ ] /docoriented
    1.18 +[.] Fix Lukas' bug list
    1.19 +    [.] /docoriented
    1.20          - i can't run this example due to errors when opening project:
    1.21            - cannot find Web Pages folder "<some_path>". Set "web.docbase.dir" property in project.properties file to point to correct folder.
    1.22            - description of next exception is really interesting: "A java.lang.NullPointerException exception has occurred. However, the system should continue working without further problems. Click Details for the stack trace."
    1.23 -    [ ] /clientside-state
    1.24 +        (disabled for now)
    1.25 +    [.] /clientside-state
    1.26          - additional library (base64) is not automatically on the classpath
    1.27          - the rest of this app is OK.
    1.28          Greg stated that app bundles base64 jars into the Web-INF/lib of that war file, which is portable solution and should be supported by NB, so no changes needed to application example code.
    1.29          STATUS: seems like an NB problem or integration problem? 
    1.30 +        (disabled for now)
    1.31  [ ] Script for our workspace
    1.32      [ ] Cases where WAR name does not equal directory name, like 
    1.33          clientside-validators
    1.34      [ ] Check that it works with non-webapps
    1.35          [ ] add code for JMS resource, EJB resource, etc.
    1.36      [ ] Handle solutions that contain no examples, e.g. standalone-client
    1.37 -    [ ] Shorter names in "New Project" dialog
    1.38 -    [ ] Script to check that there's src/java and give a warning if there isn't.
    1.39 -        [ ] File bug on NetBeans that src/java must exist.
    1.40      [ ] ws-context directory
    1.41  [ ] want at least one example with an EJB
    1.42  [ ] Printable page - Use print cookie that enables print action in NBs? This 
    1.43 @@ -34,7 +36,6 @@
    1.44  [ ] Sort articles alphabetically
    1.45  [ ] Install Example button is a bit misleading.  Rename to something like
    1.46      "New Project From This Template".
    1.47 -[ ] About box that shows usingTxt and usingTxt1 from bundle.properties
    1.48  
    1.49  Later:
    1.50  [ ] Bookmarks

     2.1 --- a/j2ee.blueprints/src/org/netbeans/modules/j2ee/blueprints/ui/BluePrintsPanel.form	Fri Jan 07 17:37:01 2005 +0000
     2.2 +++ b/j2ee.blueprints/src/org/netbeans/modules/j2ee/blueprints/ui/BluePrintsPanel.form	Fri Jan 07 17:59:58 2005 +0000
     2.3 @@ -11,6 +11,10 @@
     2.4      </Property>
     2.5    </Properties>
     2.6    <AuxValues>
     2.7 +    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
     2.8 +    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     2.9 +    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
    2.10 +    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
    2.11      <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,-59,0,0,3,-52"/>
    2.12    </AuxValues>
    2.13  

     3.1 --- a/j2ee.blueprints/src/org/netbeans/modules/j2ee/blueprints/ui/BluePrintsPanel.java	Fri Jan 07 17:37:01 2005 +0000
     3.2 +++ b/j2ee.blueprints/src/org/netbeans/modules/j2ee/blueprints/ui/BluePrintsPanel.java	Fri Jan 07 17:59:58 2005 +0000
     3.3 @@ -50,6 +50,7 @@
     3.4  import org.netbeans.modules.j2ee.blueprints.catalog.demoxmlparser.Category;
     3.5  import org.netbeans.modules.j2ee.blueprints.catalog.demoxmlparser.Demo;
     3.6  import org.netbeans.modules.j2ee.blueprints.catalog.demoxmlparser.Example;
     3.7 +import org.netbeans.modules.j2ee.blueprints.catalog.demoxmlparser.Netbeans;
     3.8  import org.openide.ErrorManager;
     3.9  import org.openide.filesystems.FileUtil;
    3.10  import org.openide.util.NbBundle;
    3.11 @@ -314,19 +315,10 @@
    3.12          String result = null;
    3.13          Example example = getSelectedArticle();
    3.14          if(example != null) {
    3.15 -            // Guess the name of the zip from the <path> element
    3.16 -            // (not always accurate, but this is the best we can do)
    3.17 -            String[] paths = example.getPath();
    3.18 -            if(paths.length > 0) {
    3.19 -                result = paths[0];
    3.20 -                if(result.indexOf('.') != -1) {
    3.21 -                    // there's a filename in the path. Strip it.
    3.22 -                    result = result.substring(0, result.lastIndexOf('/'));
    3.23 -                }
    3.24 -                if(result.indexOf('/') != -1) {
    3.25 -                    // Strip all slashes before the example path
    3.26 -                    result = result.substring(result.lastIndexOf('/') + 1);
    3.27 -                }
    3.28 +            // Get the name of the zip from the <project-name> element
    3.29 +            Netbeans[] netbeans = example.getNetbeans();
    3.30 +            if(netbeans.length > 0) {
    3.31 +                result = netbeans[0].getProjectPath();
    3.32              }
    3.33          }
    3.34          return result;