[Ils-source] r1275 - in trunk: . .settings res webapp webapp/META-INF

scribe at crosswire.org scribe at crosswire.org
Tue Dec 2 15:40:45 MST 2014 

Author: scribe
Date: 2014-12-02 15:40:45 -0700 (Tue, 02 Dec 2014)
New Revision: 1275

Added:
   trunk/.settings/org.eclipse.core.resources.prefs
   trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
   trunk/res/
   trunk/res/jobs.xml
   trunk/res/log4j.properties
   trunk/res/quartz.properties
   trunk/res/versions.properties
   trunk/webapp/META-INF/crosswire-i18n.tld
Modified:
   trunk/.classpath
   trunk/.project
   trunk/.settings/org.eclipse.wst.common.component
   trunk/.settings/org.eclipse.wst.common.project.facet.core.xml
   trunk/build.xml
   trunk/webapp/admin_profile.jsp
   trunk/webapp/header.jsp
   trunk/webapp/login.jsp
Log:
Moved WEB-INF/classes/* to res/ folder
Moved i18n tld to META-INF/
Added Override Secondary Validation (ID Check for LAX) option, per user.
Updated project files to eclipse Luna


Modified: trunk/.classpath
===================================================================
--- trunk/.classpath	2014-12-02 20:59:59 UTC (rev 1274)
+++ trunk/.classpath	2014-12-02 22:40:45 UTC (rev 1275)
@@ -3,13 +3,16 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web;#system#"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="lib" path="webapp/WEB-INF/lib/commons-lang-2.5.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.7.0-openjdk-1.7.0.60-2.4.5.1.fc20.x86_64">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_51">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="build/classes"/>
+	<classpathentry kind="output" path="webapp/WEB-INF/classes"/>
 </classpath>

Modified: trunk/.project
===================================================================
--- trunk/.project	2014-12-02 20:59:59 UTC (rev 1274)
+++ trunk/.project	2014-12-02 22:40:45 UTC (rev 1275)
@@ -3,6 +3,7 @@
 	<name>ILSWeb</name>
 	<comment></comment>
 	<projects>
+		<project>ILSWeb</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

Added: trunk/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/.settings/org.eclipse.core.resources.prefs	                        (rev 0)
+++ trunk/.settings/org.eclipse.core.resources.prefs	2014-12-02 22:40:45 UTC (rev 1275)
@@ -0,0 +1,3 @@
+#Tue Dec 07 21:47:29 GMT 2010
+eclipse.preferences.version=1
+encoding//webapp/testapi.jsp=UTF-8

Added: trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
===================================================================
--- trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs	                        (rev 0)
+++ trunk/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs	2014-12-02 22:40:45 UTC (rev 1275)
@@ -0,0 +1,5 @@
+XDOCLETBUILDERACTIVE=true
+XDOCLETHOME=
+XDOCLETUSEGLOBAL=true
+XDOCLETVERSION=1.2.1
+eclipse.preferences.version=1

Modified: trunk/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/.settings/org.eclipse.wst.common.component	2014-12-02 20:59:59 UTC (rev 1274)
+++ trunk/.settings/org.eclipse.wst.common.component	2014-12-02 22:40:45 UTC (rev 1275)
@@ -1,8 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="ILSWeb">
         <wb-resource deploy-path="/" source-path="/webapp"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <wb-resource deploy-path="/WEB-INF/lib" source-path="/webapp/WEB-INF/lib"/>
+        <wb-resource deploy-path="/META-INF" source-path="/webapp/META-INF"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/res"/>
+        <dependent-module deploy-path="/WEB-INF" handle="module:/org.jboss.ide.eclipse.archives.webtools.filesets.vcf.FilesetComponentResolver/path=%2FILSWeb%2Fwebapp&amp;includes=sysconfig.1.properties&amp;excludes=">
+            <dependency-type>consumes</dependency-type>
+        </dependent-module>
         <property name="java-output-path" value="build/classes"/>
         <property name="context-root" value="ILSWeb"/>
     </wb-module>

Modified: trunk/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/.settings/org.eclipse.wst.common.project.facet.core.xml	2014-12-02 20:59:59 UTC (rev 1274)
+++ trunk/.settings/org.eclipse.wst.common.project.facet.core.xml	2014-12-02 22:40:45 UTC (rev 1275)
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="Apache Tomcat v6.0"/>
-  <secondary-runtime name="J2EE Runtime Library 1.6"/>
+  <runtime name="Apache Tomcat v7.0"/>
   <fixed facet="jst.web"/>
   <fixed facet="jst.java"/>
   <installed facet="jst.java" version="6.0"/>
-  <installed facet="jst.web" version="2.4"/>
+  <installed facet="jst.web" version="3.0"/>
 </faceted-project>

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2014-12-02 20:59:59 UTC (rev 1274)
+++ trunk/build.xml	2014-12-02 22:40:45 UTC (rev 1275)
@@ -49,6 +49,11 @@
            source="1.6"
            includeantruntime="false">
     </javac>
+    <copy todir="webapp/WEB-INF/classes" includeEmptyDirs="false" >
+      <fileset dir="res">
+        <exclude name="**/*Test*"/>
+      </fileset>
+    </copy>
   </target>
 
 <target name="javadocs" depends="compile">

