Changeset 25130

Show
Ignore:
Timestamp:
22.02.2012 15:14:03 (8 years ago)
Author:
sjm84
Message:

First round of commits to upgrade from tomcat 6 to tomcat 7

Location:
main/trunk/greenstone3/resources
Files:
2 modified
1 moved

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/resources/tomcat/greenstone3.xml

    r22320 r25130  
    22<!-- set reloadable to false for a production version. if true, automatically reloads the webapp if it detects changes in classes or lib directories --> 
    33<!-- see http://tomcat.apache.org/tomcat-5.5-doc/config/context.html for more Context attributes --> 
     4         
    45<Context path="/greenstone3"  
    5   docBase="@gsdl3webhome@"  
    6   debug="1" reloadable="true"  
    7   @privilegedattribute@ 
    8   allowLinking="false"> 
     6    docBase="C:\Users\sjm84\Desktop\greenstone3/web"  
     7    debug="1" reloadable="true"  
     8    privileged='true' 
     9    allowLinking="false"> 
     10   
     11    <Realm className="org.apache.catalina.realm.JDBCRealm"  
     12        driverName="org.apache.derby.jdbc.EmbeddedDriver" 
     13        connectionURL="jdbc:derby:C:/Users/sjm84/Desktop/greenstone3/web/sites/localsite/etc/usersDB" 
     14        userTable="users" userNameCol="username" userCredCol="password" 
     15        userRoleTable="roles" roleNameCol="role" 
     16        /> 
    917</Context> 
  • main/trunk/greenstone3/resources/xml/components.xml

    r23809 r25130  
    2626    </patternset> 
    2727 
    28     <!-- source component without gli- files that get compiled and could be safely removed from a binary distribution --> 
     28    <!-- source component without gli - files that get compiled and could be safely removed from a binary distribution --> 
    2929    <patternset id="greenstone3.source.no.gli.component"> 
    3030        <include name="src"/> 
     
    5151    <patternset id="greenstone3.imagemagick.component"> 
    5252        <include name="gs2build/bin/**/imagemagick"/> 
    53                 <include name="gs2build/bin/**/imagemagick/**/*"/> 
     53        <include name="gs2build/bin/**/imagemagick/**/*"/> 
    5454    </patternset> 
    5555 
    56         <!-- ghostscript --> 
    57         <patternset id="greenstone3.ghostscript.component"> 
    58                 <include name="gs2build/bin/**/ghostscript"/> 
    59                 <include name="gs2build/bin/**/ghostscript/**/*"/> 
    60         </patternset> 
     56    <!-- ghostscript --> 
     57    <patternset id="greenstone3.ghostscript.component"> 
     58        <include name="gs2build/bin/**/ghostscript"/> 
     59        <include name="gs2build/bin/**/ghostscript/**/*"/> 
     60    </patternset> 
    6161 
    62         <!-- tomcat --> 
    63         <patternset id="greenstone3.tomcat.component"> 
    64                 <include name="packages/tomcat"/> 
    65                 <include name="packages/tomcat/**/*"/> 
    66         </patternset> 
     62    <!-- tomcat --> 
     63    <patternset id="greenstone3.tomcat.component"> 
     64        <include name="packages/tomcat"/> 
     65        <include name="packages/tomcat/**/*"/> 
     66    </patternset> 
    6767 
    68         <!-- the core component - defined by antithesis --> 
    69         <patternset id="greenstone3.core.component"> 
     68    <!-- the core component - defined by antithesis --> 
     69    <patternset id="greenstone3.core.component"> 
    7070        <invert> 
    7171            <patternset refid="greenstone3.source.component"/> 
     
    7474            <patternset refid="greenstone3.tomcat.component"/> 
    7575        </invert> 
    76         </patternset> 
     76    </patternset> 
    7777 
    7878</project>