You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2009/03/24 16:58:52 UTC

svn commit: r757866 - in /incubator/jsecurity/trunk: ./ core/ samples/ samples/quickstart/ samples/quickstart/src/ samples/quickstart/src/main/ samples/quickstart/src/main/java/ samples/quickstart/src/main/resources/ samples/spring-hibernate/ samples/s...

Author: lhazlewood
Date: Tue Mar 24 15:58:41 2009
New Revision: 757866

URL: http://svn.apache.org/viewvc?rev=757866&view=rev
Log:
moved files to maven standard directory layout

Added:
    incubator/jsecurity/trunk/samples/quickstart/src/main/
    incubator/jsecurity/trunk/samples/quickstart/src/main/java/
    incubator/jsecurity/trunk/samples/quickstart/src/main/java/Quickstart.java
      - copied unchanged from r757844, incubator/jsecurity/trunk/samples/quickstart/src/Quickstart.java
    incubator/jsecurity/trunk/samples/quickstart/src/main/resources/
    incubator/jsecurity/trunk/samples/quickstart/src/main/resources/log4j.properties
      - copied unchanged from r757844, incubator/jsecurity/trunk/samples/quickstart/src/log4j.properties
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/java/
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/java/org/
      - copied from r757844, incubator/jsecurity/trunk/samples/spring-hibernate/src/org/
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/ehcache.xml
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/hibernate.cfg.xml
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/log4j.properties
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/
      - copied from r757844, incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/index.jsp
      - copied unchanged from r757844, incubator/jsecurity/trunk/samples/spring-hibernate/web/index.jsp
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/styles/
      - copied from r757844, incubator/jsecurity/trunk/samples/spring-hibernate/web/styles/
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/unauthorized.jsp
      - copied unchanged from r757844, incubator/jsecurity/trunk/samples/spring-hibernate/web/unauthorized.jsp
Removed:
    incubator/jsecurity/trunk/samples/quickstart/src/Quickstart.java
    incubator/jsecurity/trunk/samples/quickstart/src/log4j.properties
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/classes/ehcache.xml
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/classes/hibernate.cfg.xml
    incubator/jsecurity/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/classes/log4j.properties
    incubator/jsecurity/trunk/samples/spring-hibernate/src/org/
    incubator/jsecurity/trunk/samples/spring-hibernate/web/WEB-INF/
    incubator/jsecurity/trunk/samples/spring-hibernate/web/index.jsp
    incubator/jsecurity/trunk/samples/spring-hibernate/web/styles/
    incubator/jsecurity/trunk/samples/spring-hibernate/web/unauthorized.jsp
    incubator/jsecurity/trunk/web/test/
Modified:
    incubator/jsecurity/trunk/core/pom.xml
    incubator/jsecurity/trunk/pom.xml
    incubator/jsecurity/trunk/samples/pom.xml
    incubator/jsecurity/trunk/samples/quickstart/pom.xml
    incubator/jsecurity/trunk/samples/spring-hibernate/build.xml
    incubator/jsecurity/trunk/samples/spring/pom.xml
    incubator/jsecurity/trunk/support/ehcache/pom.xml
    incubator/jsecurity/trunk/support/quartz/pom.xml
    incubator/jsecurity/trunk/support/spring/pom.xml
    incubator/jsecurity/trunk/web/pom.xml

Modified: incubator/jsecurity/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/core/pom.xml?rev=757866&r1=757865&r2=757866&view=diff
==============================================================================
--- incubator/jsecurity/trunk/core/pom.xml (original)
+++ incubator/jsecurity/trunk/core/pom.xml Tue Mar 24 15:58:41 2009
@@ -1,3 +1,22 @@
+<?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">
 
@@ -12,26 +31,15 @@
     <name>Apache Ki :: Core</name>
     <packaging>jar</packaging>
 
-    <build/>
-
     <dependencies>
-
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <scope>test</scope>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>

Modified: incubator/jsecurity/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/pom.xml?rev=757866&r1=757865&r2=757866&view=diff
==============================================================================
--- incubator/jsecurity/trunk/pom.xml (original)
+++ incubator/jsecurity/trunk/pom.xml Tue Mar 24 15:58:41 2009
@@ -45,12 +45,13 @@
 
     <issueManagement>
         <system>Jira</system>
