moved files to maven standard directory layout
git-svn-id: https://svn.apache.org/repos/asf/incubator/jsecurity/trunk@757892 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/samples/spring-hibernate/pom.xml b/samples/spring-hibernate/pom.xml
new file mode 100644
index 0000000..c0ab263
--- /dev/null
+++ b/samples/spring-hibernate/pom.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.ki.samples</groupId>
+ <artifactId>ki-samples</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>samples-spring</artifactId>
+ <name>Apache Ki :: Samples :: Spring-Hibernate</name>
+ <packaging>war</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>${jettyVersion}</version>
+ <!-- <configuration>
+ <contextPath>/kisprhib</contextPath>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>9080</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ <requestLog implementation="org.mortbay.jetty.NCSARequestLog">
+ <filename>./target/yyyy_mm_dd.request.log</filename>
+ <retainDays>90</retainDays>
+ <append>true</append>
+ <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>
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>${hsqldbVersion}</version>
+ </dependency>
+ </dependencies> -->
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ki</groupId>
+ <artifactId>ki-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ki</groupId>
+ <artifactId>ki-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ki</groupId>
+ <artifactId>ki-web</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.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/samples/spring/build.xml b/samples/spring/build.xml
index cd90889..84bb081 100644
--- a/samples/spring/build.xml
+++ b/samples/spring/build.xml
@@ -82,7 +82,7 @@
<fileset dir="${webstart.lib.dir}" includes="*.jar"/>
</signjar>
- <war warfile="${dist.war}" webxml="webroot/WEB-INF/web.xml">
+ <war warfile="${dist.war}" webxml="src/main/webapp/WEB-INF/web.xml">
<lib dir="${lib.dir}/samples">
<exclude name="servlet-api-*.jar"/>
</lib>
diff --git a/samples/spring/pom.xml b/samples/spring/pom.xml
index 06d72e5..879bc1f 100644
--- a/samples/spring/pom.xml
+++ b/samples/spring/pom.xml
@@ -33,31 +33,12 @@
<build>
<plugins>
- <!-- non-standard source locations -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <webResources>
- <resource>
- <directory>${basedir}/webroot</directory>
- </resource>
- <resource>
- <directory>${basedir}/etc</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>
@@ -71,16 +52,6 @@
<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>
<dependencies>
<dependency>
diff --git a/samples/spring/src/org/apache/ki/samples/spring/BootstrapDataPopulator.java b/samples/spring/src/main/java/org/apache/ki/samples/spring/BootstrapDataPopulator.java
similarity index 100%
rename from samples/spring/src/org/apache/ki/samples/spring/BootstrapDataPopulator.java
rename to samples/spring/src/main/java/org/apache/ki/samples/spring/BootstrapDataPopulator.java
diff --git a/samples/spring/src/org/apache/ki/samples/spring/DefaultSampleManager.java b/samples/spring/src/main/java/org/apache/ki/samples/spring/DefaultSampleManager.java
similarity index 100%
rename from samples/spring/src/org/apache/ki/samples/spring/DefaultSampleManager.java
rename to samples/spring/src/main/java/org/apache/ki/samples/spring/DefaultSampleManager.java
diff --git a/samples/spring/src/org/apache/ki/samples/spring/SampleManager.java b/samples/spring/src/main/java/org/apache/ki/samples/spring/SampleManager.java
similarity index 100%
rename from samples/spring/src/org/apache/ki/samples/spring/SampleManager.java
rename to samples/spring/src/main/java/org/apache/ki/samples/spring/SampleManager.java
diff --git a/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartDriver.java b/samples/spring/src/main/java/org/apache/ki/samples/spring/ui/WebStartDriver.java
similarity index 100%
rename from samples/spring/src/org/apache/ki/samples/spring/ui/WebStartDriver.java
rename to samples/spring/src/main/java/org/apache/ki/samples/spring/ui/WebStartDriver.java
diff --git a/samples/spring/src/org/apache/ki/samples/spring/ui/WebStartView.java b/samples/spring/src/main/java/org/apache/ki/samples/spring/ui/WebStartView.java
similarity index 100%
rename from samples/spring/src/org/apache/ki/samples/spring/ui/WebStartView.java
rename to samples/spring/src/main/java/org/apache/ki/samples/spring/ui/WebStartView.java
diff --git a/samples/spring/src/org/apache/ki/samples/spring/web/IndexController.java b/samples/spring/src/main/java/org/apache/ki/samples/spring/web/IndexController.java
similarity index 100%
rename from samples/spring/src/org/apache/ki/samples/spring/web/IndexController.java
rename to samples/spring/src/main/java/org/apache/ki/samples/spring/web/IndexController.java
diff --git a/samples/spring/src/org/apache/ki/samples/spring/web/JnlpController.java b/samples/spring/src/main/java/org/apache/ki/samples/spring/web/JnlpController.java
similarity index 100%
rename from samples/spring/src/org/apache/ki/samples/spring/web/JnlpController.java
rename to samples/spring/src/main/java/org/apache/ki/samples/spring/web/JnlpController.java
diff --git a/samples/spring/src/org/apache/ki/samples/spring/web/LoginCommand.java b/samples/spring/src/main/java/org/apache/ki/samples/spring/web/LoginCommand.java
similarity index 100%
rename from samples/spring/src/org/apache/ki/samples/spring/web/LoginCommand.java
rename to samples/spring/src/main/java/org/apache/ki/samples/spring/web/LoginCommand.java
diff --git a/samples/spring/src/org/apache/ki/samples/spring/web/LoginController.java b/samples/spring/src/main/java/org/apache/ki/samples/spring/web/LoginController.java
similarity index 100%
rename from samples/spring/src/org/apache/ki/samples/spring/web/LoginController.java
rename to samples/spring/src/main/java/org/apache/ki/samples/spring/web/LoginController.java
diff --git a/samples/spring/src/org/apache/ki/samples/spring/web/LogoutController.java b/samples/spring/src/main/java/org/apache/ki/samples/spring/web/LogoutController.java
similarity index 100%
rename from samples/spring/src/org/apache/ki/samples/spring/web/LogoutController.java
rename to samples/spring/src/main/java/org/apache/ki/samples/spring/web/LogoutController.java
diff --git a/samples/spring/src/org/apache/ki/samples/spring/web/SessionValueCommand.java b/samples/spring/src/main/java/org/apache/ki/samples/spring/web/SessionValueCommand.java
similarity index 100%
rename from samples/spring/src/org/apache/ki/samples/spring/web/SessionValueCommand.java
rename to samples/spring/src/main/java/org/apache/ki/samples/spring/web/SessionValueCommand.java
diff --git a/samples/spring/webroot/WEB-INF/applicationContext.xml b/samples/spring/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from samples/spring/webroot/WEB-INF/applicationContext.xml
rename to samples/spring/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/samples/spring/webroot/WEB-INF/remoting-servlet.xml b/samples/spring/src/main/webapp/WEB-INF/remoting-servlet.xml
similarity index 100%
rename from samples/spring/webroot/WEB-INF/remoting-servlet.xml
rename to samples/spring/src/main/webapp/WEB-INF/remoting-servlet.xml
diff --git a/samples/spring/webroot/WEB-INF/resources/include.jsp b/samples/spring/src/main/webapp/WEB-INF/resources/include.jsp
similarity index 100%
rename from samples/spring/webroot/WEB-INF/resources/include.jsp
rename to samples/spring/src/main/webapp/WEB-INF/resources/include.jsp
diff --git a/samples/spring/webroot/WEB-INF/resources/jsecurity.jnlp.jsp b/samples/spring/src/main/webapp/WEB-INF/resources/jsecurity.jnlp.jsp
similarity index 100%
rename from samples/spring/webroot/WEB-INF/resources/jsecurity.jnlp.jsp
rename to samples/spring/src/main/webapp/WEB-INF/resources/jsecurity.jnlp.jsp
diff --git a/samples/spring/webroot/WEB-INF/resources/login.jsp b/samples/spring/src/main/webapp/WEB-INF/resources/login.jsp
similarity index 100%
rename from samples/spring/webroot/WEB-INF/resources/login.jsp
rename to samples/spring/src/main/webapp/WEB-INF/resources/login.jsp
diff --git a/samples/spring/webroot/WEB-INF/resources/sampleIndex.jsp b/samples/spring/src/main/webapp/WEB-INF/resources/sampleIndex.jsp
similarity index 100%
rename from samples/spring/webroot/WEB-INF/resources/sampleIndex.jsp
rename to samples/spring/src/main/webapp/WEB-INF/resources/sampleIndex.jsp
diff --git a/samples/spring/webroot/WEB-INF/sample-servlet.xml b/samples/spring/src/main/webapp/WEB-INF/sample-servlet.xml
similarity index 100%
rename from samples/spring/webroot/WEB-INF/sample-servlet.xml
rename to samples/spring/src/main/webapp/WEB-INF/sample-servlet.xml
diff --git a/samples/spring/webroot/WEB-INF/spring.tld b/samples/spring/src/main/webapp/WEB-INF/spring.tld
similarity index 100%
rename from samples/spring/webroot/WEB-INF/spring.tld
rename to samples/spring/src/main/webapp/WEB-INF/spring.tld
diff --git a/samples/spring/webroot/WEB-INF/web.xml b/samples/spring/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from samples/spring/webroot/WEB-INF/web.xml
rename to samples/spring/src/main/webapp/WEB-INF/web.xml
diff --git a/samples/spring/webroot/index.jsp b/samples/spring/src/main/webapp/index.jsp
similarity index 100%
rename from samples/spring/webroot/index.jsp
rename to samples/spring/src/main/webapp/index.jsp
diff --git a/samples/spring/webroot/jsecurity.css b/samples/spring/src/main/webapp/jsecurity.css
similarity index 100%
rename from samples/spring/webroot/jsecurity.css
rename to samples/spring/src/main/webapp/jsecurity.css
diff --git a/samples/spring/webroot/logo.png b/samples/spring/src/main/webapp/logo.png
similarity index 100%
rename from samples/spring/webroot/logo.png
rename to samples/spring/src/main/webapp/logo.png
Binary files differ
diff --git a/samples/spring/webroot/WEB-INF/classes/log4j.properties b/samples/spring/webroot/WEB-INF/classes/log4j.properties
deleted file mode 100644
index c84c628..0000000
--- a/samples/spring/webroot/WEB-INF/classes/log4j.properties
+++ /dev/null
@@ -1,36 +0,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.
-#
-log4j.rootLogger=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m %n
-
-# General Apache libraries
-log4j.logger.org.apache=WARN
-
-# Spring
-log4j.logger.org.springframework=WARN
-
-# Default Apache Ki logging
-log4j.logger.org.ki=TRACE
-
-# Disable verbose logging
-log4j.logger.org.apache.ki.util.ThreadContext=WARN
-log4j.logger.org.apache.ki.cache.ehcache.EhCache=WARN
