moved files to maven standard directory layout
git-svn-id: https://svn.apache.org/repos/asf/incubator/jsecurity/trunk@757905 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/samples/web/build.xml b/samples/web/build.xml
deleted file mode 100644
index a6911b6..0000000
--- a/samples/web/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ~ 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.
- -->
-<project name="samples-web" default="package">
-
- <property name="root.base.dir" value="../.."/>
- <property name="module.name" value="samples-web"/>
- <import file="${root.base.dir}/common.ant.xml"/>
- <property name="dist.jarName" value="${project.name}-${module.name}-${version}"/>
- <property name="dist.jar" value="${dist.dir}/samples/${dist.jarName}.jar"/>
- <property name="dist.warName" value="${project.name}-${module.name}-${version}"/>
- <property name="dist.war" value="${dist.dir}/samples/${dist.warName}.war"/>
-
- <path id="compile.path">
- <fileset dir="${lib.dir}/samples">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${dist.dir}/modules">
- <include name="${project.name}-core-${version}.jar"/>
- <include name="${project.name}-web-${version}.jar"/>
- </fileset>
- </path>
-
- <!-- ===================================================================
- clean - clean all build remnants from this submodule
- ==================================================================== -->
- <target name="clean-deploy-dir" description="Removes the deployed war directory">
- <echo message="cleaning ${dist.warName} module from ${deploy.dir}"/>
- <delete file="${deploy.dir}/${dist.warName}.war"/>
- <delete dir="${deploy.dir}/${dist.warName}"/>
- </target>
- <target name="clean" depends="clean-deploy-dir" description="Cleans the Spring/Hibernate sample webapp build">
- <echo message="cleaning ${module.name} module"/>
- <delete file="${dist.jar}"/>
- <delete file="${dist.war}"/>
- <delete dir="${build.dir}"/>
- </target>
-
-
- <!-- ===================================================================
- war - create distribution war (which will be used for deployment)
- =================================================================== -->
- <target name="war" description="Creates the samples webapp .war">
- <war warfile="${dist.war}" webxml="src/main/webapp/WEB-INF/web.xml">
- <lib dir="${root.dist.dir}" includes="jsecurity-*.jar"/>
- <lib dir="${lib.dir}/samples" includes="jstl-*.jar"/>
- <lib dir="${lib.dir}/samples" includes="standard-*.jar"/>
- <lib dir="${lib.dir}/samples" includes="log4j-*.jar"/>
- <lib dir="${lib.dir}/samples" includes="commons-*.jar"/>
- <lib dir="${lib.dir}/samples" includes="ehcache-*.jar"/>
- <lib dir="${lib.dir}/samples" includes="backport-util-concurrent-*.jar"/>
- <fileset dir="webroot" includes="**" excludes="**/web.xml"/>
- </war>
- </target>
-
- <target name="package" depends="war"/>
-
- <target name="quick-deploy" description="Blindly deploys the sample web .war to Tomcat">
- <echo>Deploying application to Tomcat...</echo>
- <unzip src="${dist.war}" dest="${env.CATALINA_HOME}/webapps/${project.name}-${module.name}"/>
- <touch file="${env.CATALINA_HOME}/webapps/${project.name}-${module.name}/WEB-INF/web.xml"/>
- </target>
-
- <target name="deploy" depends="package,quick-deploy"
- description="Creates and deploys the sample web .war to Tomcat"/>
-
-</project>
diff --git a/samples/web/pom.xml b/samples/web/pom.xml
index 348b02e..4ff7ef2 100644
--- a/samples/web/pom.xml
+++ b/samples/web/pom.xml
@@ -14,28 +14,12 @@
<build>
<plugins>
- <!-- non-standard source locations -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <webResources>
- <resource>
- <directory>${basedir}/webroot</directory>
- </resource>
- </webResources>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>${jettyVersion}</version>
<configuration>
<contextPath>/ki</contextPath>
- <!-- non-standard source locations -->
- <webAppSourceDirectory>${basedir}/webroot</webAppSourceDirectory>
<connectors>
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<port>9080</port>
@@ -49,54 +33,37 @@
<extended>false</extended>
<logTimeZone>GMT</logTimeZone>
</requestLog>
- <systemProperties>
- <systemProperty>
- <name>org.apache.commons.logging.Log</name>
- <value>org.apache.commons.logging.impl.SimpleLog</value>
- </systemProperty>
- <systemProperty>
- <name>java.util.logging.config.file</name>
- <value>./target/test-classes/logging.properties</value>
- </systemProperty>
- </systemProperties>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ki</groupId>
<artifactId>ki-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.ki</groupId>
<artifactId>ki-web</artifactId>
</dependency>
-
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
-
</dependencies>
</project>
diff --git a/samples/web/src/main/resources/log4j.properties b/samples/web/src/main/resources/log4j.properties
new file mode 100644
index 0000000..3ffb74c
--- /dev/null
+++ b/samples/web/src/main/resources/log4j.properties
@@ -0,0 +1,47 @@
+#
+# 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.
+#
+# This file is used to format all logging output
+log4j.rootLogger=TRACE, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%c]: %m%n
+
+# =============================================================================
+# 3rd Party Libraries
+# OFF, FATAL, ERROR, WARN, INFO, DEBUG, ALL
+# =============================================================================
+# ehcache caching manager:
+log4j.logger.net.sf.ehcache=WARN
+
+# Most all Apache libs:
+log4j.logger.org.apache=WARN
+
+# Quartz Enterprise Scheular (java 'cron' utility)
+log4j.logger.org.quartz=WARN
+
+# =============================================================================
+# Apache Ki
+# =============================================================================
+# Apache Ki security framework
+log4j.logger.org.apache.ki.realm.text.PropertiesRealm=INFO
+log4j.logger.org.apache.ki.cache.ehcache.EhCache=INFO
+log4j.logger.org.apache.ki.io=INFO
+log4j.logger.org.apache.ki.web.servlet=INFO
+log4j.logger.org.apache.ki.util.ThreadContext=INFO
diff --git a/support/ehcache/build.xml b/support/ehcache/build.xml
deleted file mode 100644
index b996951..0000000
--- a/support/ehcache/build.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="ehcache" default="package">
-
- <property name="root.base.dir" value="../.."/>
- <property name="module.name" value="ehcache"/>
- <import file="${root.base.dir}/common.ant.xml"/>
- <property name="dist.jarName" value="${project.name}-${module.name}-${version}"/>
- <property name="dist.jar" value="${dist.dir}/modules/${dist.jarName}.jar"/>
-
- <path id="compile.path">
- <fileset dir="${lib.dir}/${module.name}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${dist.dir}/modules">
- <include name="${project.name}-core-${version}.jar"/>
- </fileset>
- </path>
-
- <target name="compile" depends="compile.src"/>
-
-
-</project>
\ No newline at end of file
diff --git a/support/ehcache/src/org/apache/ki/cache/ehcache/EhCache.java b/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCache.java
similarity index 100%
rename from support/ehcache/src/org/apache/ki/cache/ehcache/EhCache.java
rename to support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCache.java
diff --git a/support/ehcache/src/org/apache/ki/cache/ehcache/EhCacheManager.java b/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCacheManager.java
similarity index 100%
rename from support/ehcache/src/org/apache/ki/cache/ehcache/EhCacheManager.java
rename to support/ehcache/src/main/java/org/apache/ki/cache/ehcache/EhCacheManager.java
diff --git a/support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml b/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/ehcache.xml
similarity index 100%
rename from support/ehcache/src/org/apache/ki/cache/ehcache/ehcache.xml
rename to support/ehcache/src/main/java/org/apache/ki/cache/ehcache/ehcache.xml
diff --git a/support/ehcache/src/org/apache/ki/cache/ehcache/package-info.java b/support/ehcache/src/main/java/org/apache/ki/cache/ehcache/package-info.java
similarity index 100%
rename from support/ehcache/src/org/apache/ki/cache/ehcache/package-info.java
rename to support/ehcache/src/main/java/org/apache/ki/cache/ehcache/package-info.java
diff --git a/support/quartz/build.xml b/support/quartz/build.xml
deleted file mode 100644
index b8a5494..0000000
--- a/support/quartz/build.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="quartz" default="package">
-
- <property name="root.base.dir" value="../.."/>
- <property name="module.name" value="quartz"/>
- <import file="${root.base.dir}/common.ant.xml"/>
- <property name="dist.jarName" value="${project.name}-${module.name}-${version}"/>
- <property name="dist.jar" value="${dist.dir}/modules/${dist.jarName}.jar"/>
-
- <path id="compile.path">
- <fileset dir="${lib.dir}/${module.name}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${dist.dir}/modules">
- <include name="${project.name}-core-${version}.jar"/>
- </fileset>
- </path>
-
- <target name="compile" depends="compile.src"/>
-
-
-</project>
\ No newline at end of file
diff --git a/support/quartz/src/org/apache/ki/session/mgt/quartz/QuartzSessionValidationJob.java b/support/quartz/src/main/java/org/apache/ki/session/mgt/quartz/QuartzSessionValidationJob.java
similarity index 100%
rename from support/quartz/src/org/apache/ki/session/mgt/quartz/QuartzSessionValidationJob.java
rename to support/quartz/src/main/java/org/apache/ki/session/mgt/quartz/QuartzSessionValidationJob.java
diff --git a/support/quartz/src/org/apache/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java b/support/quartz/src/main/java/org/apache/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java
similarity index 100%
rename from support/quartz/src/org/apache/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java
rename to support/quartz/src/main/java/org/apache/ki/session/mgt/quartz/QuartzSessionValidationScheduler.java
diff --git a/support/quartz/src/org/apache/ki/session/mgt/quartz/package-info.java b/support/quartz/src/main/java/org/apache/ki/session/mgt/quartz/package-info.java
similarity index 100%
rename from support/quartz/src/org/apache/ki/session/mgt/quartz/package-info.java
rename to support/quartz/src/main/java/org/apache/ki/session/mgt/quartz/package-info.java
diff --git a/support/spring/build.xml b/support/spring/build.xml
deleted file mode 100644
index ea4d0f6..0000000
--- a/support/spring/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="spring" default="package">
-
- <property name="root.base.dir" value="../.."/>
- <property name="module.name" value="spring"/>
- <import file="${root.base.dir}/common.ant.xml"/>
- <property name="dist.jarName" value="${project.name}-${module.name}-${version}"/>
- <property name="dist.jar" value="${dist.dir}/modules/${dist.jarName}.jar"/>
-
- <path id="compile.path">
- <fileset dir="${lib.dir}/${module.name}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${dist.dir}/modules">
- <include name="${project.name}-core-${version}.jar"/>
- <include name="${project.name}-web-${version}.jar"/>
- </fileset>
- </path>
-
-
-</project>
\ No newline at end of file
diff --git a/support/spring/src/org/apache/ki/spring/LifecycleBeanPostProcessor.java b/support/spring/src/main/java/org/apache/ki/spring/LifecycleBeanPostProcessor.java
similarity index 100%
rename from support/spring/src/org/apache/ki/spring/LifecycleBeanPostProcessor.java
rename to support/spring/src/main/java/org/apache/ki/spring/LifecycleBeanPostProcessor.java
diff --git a/support/spring/src/org/apache/ki/spring/SpringIniWebConfiguration.java b/support/spring/src/main/java/org/apache/ki/spring/SpringIniWebConfiguration.java
similarity index 100%
rename from support/spring/src/org/apache/ki/spring/SpringIniWebConfiguration.java
rename to support/spring/src/main/java/org/apache/ki/spring/SpringIniWebConfiguration.java
diff --git a/support/spring/src/org/apache/ki/spring/SpringKiFilter.java b/support/spring/src/main/java/org/apache/ki/spring/SpringKiFilter.java
similarity index 100%
rename from support/spring/src/org/apache/ki/spring/SpringKiFilter.java
rename to support/spring/src/main/java/org/apache/ki/spring/SpringKiFilter.java
diff --git a/support/spring/src/org/apache/ki/spring/package-info.java b/support/spring/src/main/java/org/apache/ki/spring/package-info.java
similarity index 100%
rename from support/spring/src/org/apache/ki/spring/package-info.java
rename to support/spring/src/main/java/org/apache/ki/spring/package-info.java
diff --git a/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java b/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java
similarity index 100%
rename from support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java
rename to support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationExecutor.java
diff --git a/support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java b/support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java
similarity index 100%
rename from support/spring/src/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java
rename to support/spring/src/main/java/org/apache/ki/spring/remoting/SecureRemoteInvocationFactory.java
diff --git a/support/spring/src/org/apache/ki/spring/remoting/package-info.java b/support/spring/src/main/java/org/apache/ki/spring/remoting/package-info.java
similarity index 100%
rename from support/spring/src/org/apache/ki/spring/remoting/package-info.java
rename to support/spring/src/main/java/org/apache/ki/spring/remoting/package-info.java
diff --git a/support/spring/src/org/apache/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java b/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java
similarity index 100%
rename from support/spring/src/org/apache/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java
rename to support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AopAllianceAnnotationsAuthorizingMethodInterceptor.java
diff --git a/support/spring/src/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java b/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java
similarity index 100%
rename from support/spring/src/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java
rename to support/spring/src/main/java/org/apache/ki/spring/security/interceptor/AuthorizationAttributeSourceAdvisor.java
diff --git a/support/spring/src/org/apache/ki/spring/security/interceptor/package-info.java b/support/spring/src/main/java/org/apache/ki/spring/security/interceptor/package-info.java
similarity index 100%
rename from support/spring/src/org/apache/ki/spring/security/interceptor/package-info.java
rename to support/spring/src/main/java/org/apache/ki/spring/security/interceptor/package-info.java
diff --git a/support/spring/test/org/apache/ki/spring/SpringKiFilterTest.java b/support/spring/src/test/java/org/apache/ki/spring/SpringKiFilterTest.java
similarity index 100%
rename from support/spring/test/org/apache/ki/spring/SpringKiFilterTest.java
rename to support/spring/src/test/java/org/apache/ki/spring/SpringKiFilterTest.java
diff --git a/web/build.xml b/web/build.xml
deleted file mode 100644
index ba2d222..0000000
--- a/web/build.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="web" default="package">
-
- <property name="root.base.dir" value=".."/>
- <property name="module.name" value="web"/>
- <import file="${root.base.dir}/common.ant.xml"/>
- <property name="dist.jarName" value="${project.name}-${module.name}-${version}"/>
- <property name="dist.jar" value="${dist.dir}/modules/${dist.jarName}.jar"/>
-
- <path id="compile.path">
- <fileset dir="${lib.dir}/${module.name}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${dist.dir}/modules">
- <include name="${project.name}-core-${version}.jar"/>
- </fileset>
- </path>
-
-
-</project>
\ No newline at end of file
