Changeset 6102 for trunk

Show
Ignore:
Timestamp:
01/05/12 09:00:25 (5 months ago)
Author:
dedreiix
Message:

fixed some errors of the tutorial code

Location:
trunk/pustefix-tutorial
Files:
9 modified

Legend:

Unmodified
Added
Removed

  • trunk/pustefix-tutorial/ajax-calculator/src/main/webapp/WEB-INF/project.xml

    r5631 r6102  
    3232 
    3333    <docroot-path>docroot:/htdocs</docroot-path> 
    34     <default-path>/xml/calc</default-path> 
    3534 
    3635    <context-xml-service> 
    37       <path>/xml/calc</path> 
    3836      <config-file>docroot:/WEB-INF/calc.conf.xml</config-file> 
    3937      <choose> 
    … …  
    4846 
    4947    <webservice-service> 
    50       <path>/xml/webservice</path> 
     48      <path>/webservice</path> 
    5149      <config-file>docroot:/WEB-INF/webservice.conf.xml</config-file> 
    5250    </webservice-service> 

  • trunk/pustefix-tutorial/ajax-calculator/src/main/webapp/WEB-INF/web.xml

    r5081 r6102  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:jee="http://java.sun.com/xml/ns/javaee"> 
     3   <context-param> 
     4     <param-name>mode</param-name> 
     5     <param-value>test</param-value> 
     6   </context-param> 
    37   <servlet> 
    48      <servlet-name>dispatcher</servlet-name> 

  • trunk/pustefix-tutorial/ajax-calculator/src/main/webapp/WEB-INF/webservice.conf.xml

    r5081 r6102  
    55   
    66  <webservice-global> 
    7     <requestpath>/xml/webservice</requestpath> 
     7    <requestpath>/webservice</requestpath> 
    88    <wsdlsupport enabled="false"/> 
    99    <stubgeneration enabled="false"/> 

  • trunk/pustefix-tutorial/ajax-calculator/src/main/webapp/txt/pages/main_Calculator.xml

    r5081 r6102  
    2121  <part name="javascript-includes"> 
    2222    <theme name="default"> 
    23       <script type="text/javascript" src="{$__contextpath}/core/script/httpRequest.js"></script> 
    24       <script type="text/javascript" src="{$__contextpath}/core/script/webservice_json.js"></script> 
     23      <script type="text/javascript" src="{$__contextpath}/modules/pustefix-core/script/httpRequest.js"></script> 
     24      <script type="text/javascript" src="{$__contextpath}/modules/pustefix-webservices-jsonws/script/webservice_json.js"></script> 
    2525      <pfx:wsscript name="Calculator"/> 
    2626    </theme> 

  • trunk/pustefix-tutorial/first-app/src/main/webapp/WEB-INF/project.xml

    r5631 r6102  
    3232 
    3333    <docroot-path>docroot:/htdocs</docroot-path> 
    34     <default-path>/xml/app</default-path> 
    3534 
    3635    <context-xml-service> 
    37       <path>/xml/app</path> 
    3836      <config-file>docroot:/WEB-INF/app.conf.xml</config-file> 
    3937      <choose> 

  • trunk/pustefix-tutorial/first-app/src/main/webapp/WEB-INF/web.xml

    r5081 r6102  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:jee="http://java.sun.com/xml/ns/javaee"> 
    3    <servlet> 
     3   <context-param> 
     4     <param-name>mode</param-name> 
     5     <param-value>test</param-value> 
     6   </context-param> 
     7      <servlet> 
    48      <servlet-name>dispatcher</servlet-name> 
    59      <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> 

  • trunk/pustefix-tutorial/usermanagement/src/main/webapp/WEB-INF/project.xml

    r5631 r6102  
    3232 
    3333    <docroot-path>docroot:/htdocs</docroot-path> 
    34     <default-path>/xml/user</default-path> 
    3534 
    3635    <context-xml-service> 
    37       <path>/xml/user</path> 
    3836      <config-file>docroot:/WEB-INF/user.conf.xml</config-file> 
    3937      <choose> 

  • trunk/pustefix-tutorial/usermanagement/src/main/webapp/WEB-INF/web.xml

    r5081 r6102  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:jee="http://java.sun.com/xml/ns/javaee"> 
     3   <context-param> 
     4     <param-name>mode</param-name> 
     5     <param-value>test</param-value> 
     6   </context-param> 
    37   <servlet> 
    48      <servlet-name>dispatcher</servlet-name> 

  • trunk/pustefix-tutorial/usermanagement/src/main/webapp/txt/pages/main_overview.xml

    r3685 r6102  
    1414        <br/>         
    1515        <pfx:button jumptopage="userform">edit 
    16           <pfx:command name="SELWRP">edit</pfx:command> 
     16          <pfx:command name="SUBWRP">edit</pfx:command> 
    1717          <pfx:argument name="edit.id"><ixsl:value-of select="./@id"/></pfx:argument> 
    1818        </pfx:button> 
    1919        <pfx:button>delete 
    20           <pfx:command name="SELWRP">delete</pfx:command> 
     20          <pfx:command name="SUBWRP">delete</pfx:command> 
    2121          <pfx:argument name="delete.id"><ixsl:value-of select="./@id"/></pfx:argument> 
    2222        </pfx:button>