Changeset 25130 for main/trunk

Timestamp:

2012-02-22T15:14:03+13:00 (12 years ago)

Author:

sjm84

Message:

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

Location:

main/trunk/greenstone3/resources

Files:

• tomcat/greenstone3.xml (modified) (1 diff)
• tomcat/server_tomcat7.xml (moved) (moved from main/trunk/greenstone3/resources/tomcat/server_tomcat6.xml )
• xml/components.xml (modified) (3 diffs)

main/trunk/greenstone3/resources/tomcat/greenstone3.xml

@@ -2 +2 @@
 <!-- set reloadable to false for a production version. if true, automatically reloads the webapp if it detects changes in classes or lib directories -->
 <!-- see http://tomcat.apache.org/tomcat-5.5-doc/config/context.html for more Context attributes -->
+        
 <Context path="/greenstone3" 
-  docBase="@gsdl3webhome@" 
-  debug="1" reloadable="true" 
-  @privilegedattribute@
-  allowLinking="false">
+    docBase="C:\Users\sjm84\Desktop\greenstone3/web" 
+    debug="1" reloadable="true" 
+    privileged='true'
+    allowLinking="false">
+  
+    <Realm className="org.apache.catalina.realm.JDBCRealm" 
+        driverName="org.apache.derby.jdbc.EmbeddedDriver"
+        connectionURL="jdbc:derby:C:/Users/sjm84/Desktop/greenstone3/web/sites/localsite/etc/usersDB"
+        userTable="users" userNameCol="username" userCredCol="password"
+        userRoleTable="roles" roleNameCol="role"
+        />
 </Context>

main/trunk/greenstone3/resources/xml/components.xml

@@ -26 +26 @@
     </patternset>
 
-    <!-- source component without gli- files that get compiled and could be safely removed from a binary distribution -->
+    <!-- source component without gli - files that get compiled and could be safely removed from a binary distribution -->
     <patternset id="greenstone3.source.no.gli.component">
         <include name="src"/>
@@ -51 +51 @@
     <patternset id="greenstone3.imagemagick.component">
         <include name="gs2build/bin/**/imagemagick"/>
-                <include name="gs2build/bin/**/imagemagick/**/*"/>
+        <include name="gs2build/bin/**/imagemagick/**/*"/>
     </patternset>
 
-        <!-- ghostscript -->
-        <patternset id="greenstone3.ghostscript.component">
-                <include name="gs2build/bin/**/ghostscript"/>
-                <include name="gs2build/bin/**/ghostscript/**/*"/>
-        </patternset>
+    <!-- ghostscript -->
+    <patternset id="greenstone3.ghostscript.component">
+        <include name="gs2build/bin/**/ghostscript"/>
+        <include name="gs2build/bin/**/ghostscript/**/*"/>
+    </patternset>
 
-        <!-- tomcat -->
-        <patternset id="greenstone3.tomcat.component">
-                <include name="packages/tomcat"/>
-                <include name="packages/tomcat/**/*"/>
-        </patternset>
+    <!-- tomcat -->
+    <patternset id="greenstone3.tomcat.component">
+        <include name="packages/tomcat"/>
+        <include name="packages/tomcat/**/*"/>
+    </patternset>
 
-        <!-- the core component - defined by antithesis -->
-        <patternset id="greenstone3.core.component">
+    <!-- the core component - defined by antithesis -->
+    <patternset id="greenstone3.core.component">
         <invert>
             <patternset refid="greenstone3.source.component"/>
@@ -74 +74 @@
             <patternset refid="greenstone3.tomcat.component"/>
         </invert>
-        </patternset>
+    </patternset>
 
 </project>