-        <url>http://issues.apache.org/jira/browse/JSEC</url>
+        <url>http://issues.apache.org/jira/browse/KI</url>
     </issueManagement>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/jsecurity/import/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/jsecurity/import/trunk</developerConnection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/jsecurity/import/trunk
+        </developerConnection>
         <url>http://svn.apache.org/repos/asf/incubator/jsecurity/import/trunk</url>
     </scm>
 
@@ -71,18 +72,6 @@
     </modules>
 
     <build>
-        <!-- non-standard source locations -->
-        <sourceDirectory>${basedir}/src</sourceDirectory>
-        <testSourceDirectory>${basedir}/test</testSourceDirectory>
-        <resources>
-            <resource>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-                <directory>${basedir}/src</directory>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -104,25 +93,56 @@
     </build>
 
     <dependencies>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.4</version>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>2.4</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
         <dependencies>
+            <!-- Intra project dependencies -->
+            <dependency>
+                <groupId>org.apache.ki</groupId>
+                <artifactId>ki-core</artifactId>
+                <version>${kiVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ki</groupId>
+                <artifactId>ki-web</artifactId>
+                <version>${kiVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ki</groupId>
+                <artifactId>ki-ehcache</artifactId>
+                <version>${kiVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ki</groupId>
+                <artifactId>ki-quartz</artifactId>
+                <version>${kiVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ki</groupId>
+                <artifactId>ki-spring</artifactId>
+                <version>${kiVersion}</version>
+            </dependency>
 
+            <!-- 3rd party dependencies -->
             <dependency>
                 <groupId>commons-beanutils</groupId>
                 <artifactId>commons-beanutils</artifactId>
                 <version>1.7.0</version>
+                <optional>true</optional>
             </dependency>
-
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
@@ -146,42 +166,35 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-
             <dependency>
                 <groupId>hsqldb</groupId>
                 <artifactId>hsqldb</artifactId>
                 <version>${hsqldbVersion}</version>
+                <optional>true</optional>
             </dependency>
-
             <dependency>
                 <groupId>javax.servlet.jsp</groupId>
                 <artifactId>jsp-api</artifactId>
                 <version>2.1</version>
+                <scope>provided</scope>
             </dependency>
-
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>jstl</artifactId>
                 <version>1.2</version>
+                <scope>provided</scope>
             </dependency>
-
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
                 <version>2.5</version>
+                <scope>provided</scope>
             </dependency>
-
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.4</version>
-                <scope>test</scope>
-            </dependency>
-
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
                 <version>1.2.15</version>
+                <scope>test</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.jms</groupId>
@@ -197,81 +210,43 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-
             <dependency>
                 <groupId>net.sf.ehcache</groupId>
                 <artifactId>ehcache</artifactId>
                 <version>1.4.1</version>
             </dependency>
-
             <dependency>
                 <groupId>net.sourceforge.retroweaver</groupId>
                 <artifactId>retroweaver</artifactId>
                 <version>${retroweaverVersion}</version>
+                <optional>true</optional>
             </dependency>
-
             <dependency>
                 <groupId>net.sourceforge.retroweaver</groupId>
                 <artifactId>retroweaver-rt</artifactId>
                 <version>${retroweaverVersion}</version>
+                <optional>true</optional>
             </dependency>
-
-            <dependency>
-                <groupId>org.apache.ki</groupId>
-                <artifactId>ki-core</artifactId>
-                <version>${kiVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.ki</groupId>
-                <artifactId>ki-spring</artifactId>
-                <version>${kiVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.ki</groupId>
-                <artifactId>ki-web</artifactId>
-                <version>${kiVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.easymock</groupId>
-                <artifactId>easymock</artifactId>
-                <version>2.3</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.easymock</groupId>
-                <artifactId>easymockclassextension</artifactId>
-                <version>2.3</version>
-                <scope>test</scope>
-            </dependency>
-
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring</artifactId>
                 <version>${springframeworkVersion}</version>
             </dependency>
-
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-webmvc</artifactId>
                 <version>${springframeworkVersion}</version>
             </dependency>
-
             <dependency>
                 <groupId>quartz</groupId>
                 <artifactId>quartz</artifactId>
                 <version>1.5.2</version>
             </dependency>
-
             <dependency>
                 <groupId>taglibs</groupId>
                 <artifactId>standard</artifactId>
                 <version>1.1.2</version>
             </dependency>
-
         </dependencies>
     </dependencyManagement>
 

Modified: incubator/jsecurity/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/pom.xml?rev=757866&r1=757865&r2=757866&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/pom.xml (original)
+++ incubator/jsecurity/trunk/samples/pom.xml Tue Mar 24 15:58:41 2009
@@ -1,3 +1,22 @@
+<?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">
 

Modified: incubator/jsecurity/trunk/samples/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/quickstart/pom.xml?rev=757866&r1=757865&r2=757866&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/quickstart/pom.xml (original)
+++ incubator/jsecurity/trunk/samples/quickstart/pom.xml Tue Mar 24 15:58:41 2009
@@ -1,3 +1,22 @@
+<?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">
 
@@ -12,8 +31,6 @@
     <name>Apache Ki :: Samples :: Quick Start</name>
     <packaging>jar</packaging>
 
-    <build/>
-
     <dependencies>
 
         <dependency>

Modified: incubator/jsecurity/trunk/samples/spring-hibernate/build.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/build.xml?rev=757866&r1=757865&r2=757866&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/build.xml (original)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/build.xml Tue Mar 24 15:58:41 2009
@@ -57,7 +57,7 @@
 
     <target name="war">
             <echo message="DIST DIR: ${dist.dir}"/>
-        <war warfile="${dist.war}" webxml="web/WEB-INF/web.xml">
+        <war warfile="${dist.war}" webxml="src/main/webapp/WEB-INF/web.xml">
             <lib dir="${dist.dir}" includes="*.jar"/>
             <lib dir="${dist.dir}/samples" includes="ki-samples-sprhib*.jar"/>
             <lib dir="${dist.dir}/modules" includes="*.jar"/>

Added: incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/ehcache.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/ehcache.xml?rev=757866&view=auto
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/ehcache.xml (added)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/ehcache.xml Tue Mar 24 15:58:41 2009
@@ -0,0 +1,56 @@
+<!--
+  ~ 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.
+  -->
+<ehcache>
+
+    <diskStore path="java.io.tmpdir/ki-spring-hibernate-ehcache"/>
+
+
+    <defaultCache
+        maxElementsInMemory="1000"
+        eternal="false"
+        timeToLiveSeconds="600"
+        overflowToDisk="true"
+        diskPersistent="false"
+        />
+
+    <!--=================================================================
+        Hibernate Object Caches
+        =================================================================-->
+
+    <cache name="org.ki.samples.sprhib.model.Role"
+        maxElementsInMemory="100"
+        timeToLiveSeconds="0"
+        overflowToDisk="true"/>
+
+    <cache name="org.ki.samples.sprhib.model.Role.permissions"
+        maxElementsInMemory="100"
+        timeToLiveSeconds="0"
+        overflowToDisk="true"/>
+
+    <cache name="org.ki.samples.sprhib.model.User"
+        maxElementsInMemory="1000"
+        timeToLiveSeconds="3600"
+        overflowToDisk="true"/>
+
+    <cache name="org.ki.samples.sprhib.model.User.roles"
+        maxElementsInMemory="1000"
+        timeToLiveSeconds="3600"
+        overflowToDisk="true"/>
+
+</ehcache>
\ No newline at end of file

Added: incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/hibernate.cfg.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/hibernate.cfg.xml?rev=757866&view=auto
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/hibernate.cfg.xml (added)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/hibernate.cfg.xml Tue Mar 24 15:58:41 2009
@@ -0,0 +1,35 @@
+<?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.
+  -->
+<!DOCTYPE hibernate-configuration PUBLIC
+  "-//Hibernate/Hibernate Configuration DTD//EN"
+  "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+
+<!-- This file is largely provided for IDE/tool support, and is NOT used at runtime -->
+
+<hibernate-configuration>
+  <session-factory>
+    <!-- DB schema will be updated if needed -->
+    <property name="hbm2ddl.auto">update</property>
+
+    <mapping class="org.ki.samples.sprhib.model.Role"/>
+    <mapping class="org.ki.samples.sprhib.model.User"/>
+
+  </session-factory>
+</hibernate-configuration>
\ No newline at end of file

Added: incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/log4j.properties?rev=757866&view=auto
==============================================================================
--- incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/log4j.properties (added)
+++ incubator/jsecurity/trunk/samples/spring-hibernate/src/main/resources/log4j.properties Tue Mar 24 15:58:41 2009
@@ -0,0 +1,39 @@
+#
+# 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
+
+# Hibernate
+log4j.logger.org.hibernate=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

Modified: incubator/jsecurity/trunk/samples/spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/spring/pom.xml?rev=757866&r1=757865&r2=757866&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/spring/pom.xml (original)
+++ incubator/jsecurity/trunk/samples/spring/pom.xml Tue Mar 24 15:58:41 2009
@@ -1,3 +1,22 @@
+<?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">
 
@@ -75,43 +94,35 @@
     </build>
 
     <dependencies>
-
-        <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-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>

Modified: incubator/jsecurity/trunk/support/ehcache/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/ehcache/pom.xml?rev=757866&r1=757865&r2=757866&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/ehcache/pom.xml (original)
+++ incubator/jsecurity/trunk/support/ehcache/pom.xml Tue Mar 24 15:58:41 2009
@@ -1,3 +1,22 @@
+<?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">
 
@@ -12,20 +31,15 @@
     <name>Apache Ki :: Support :: EHCache</name>
     <packaging>jar</packaging>
 
-    <build/>
-
     <dependencies>
-
         <dependency>
             <groupId>org.apache.ki</groupId>
             <artifactId>ki-core</artifactId>
         </dependency>
-
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>

Modified: incubator/jsecurity/trunk/support/quartz/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/quartz/pom.xml?rev=757866&r1=757865&r2=757866&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/quartz/pom.xml (original)
+++ incubator/jsecurity/trunk/support/quartz/pom.xml Tue Mar 24 15:58:41 2009
@@ -1,3 +1,22 @@
+<?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">
 
@@ -12,21 +31,15 @@
     <name>Apache Ki :: Support :: Quartz</name>
     <packaging>jar</packaging>
 
-    <build/>
-
     <dependencies>
-
         <dependency>
             <groupId>org.apache.ki</groupId>
             <artifactId>ki-core</artifactId>
         </dependency>
-
         <dependency>
             <groupId>quartz</groupId>
             <artifactId>quartz</artifactId>
         </dependency>
-
-
     </dependencies>
 
 </project>

Modified: incubator/jsecurity/trunk/support/spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/support/spring/pom.xml?rev=757866&r1=757865&r2=757866&view=diff
==============================================================================
--- incubator/jsecurity/trunk/support/spring/pom.xml (original)
+++ incubator/jsecurity/trunk/support/spring/pom.xml Tue Mar 24 15:58:41 2009
@@ -1,3 +1,22 @@
+<?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">
 
@@ -12,37 +31,24 @@
     <name>Apache Ki :: Support :: Spring</name>
     <packaging>jar</packaging>
 
-    <build/>
-
     <dependencies>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </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>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <scope>test</scope>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>

Modified: incubator/jsecurity/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/web/pom.xml?rev=757866&r1=757865&r2=757866&view=diff
==============================================================================
--- incubator/jsecurity/trunk/web/pom.xml (original)
+++ incubator/jsecurity/trunk/web/pom.xml Tue Mar 24 15:58:41 2009
@@ -1,3 +1,22 @@
+<?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">
 
@@ -12,50 +31,23 @@
     <name>Apache Ki :: Web</name>
     <packaging>jar</packaging>
 
-    <build>
-        <!-- non-standard source locations -->
-        <resources>
-            <resource>
-                <targetPath>META-INF</targetPath>
-                <directory>src</directory>
-                <includes>
-                    <include>**/*.tld</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
-
     <dependencies>
-
+        <dependency>
+            <groupId>org.apache.ki</groupId>
+            <artifactId>ki-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
-            <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
-            <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.ki</groupId>
-            <artifactId>ki-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
 </project>