Added: trunk/res/jobs.xml
===================================================================
(Binary files differ)


Property changes on: trunk/res/jobs.xml
___________________________________________________________________
Added: svn:mime-type
   + application/xml

Added: trunk/res/log4j.properties
===================================================================
--- trunk/res/log4j.properties	                        (rev 0)
+++ trunk/res/log4j.properties	2014-12-02 22:40:45 UTC (rev 1275)
@@ -0,0 +1,26 @@
+#Last updated by admin
+#Mon Dec 13 15:19:02 GMT-07:00 2010
+log4j.appender.S.MaxFileSize=500KB
+log4j.appender.E=org.apache.log4j.RollingFileAppender
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.A=org.apache.log4j.RollingFileAppender
+log4j.appender.E.layout.ConversionPattern=%p %d{dd-MMM-yyyy HH\:mm} %c{1} - %m%n
+log4j.appender.E.MaxBackupIndex=5
+log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F\:%L) - %m%n
+log4j.appender.E.layout=org.apache.log4j.PatternLayout
+log4j.appender.A.MaxBackupIndex=5
+log4j.appender.A.File=C\:\\ils\\trunk-devel\\webapp\\log\\aicc.log
+log4j.appender.E.MaxFileSize=500KB
+log4j.appender.S.MaxBackupIndex=5
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.logger.AICC=INFO, A
+log4j.appender.S.layout.ConversionPattern=%p %d{dd-MMM-yyyy HH\:mm} %c - %m%n
+log4j.appender.S=org.apache.log4j.RollingFileAppender
+log4j.appender.A.layout.ConversionPattern=%c - %d{dd-MMM HH\:mm} %m%n
+log4j.appender.S.File=C\:\\ils\\trunk-devel\\webapp\\log\\system.log
+log4j.appender.A.MaxFileSize=500KB
+log4j.appender.A.layout=org.apache.log4j.PatternLayout
+log4j.logger.EVENTS=INFO, E
+log4j.appender.S.layout=org.apache.log4j.PatternLayout
+log4j.rootLogger=DEBUG, stdout, S
+log4j.appender.E.File=C\:\\ils\\trunk-devel\\webapp\\log\\events.log

Added: trunk/res/quartz.properties
===================================================================
--- trunk/res/quartz.properties	                        (rev 0)
+++ trunk/res/quartz.properties	2014-12-02 22:40:45 UTC (rev 1275)
@@ -0,0 +1,23 @@
+org.quartz.scheduler.instanceName = MyScheduler
+org.quartz.scheduler.instanceId = 1
+org.quartz.scheduler.rmi.export = false
+org.quartz.scheduler.rmi.proxy = false
+
+org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount = 3
+
+org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore
+
+#============================================================================
+# Configure Plugins 
+#============================================================================
+
+#org.quartz.plugin.jobHistory.class = org.quartz.plugins.history.LoggingJobHistoryPlugin
+#org.quartz.plugin.triggHistory.class = org.quartz.plugins.history.LoggingTriggerHistoryPlugin
+
+
+ org.quartz.plugin.jobInitializer.class = org.quartz.plugins.xml.XMLSchedulingDataProcessorPlugin
+ org.quartz.plugin.jobInitializer.fileNames = jobs.xml
+ org.quartz.plugin.jobInitializer.failOnFileNotFound = true
+ org.quartz.plugin.jobInitializer.scanInterval = 300
+ org.quartz.plugin.jobInitializer.wrapInUserTransaction = false

Added: trunk/res/versions.properties
===================================================================
--- trunk/res/versions.properties	                        (rev 0)
+++ trunk/res/versions.properties	2014-12-02 22:40:45 UTC (rev 1275)
@@ -0,0 +1 @@
+LMS=V1.60

