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 17:53:32 UTC

svn commit: r757902 - in /incubator/jsecurity/trunk: ./ core/ samples/ samples/quickstart/ samples/spring-hibernate/ samples/spring/etc/ samples/spring/src/main/resources/ samples/spring/webroot/ samples/standalone/ samples/standalone/src/ samples/stan...

Author: lhazlewood
Date: Tue Mar 24 16:53:28 2009
New Revision: 757902

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

Added:
    incubator/jsecurity/trunk/samples/spring/src/main/resources/ehcache.xml
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/spring/etc/ehcache.xml
    incubator/jsecurity/trunk/samples/spring/src/main/resources/jsecurity-sample.jks   (props changed)
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/spring/etc/jsecurity-sample.jks
    incubator/jsecurity/trunk/samples/spring/src/main/resources/sample-users.properties
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/spring/etc/sample-users.properties
    incubator/jsecurity/trunk/samples/spring/src/main/resources/webstart.spring.xml
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/spring/etc/webstart.spring.xml
    incubator/jsecurity/trunk/samples/standalone/src/main/
    incubator/jsecurity/trunk/samples/standalone/src/main/java/
    incubator/jsecurity/trunk/samples/standalone/src/main/java/MyRealm.java
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/standalone/src/MyRealm.java
    incubator/jsecurity/trunk/samples/standalone/src/main/java/Standalone.java
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/standalone/src/Standalone.java
    incubator/jsecurity/trunk/samples/standalone/src/main/resources/
    incubator/jsecurity/trunk/samples/standalone/src/main/resources/ki.ini
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/standalone/src/ki.ini
    incubator/jsecurity/trunk/samples/standalone/src/main/resources/log4j.properties
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/standalone/src/log4j.properties
    incubator/jsecurity/trunk/samples/web/src/
    incubator/jsecurity/trunk/samples/web/src/main/
    incubator/jsecurity/trunk/samples/web/src/main/resources/
    incubator/jsecurity/trunk/samples/web/src/main/webapp/
    incubator/jsecurity/trunk/samples/web/src/main/webapp/WEB-INF/
    incubator/jsecurity/trunk/samples/web/src/main/webapp/WEB-INF/web.xml
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/web.xml
    incubator/jsecurity/trunk/samples/web/src/main/webapp/account/
      - copied from r757897, incubator/jsecurity/trunk/samples/web/webroot/account/
    incubator/jsecurity/trunk/samples/web/src/main/webapp/home.jsp
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/web/webroot/home.jsp
    incubator/jsecurity/trunk/samples/web/src/main/webapp/include.jsp
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/web/webroot/include.jsp
    incubator/jsecurity/trunk/samples/web/src/main/webapp/index.jsp
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/web/webroot/index.jsp
    incubator/jsecurity/trunk/samples/web/src/main/webapp/login.jsp
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/web/webroot/login.jsp
    incubator/jsecurity/trunk/samples/web/src/main/webapp/logout.jsp
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/web/webroot/logout.jsp
    incubator/jsecurity/trunk/samples/web/src/main/webapp/style.css
      - copied unchanged from r757897, incubator/jsecurity/trunk/samples/web/webroot/style.css
Removed:
    incubator/jsecurity/trunk/build.xml
    incubator/jsecurity/trunk/common.ant.xml
    incubator/jsecurity/trunk/core/build.xml
    incubator/jsecurity/trunk/samples/quickstart/build.xml
    incubator/jsecurity/trunk/samples/spring/etc/
    incubator/jsecurity/trunk/samples/spring/webroot/
    incubator/jsecurity/trunk/samples/standalone/build.xml
    incubator/jsecurity/trunk/samples/standalone/src/MyRealm.java
    incubator/jsecurity/trunk/samples/standalone/src/Standalone.java
    incubator/jsecurity/trunk/samples/standalone/src/ki.ini
    incubator/jsecurity/trunk/samples/standalone/src/log4j.properties
    incubator/jsecurity/trunk/samples/web/account/
    incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/classes/log4j.properties
    incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/web.xml
    incubator/jsecurity/trunk/samples/web/webroot/account/
    incubator/jsecurity/trunk/samples/web/webroot/home.jsp
    incubator/jsecurity/trunk/samples/web/webroot/include.jsp
    incubator/jsecurity/trunk/samples/web/webroot/index.jsp
    incubator/jsecurity/trunk/samples/web/webroot/login.jsp
    incubator/jsecurity/trunk/samples/web/webroot/logout.jsp
    incubator/jsecurity/trunk/samples/web/webroot/style.css
Modified:
    incubator/jsecurity/trunk/   (props changed)
    incubator/jsecurity/trunk/core/   (props changed)
    incubator/jsecurity/trunk/samples/   (props changed)
    incubator/jsecurity/trunk/samples/quickstart/   (props changed)
    incubator/jsecurity/trunk/samples/spring-hibernate/   (props changed)
    incubator/jsecurity/trunk/samples/web/build.xml

Propchange: incubator/jsecurity/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 24 16:53:28 2009
@@ -0,0 +1 @@
+*.iml

Propchange: incubator/jsecurity/trunk/core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 24 16:53:28 2009
@@ -0,0 +1 @@
+*.iml

Propchange: incubator/jsecurity/trunk/samples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 24 16:53:28 2009
@@ -0,0 +1 @@
+*.iml

Propchange: incubator/jsecurity/trunk/samples/quickstart/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 24 16:53:28 2009
@@ -0,0 +1 @@
+*.iml

Propchange: incubator/jsecurity/trunk/samples/spring-hibernate/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 24 16:53:28 2009
@@ -0,0 +1 @@
+*.iml

Propchange: incubator/jsecurity/trunk/samples/spring/src/main/resources/jsecurity-sample.jks
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/jsecurity/trunk/samples/web/build.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/web/build.xml?rev=757902&r1=757901&r2=757902&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/web/build.xml (original)
+++ incubator/jsecurity/trunk/samples/web/build.xml Tue Mar 24 16:53:28 2009
@@ -57,7 +57,7 @@
          war - create distribution war (which will be used for deployment)
          =================================================================== -->
     <target name="war" description="Creates the samples webapp .war">
-        <war warfile="${dist.war}" webxml="webroot/WEB-INF/web.xml">
+        <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"/>