JSEC-125 - moved quartz-based classes to the 'support' directory
git-svn-id: https://svn.apache.org/repos/asf/incubator/jsecurity/trunk@711103 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.xml b/build.xml
index c360e84..46948e5 100644
--- a/build.xml
+++ b/build.xml
@@ -232,7 +232,35 @@
</copy>
</target>
- <target name="compile" depends="compile.core, compile.web, compile.spring" description="Compiles all classes"/>
+ <target name="compile.quartz" depends="compile.core" description="Compiles Quartz support">
+ <javac destdir="${classes.dir}"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ target="1.5"
+ failonerror="true">
+ <classpath refid="all.libs"/>
+ <classpath location="${classes.dir}"/>
+ <src path="${root.base.dir}/support/quartz/src"/>
+ </javac>
+
+ <copy todir="${classes.dir}" preservelastmodified="true">
+ <fileset dir="${root.base.dir}/support/quartz/src">
+ <include name="**/*.properties"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.xsd"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${classes.dir}/META-INF" preservelastmodified="true">
+ <fileset dir="${root.base.dir}/support/quartz/src">
+ <include name="**/*.tld"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="compile" depends="compile.core, compile.web, compile.spring, compile.quartz" description="Compiles all classes"/>
<target name="jar" depends="compile" description="Create full JAR file with all JSecurity classes">
@@ -330,6 +358,7 @@
<path id="javadocSrcPath">
<pathelement location="${src.dir}"/>
<pathelement location="${root.base.dir}/support/spring/src"/>
+ <pathelement location="${root.base.dir}/support/quartz/src"/>
</path>
<echo message="Generating JavaDoc API..."/>
@@ -373,6 +402,9 @@
<packageset dir="${root.base.dir}/support/spring/src">
<include name="org/jsecurity/**"/>
</packageset>
+ <packageset dir="${root.base.dir}/support/quartz/src">
+ <include name="org/jsecurity/**"/>
+ </packageset>
<link href="http://java.sun.com/j2se/1.5/docs/api"/>
<link href="http://java.sun.com/j2ee/1.4/docs/api"/>
<!-- Jakarta Commons -->
@@ -668,6 +700,9 @@
<fileset dir="${root.base.dir}/support/spring/src">
<include name="org/jsecurity/**"/>
</fileset>
+ <fileset dir="${root.base.dir}/support/quartz/src">
+ <include name="org/jsecurity/**"/>
+ </fileset>
</zip>
</target>
diff --git a/jsecurity.iml b/jsecurity.iml
index f82e115..a031633 100644
--- a/jsecurity.iml
+++ b/jsecurity.iml
@@ -1,98 +1,246 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="Spring" name="Spring">
- <configuration>
- <fileset id="fileset1" name="Spring Sample" removed="false">
- <file>file://$MODULE_DIR$/samples/spring/webroot/WEB-INF/applicationContext.xml</file>
- <file>file://$MODULE_DIR$/samples/spring/etc/webstart.spring.xml</file>
- <file>file://$MODULE_DIR$/samples/spring/webroot/WEB-INF/sample-servlet.xml</file>
- <file>file://$MODULE_DIR$/samples/spring/webroot/WEB-INF/remoting-servlet.xml</file>
- </fileset>
- <options>
- <option name="enableValidation" value="true" />
- <option name="reportErrorsAsWarnings" value="true" />
- </options>
- <customNs />
- </configuration>
- </facet>
- <facet type="web" name="jsecurity-web">
- <configuration>
- <descriptors>
- <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/samples/web/WEB-INF/web.xml" optional="false" version="2.5" />
- </descriptors>
- <webroots>
- <root url="file://$MODULE_DIR$/samples/web" relative="/" />
- </webroots>
- <sourceRoots>
- <root url="file://$MODULE_DIR$/src" />
- </sourceRoots>
- <building>
- <setting name="EXPLODED_URL" value="file://$MODULE_DIR$/out/exploded/samples/web" />
- <setting name="EXPLODED_ENABLED" value="true" />
- <setting name="JAR_URL" value="file://$MODULE_DIR$/out/Quickstart Webapp.war" />
- <setting name="JAR_ENABLED" value="false" />
- <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
- <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
- <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
- <setting name="RUN_JASPER_VALIDATION" value="true" />
- <setting name="BUILD_ONLY_WEB_RESOURCES" value="false" />
- </building>
- <packaging>
- <containerElement type="module" name="jsecurity">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/classes" />
- </containerElement>
- <containerElement type="library" name="all-libs" level="project">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
- </containerElement>
- <containerElement type="library" name="quickstart-libs" level="project">
- <attribute name="method" value="0" />
- <attribute name="URI" value="/WEB-INF/lib" />
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="0" />
- <attribute name="URI" value="<N/A>" />
- <url>jar://$APPLICATION_HOME_DIR$/lib/j2ee.jar!/</url>
- </containerElement>
- </packaging>
- </configuration>
- </facet>
- </component>
- <component name="NewModuleRootManager" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/build/classes" />
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/samples/spring-hibernate/WEB-INF/classes" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/samples/spring-hibernate/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/samples/spring/etc" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/samples/spring/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/support/spring/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/support/spring/test" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="all-libs" level="project" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$APPLICATION_HOME_DIR$/lib/j2ee.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="library" name="quickstart-libs" level="project" />
- <orderEntryProperties />
- </component>
- <component name="copyright">
- <Base>
- <setting name="state" value="1" />
- </Base>
- </component>
-</module>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="Spring" name="Spring">
+ <configuration>
+ <fileset id="fileset1" name="Spring Sample" removed="false">
+ <file>file://$MODULE_DIR$/samples/spring/webroot/WEB-INF/applicationContext.xml</file>
+ <file>file://$MODULE_DIR$/samples/spring/etc/webstart.spring.xml</file>
+ <file>file://$MODULE_DIR$/samples/spring/webroot/WEB-INF/sample-servlet.xml</file>
+ <file>file://$MODULE_DIR$/samples/spring/webroot/WEB-INF/remoting-servlet.xml</file>
+ </fileset>
+ <options>
+ <option name="enableValidation" value="true" />
+ <option name="reportErrorsAsWarnings" value="true" />
+ </options>
+ <customNs />
+ </configuration>
+ </facet>
+ <facet type="web" name="jsecurity-web">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/samples/web/WEB-INF/web.xml" optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root url="file://$MODULE_DIR$/samples/web" relative="/" />
+ </webroots>
+ <sourceRoots>
+ <root url="file://$MODULE_DIR$/src" />
+ </sourceRoots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://$MODULE_DIR$/out/exploded/samples/web" />
+ <setting name="EXPLODED_ENABLED" value="true" />
+ <setting name="JAR_URL" value="file://$MODULE_DIR$/out/Quickstart Webapp.war" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+ <setting name="RUN_JASPER_VALIDATION" value="true" />
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false" />
+ </building>
+ <packaging>
+ <containerElement type="module" name="jsecurity">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ <containerElement type="library" name="all-libs" level="project">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
+ </containerElement>
+ <containerElement type="library" name="quickstart-libs" level="project">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="/WEB-INF/lib" />
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
+ <url>jar://$APPLICATION_HOME_DIR$/lib/j2ee.jar!/</url>
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/build/classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/samples/spring-hibernate/WEB-INF/classes" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/samples/spring-hibernate/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/samples/spring/etc" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/samples/spring/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/support/quartz/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/support/spring/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/support/spring/test" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="all-libs" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$APPLICATION_HOME_DIR$/lib/j2ee.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="library" name="quickstart-libs" level="project" />
+ <orderEntryProperties />
+ </component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="1" />
+ </Base>
+ <LanguageOptions name="HTML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JAVA">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JSP">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JavaScript">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="Properties">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="XML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="__TEMPLATE__">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="4" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="false" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ </component>
+</module>
+
diff --git a/src/org/jsecurity/session/mgt/quartz/QuartzSessionValidationJob.java b/support/quartz/src/org/jsecurity/session/mgt/quartz/QuartzSessionValidationJob.java
similarity index 100%
rename from src/org/jsecurity/session/mgt/quartz/QuartzSessionValidationJob.java
rename to support/quartz/src/org/jsecurity/session/mgt/quartz/QuartzSessionValidationJob.java
diff --git a/src/org/jsecurity/session/mgt/quartz/QuartzSessionValidationScheduler.java b/support/quartz/src/org/jsecurity/session/mgt/quartz/QuartzSessionValidationScheduler.java
similarity index 100%
rename from src/org/jsecurity/session/mgt/quartz/QuartzSessionValidationScheduler.java
rename to support/quartz/src/org/jsecurity/session/mgt/quartz/QuartzSessionValidationScheduler.java
diff --git a/src/org/jsecurity/session/mgt/quartz/package-info.java b/support/quartz/src/org/jsecurity/session/mgt/quartz/package-info.java
similarity index 100%
rename from src/org/jsecurity/session/mgt/quartz/package-info.java
rename to support/quartz/src/org/jsecurity/session/mgt/quartz/package-info.java
