JSEC-125 - moved ehcache-based classes to the 'support' directory
git-svn-id: https://svn.apache.org/repos/asf/incubator/jsecurity/trunk@711105 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.xml b/build.xml
index 46948e5..08303d6 100644
--- a/build.xml
+++ b/build.xml
@@ -93,6 +93,14 @@
<property name="dist.jarName" value="${project.name}.jar"/>
<property name="dist.jar" value="${root.dist.dir}/${dist.jarName}"/>
+ <path id="core.src">
+ <fileset dir="${src.dir}">
+ <include name="**"/>
+ <exclude name="org/jsecurity/web/**"/>
+ </fileset>
+ <pathelement location="${root.base.dir}/support/ehcache/src"/>
+ </path>
+
<path id="all.libs">
<fileset dir="${lib.dir}">
<include name="**/*.jar"/>
@@ -150,10 +158,7 @@
target="1.5"
failonerror="true"
classpathref="all.libs"
- sourcepath=""
- srcdir="${src.dir}">
- <exclude name="org/jsecurity/web/**"/>
- </javac>
+ sourcepathref="core.src"/>
<copy todir="${classes.dir}" preservelastmodified="true">
<fileset dir="${src.dir}">
@@ -162,6 +167,12 @@
<include name="**/*.dtd"/>
<include name="**/*.xsd"/>
</fileset>
+ <fileset dir="${root.base.dir}/support/ehcache/src">
+ <include name="**/*.properties"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.xsd"/>
+ </fileset>
</copy>
<copy todir="${classes.dir}/META-INF" preservelastmodified="true">
@@ -356,7 +367,7 @@
<target name="javadoc" description="Generate Javadocs">
<path id="javadocSrcPath">
- <pathelement location="${src.dir}"/>
+ <path refid="core.src"/>
<pathelement location="${root.base.dir}/support/spring/src"/>
<pathelement location="${root.base.dir}/support/quartz/src"/>
</path>
@@ -399,6 +410,9 @@
<packageset dir="${src.dir}">
<include name="org/jsecurity/**"/>
</packageset>
+ <packageset dir="${root.base.dir}/support/ehcache/src">
+ <include name="org/jsecurity/**"/>
+ </packageset>
<packageset dir="${root.base.dir}/support/spring/src">
<include name="org/jsecurity/**"/>
</packageset>
@@ -697,6 +711,9 @@
<fileset dir="${src.dir}">
<include name="org/jsecurity/**"/>
</fileset>
+ <fileset dir="${root.base.dir}/support/ehcache/src">
+ <include name="org/jsecurity/**"/>
+ </fileset>
<fileset dir="${root.base.dir}/support/spring/src">
<include name="org/jsecurity/**"/>
</fileset>
diff --git a/jsecurity.iml b/jsecurity.iml
index a031633..963d652 100644
--- a/jsecurity.iml
+++ b/jsecurity.iml
@@ -69,6 +69,7 @@
<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/ehcache/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" />
diff --git a/samples/quickstart/quickstart.iml b/samples/quickstart/quickstart.iml
index 7a4900b..7dec2d5 100644
--- a/samples/quickstart/quickstart.iml
+++ b/samples/quickstart/quickstart.iml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="jsecurity" />
- <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="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="jsecurity" />
+ <orderEntry type="library" name="quickstart-libs" level="project" />
+ <orderEntryProperties />
+ </component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="1" />
+ </Base>
+ </component>
+</module>
+
diff --git a/samples/standalone/standalone.iml b/samples/standalone/standalone.iml
index a76be68..fb06cd7 100644
--- a/samples/standalone/standalone.iml
+++ b/samples/standalone/standalone.iml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="jsecurity" />
- <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="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="jsecurity" />
+ <orderEntryProperties />
+ </component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="1" />
+ </Base>
+ </component>
+</module>
+
diff --git a/src/org/jsecurity/cache/ehcache/EhCache.java b/support/ehcache/src/org/jsecurity/cache/ehcache/EhCache.java
similarity index 100%
rename from src/org/jsecurity/cache/ehcache/EhCache.java
rename to support/ehcache/src/org/jsecurity/cache/ehcache/EhCache.java
diff --git a/src/org/jsecurity/cache/ehcache/EhCacheManager.java b/support/ehcache/src/org/jsecurity/cache/ehcache/EhCacheManager.java
similarity index 100%
rename from src/org/jsecurity/cache/ehcache/EhCacheManager.java
rename to support/ehcache/src/org/jsecurity/cache/ehcache/EhCacheManager.java
diff --git a/src/org/jsecurity/cache/ehcache/ehcache.xml b/support/ehcache/src/org/jsecurity/cache/ehcache/ehcache.xml
similarity index 100%
rename from src/org/jsecurity/cache/ehcache/ehcache.xml
rename to support/ehcache/src/org/jsecurity/cache/ehcache/ehcache.xml
diff --git a/src/org/jsecurity/cache/ehcache/package-info.java b/support/ehcache/src/org/jsecurity/cache/ehcache/package-info.java
similarity index 99%
rename from src/org/jsecurity/cache/ehcache/package-info.java
rename to support/ehcache/src/org/jsecurity/cache/ehcache/package-info.java
index 8724f40..527b86a 100644
--- a/src/org/jsecurity/cache/ehcache/package-info.java
+++ b/support/ehcache/src/org/jsecurity/cache/ehcache/package-info.java
@@ -1,23 +1,23 @@
-/*
- * 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.
- */
-/**
- * <a href="http://ehcache.sourceforge.net" target="_top">Ehcache</a>-based implementations of JSecurity's
- * cache interfaces.
- */
+/*
+ * 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.
+ */
+/**
+ * <a href="http://ehcache.sourceforge.net" target="_top">Ehcache</a>-based implementations of JSecurity's
+ * cache interfaces.
+ */
package org.jsecurity.cache.ehcache;
\ No newline at end of file
