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 18:00:36 UTC
svn commit: r757905 - in /incubator/jsecurity/trunk: ./ samples/spring/
samples/standalone/ samples/web/ samples/web/src/main/resources/ support/
support/ehcache/ support/ehcache/src/main/ support/ehcache/src/main/java/
support/ehcache/src/main/java/or...
Author: lhazlewood
Date: Tue Mar 24 17:00:34 2009
New Revision: 757905
URL: http://svn.apache.org/viewvc?rev=757905&view=rev
Log:
moved files to maven standard directory layout
Added:
incubator/jsecurity/trunk/samples/web/src/main/resources/log4j.properties
- copied unchanged from r757897, incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/classes/log4j.properties
incubator/jsecurity/trunk/support/ehcache/src/main/
incubator/jsecurity/trunk/support/ehcache/src/main/java/
incubator/jsecurity/trunk/support/ehcache/src/main/java/org/
- copied from r757902, incubator/jsecurity/trunk/support/ehcache/src/org/
incubator/jsecurity/trunk/support/quartz/src/main/
incubator/jsecurity/trunk/support/quartz/src/main/java/
incubator/jsecurity/trunk/support/quartz/src/main/java/org/
- copied from r757902, incubator/jsecurity/trunk/support/quartz/src/org/
incubator/jsecurity/trunk/support/spring/src/main/
incubator/jsecurity/trunk/support/spring/src/main/java/
incubator/jsecurity/trunk/support/spring/src/main/java/org/
- copied from r757902, incubator/jsecurity/trunk/support/spring/src/org/
incubator/jsecurity/trunk/support/spring/src/test/
incubator/jsecurity/trunk/support/spring/src/test/java/
incubator/jsecurity/trunk/support/spring/src/test/java/org/
- copied from r757902, incubator/jsecurity/trunk/support/spring/test/org/
Removed:
incubator/jsecurity/trunk/samples/web/build.xml
incubator/jsecurity/trunk/support/ehcache/build.xml
incubator/jsecurity/trunk/support/ehcache/src/org/
incubator/jsecurity/trunk/support/quartz/build.xml
incubator/jsecurity/trunk/support/quartz/src/org/
incubator/jsecurity/trunk/support/spring/build.xml
incubator/jsecurity/trunk/support/spring/src/org/
incubator/jsecurity/trunk/support/spring/src/test/java/org/ki/
incubator/jsecurity/trunk/support/spring/test/org/
incubator/jsecurity/trunk/web/build.xml
Modified:
incubator/jsecurity/trunk/ (props changed)
incubator/jsecurity/trunk/samples/spring/ (props changed)
incubator/jsecurity/trunk/samples/standalone/ (props changed)
incubator/jsecurity/trunk/samples/web/ (props changed)
incubator/jsecurity/trunk/samples/web/pom.xml
incubator/jsecurity/trunk/support/ (props changed)
incubator/jsecurity/trunk/support/ehcache/ (props changed)
incubator/jsecurity/trunk/support/spring/ (props changed)
incubator/jsecurity/trunk/web/ (props changed)
Propchange: incubator/jsecurity/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 24 17:00:34 2009
@@ -1 +1,3 @@
*.iml
+
+*.ipr
Propchange: incubator/jsecurity/trunk/samples/spring/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 24 17:00:34 2009
@@ -1 +1,2 @@
build
+*.iml
Propchange: incubator/jsecurity/trunk/samples/standalone/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 24 17:00:34 2009
@@ -0,0 +1 @@
+*.iml
Propchange: incubator/jsecurity/trunk/samples/web/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 24 17:00:34 2009
@@ -0,0 +1 @@
+*.iml
Modified: incubator/jsecurity/trunk/samples/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/web/pom.xml?rev=757905&r1=757904&r2=757905&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/web/pom.xml (original)
+++ incubator/jsecurity/trunk/samples/web/pom.xml Tue Mar 24 17:00:34 2009
@@ -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>
Propchange: incubator/jsecurity/trunk/support/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 24 17:00:34 2009
@@ -0,0 +1 @@
+*.iml
Propchange: incubator/jsecurity/trunk/support/ehcache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 24 17:00:34 2009
@@ -0,0 +1 @@
+*.iml
Propchange: incubator/jsecurity/trunk/support/spring/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 24 17:00:34 2009
@@ -1 +1,2 @@
build
+*.iml
Propchange: incubator/jsecurity/trunk/web/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 24 17:00:34 2009
@@ -0,0 +1 @@
+*.iml