shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r739114 - in /incubator/jsecurity/trunk/samples/web: ./ WEB-INF/ webroot/ webroot/WEB-INF/ webroot/WEB-INF/classes/
Date Fri, 30 Jan 2009 01:21:21 GMT
Author: adc
Date: Fri Jan 30 01:21:20 2009
New Revision: 739114

URL: http://svn.apache.org/viewvc?rev=739114&view=rev
Log:
JSEC-45 Getting the web demo to work

Added:
    incubator/jsecurity/trunk/samples/web/pom.xml   (with props)
    incubator/jsecurity/trunk/samples/web/webroot/
    incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/
      - copied from r737483, incubator/jsecurity/trunk/samples/web/WEB-INF/
    incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/classes/
      - copied from r739077, incubator/jsecurity/trunk/samples/web/WEB-INF/classes/
    incubator/jsecurity/trunk/samples/web/webroot/WEB-INF/web.xml
      - copied unchanged from r739077, incubator/jsecurity/trunk/samples/web/WEB-INF/web.xml
    incubator/jsecurity/trunk/samples/web/webroot/home.jsp
      - copied unchanged from r737483, incubator/jsecurity/trunk/samples/web/home.jsp
    incubator/jsecurity/trunk/samples/web/webroot/include.jsp
      - copied unchanged from r737483, incubator/jsecurity/trunk/samples/web/include.jsp
    incubator/jsecurity/trunk/samples/web/webroot/index.jsp
      - copied unchanged from r737483, incubator/jsecurity/trunk/samples/web/index.jsp
    incubator/jsecurity/trunk/samples/web/webroot/login.jsp
      - copied unchanged from r737483, incubator/jsecurity/trunk/samples/web/login.jsp
    incubator/jsecurity/trunk/samples/web/webroot/logout.jsp
      - copied unchanged from r737483, incubator/jsecurity/trunk/samples/web/logout.jsp
    incubator/jsecurity/trunk/samples/web/webroot/style.css
      - copied unchanged from r737483, incubator/jsecurity/trunk/samples/web/style.css
Removed:
    incubator/jsecurity/trunk/samples/web/WEB-INF/
    incubator/jsecurity/trunk/samples/web/home.jsp
    incubator/jsecurity/trunk/samples/web/include.jsp
    incubator/jsecurity/trunk/samples/web/index.jsp
    incubator/jsecurity/trunk/samples/web/login.jsp
    incubator/jsecurity/trunk/samples/web/logout.jsp
    incubator/jsecurity/trunk/samples/web/style.css
Modified:
    incubator/jsecurity/trunk/samples/web/build.xml

Modified: incubator/jsecurity/trunk/samples/web/build.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/web/build.xml?rev=739114&r1=739113&r2=739114&view=diff
==============================================================================
--- incubator/jsecurity/trunk/samples/web/build.xml (original)
+++ incubator/jsecurity/trunk/samples/web/build.xml Fri Jan 30 01:21:20 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="../web/WEB-INF/web.xml">
+        <war warfile="${dist.war}" webxml="webroot/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"/>
@@ -65,7 +65,7 @@
             <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="${base.dir}" includes="**" excludes="**/web.xml, **/build.xml"/>
+            <fileset dir="webroot" includes="**" excludes="**/web.xml"/>
         </war>
     </target>
 

Added: incubator/jsecurity/trunk/samples/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jsecurity/trunk/samples/web/pom.xml?rev=739114&view=auto
==============================================================================
--- incubator/jsecurity/trunk/samples/web/pom.xml (added)
+++ incubator/jsecurity/trunk/samples/web/pom.xml Fri Jan 30 01:21:20 2009
@@ -0,0 +1,102 @@
+<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.jsecurity.samples</groupId>
+        <artifactId>jsecurity-samples</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>samples-web</artifactId>
+    <name>Apache JSecurity :: Samples :: Web</name>
+    <packaging>war</packaging>
+
+    <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>/jsec</contextPath>
+                    <!-- non-standard source locations -->
+                    <webAppSourceDirectory>${basedir}/webroot</webAppSourceDirectory>
+                    <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>
+            </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.jsecurity</groupId>
+            <artifactId>jsecurity-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.jsecurity</groupId>
+            <artifactId>jsecurity-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

Propchange: incubator/jsecurity/trunk/samples/web/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/jsecurity/trunk/samples/web/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/jsecurity/trunk/samples/web/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message