Copied: trunk/webapp/META-INF/crosswire-i18n.tld (from rev 1274, trunk/webapp/WEB-INF/lib/crosswire-i18n.tld)
===================================================================
--- trunk/webapp/META-INF/crosswire-i18n.tld	                        (rev 0)
+++ trunk/webapp/META-INF/crosswire-i18n.tld	2014-12-02 22:40:45 UTC (rev 1275)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<taglib>
+  <tlibversion>1.0</tlibversion>
+  <jspversion>1.1</jspversion>
+  <shortname>i18n</shortname>
+  <uri>http://www.crosswire.org/swordweb/i18n-1.0</uri>
+  <info>
+The i18n custom tag library contains tags that help manage the complexity of creating internationalized web applications. These tags provide similar (though not identical) functionality to the internationalization available in the struts framework, but do not require adopting the entire struts framework.
+
+"i18n" is a common abbreviation for internationalization, because there are 18
+letters between the first "i" and the last "n".
+
+For more information on internationalization with Java, the java.sun.com site
+contains a good
+tutorial written by Dale Green.
+</info>
+  <tag>
+    <name>pagestart</name>
+    <tagclass>org.crosswire.web.i18n.PageStart</tagclass>
+    <bodycontent>JSP</bodycontent>
+  </tag>
+  <tag>
+    <name>t</name>
+    <tagclass>org.crosswire.web.i18n.TranslateTag</tagclass>
+    <bodycontent>JSP</bodycontent>
+  </tag>
+</taglib>
+

Modified: trunk/webapp/admin_profile.jsp
===================================================================
--- trunk/webapp/admin_profile.jsp	2014-12-02 20:59:59 UTC (rev 1274)
+++ trunk/webapp/admin_profile.jsp	2014-12-02 22:40:45 UTC (rev 1275)
@@ -198,6 +198,8 @@
         if (val != null) current.setUserProfilePhone(val);
         val = request.getParameter("ipResOver");
         current.setIPRestrictOverride("true".equals(val));
+        val = request.getParameter("secondValidOver");
+        current.setSecondaryValidationOverride("true".equals(val));
         val = request.getParameter("hdate");
         if ((val != null) && (!val.startsWith("m"))) {
             Date v = Utils.parseDate(val, 150 * 365, 10 * 365);
@@ -561,7 +563,7 @@
 
   <tr>
     <td valign="middle" class="formHeadings">Override ID Check at Login: </td>
-    <td width="228"><input value="false" type="checkbox" /></td>
+    <td width="228"><input <%=(editMisc)?"":"disabled=\"true\""%> name="secondValidOver" value="true" type="checkbox" <%=current.isSecondaryValidationOverride()?"checked=\"checked\"":""%> /></td>
   </tr>
   
   <tr>

Modified: trunk/webapp/header.jsp
===================================================================
--- trunk/webapp/header.jsp	2014-12-02 20:59:59 UTC (rev 1274)
+++ trunk/webapp/header.jsp	2014-12-02 22:40:45 UTC (rev 1275)
@@ -1,4 +1,4 @@
-<%@ taglib uri="/WEB-INF/lib/crosswire-i18n.tld" prefix="t" %>
+<%@ taglib uri="/META-INF/crosswire-i18n.tld" prefix="t" %>
 
 <t:pagestart />
 

Modified: trunk/webapp/login.jsp
===================================================================
--- trunk/webapp/login.jsp	2014-12-02 20:59:59 UTC (rev 1274)
+++ trunk/webapp/login.jsp	2014-12-02 22:40:45 UTC (rev 1275)
@@ -72,7 +72,7 @@
         	errorMsg = "Your sign in information is not valid. Please try again.";
 		eventsLogger.info("Failed Primary Login Attempt, User: " + userID + "; from: " + remoteAddr);
         }
-        else if (!"admin".equals(userID) && "on".equals(Utils.getSysConfig(session.getServletContext(), company.getCompanyID()).getProperty("SecondaryLoginValidationEnable", "off"))) {
+        else if (!ilsSession.getCurrentUserProfile().isSecondaryValidationOverride() && !"admin".equals(userID) && "on".equals(Utils.getSysConfig(session.getServletContext(), company.getCompanyID()).getProperty("SecondaryLoginValidationEnable", "off"))) {
                 String ipExceptions = Utils.getSysConfig(session).getProperty("SecondaryLoginValidationIPExceptions", "");
                 boolean match = false;
                 for (String p : ipExceptions.split("\n")) {

More information about the Ils-source mailing list