You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by ka...@apache.org on 2010/03/05 21:05:56 UTC

svn commit: r919576 - in /incubator/shiro/trunk/samples/spring-client: pom.xml src/main/jnlp/ src/main/jnlp/resources/ src/main/jnlp/resources/jsecurity-sample.jks src/main/jnlp/template.vm

Author: kaosko
Date: Fri Mar  5 20:05:56 2010
New Revision: 919576

URL: http://svn.apache.org/viewvc?rev=919576&view=rev
Log:
IN PROGRESS - issue SHIRO-89: Sample Spring Application - WebStart won't launch 
http://issues.apache.org/jira/browse/SHIRO-89
- configure webstart plugin to pack this module as a webstart zip. Move the keystore file here and create a jnlp template for webstart plugin

Added:
    incubator/shiro/trunk/samples/spring-client/src/main/jnlp/
    incubator/shiro/trunk/samples/spring-client/src/main/jnlp/resources/
    incubator/shiro/trunk/samples/spring-client/src/main/jnlp/resources/jsecurity-sample.jks   (with props)
    incubator/shiro/trunk/samples/spring-client/src/main/jnlp/template.vm
Modified:
    incubator/shiro/trunk/samples/spring-client/pom.xml

Modified: incubator/shiro/trunk/samples/spring-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-client/pom.xml?rev=919576&r1=919575&r2=919576&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-client/pom.xml (original)
+++ incubator/shiro/trunk/samples/spring-client/pom.xml Fri Mar  5 20:05:56 2010
@@ -30,13 +30,28 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>samples-spring-client</artifactId>
     <name>Apache Shiro :: Samples :: Spring Client</name>
-    <description>Spring Client used by Spring Sample webapplication</description>
+    <description>A webstart application used to demonstrate Apache Shiro session and security management.</description>
     <packaging>jar</packaging>
+    
+    <properties>
+	    <shiro.session.id>${sessionId}</shiro.session.id>
+    </properties>
 
     <dependencies>
+				<dependency>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+					<scope>compile</scope>
+				</dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
+						<exclusions>
+							<exclusion>
+								<groupId>commons-beanutils</groupId>
+								<artifactId>commons-beanutils</artifactId>
+							</exclusion>
+						</exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
@@ -48,8 +63,91 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
+            <artifactId>spring-aop</artifactId>
+            <version>2.5.6</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>2.5.6</version>
+						<exclusions>
+							<exclusion>
+								<groupId>commons-logging</groupId>
+								<artifactId>commons-logging</artifactId>
+							</exclusion>
+						</exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>2.5.6</version>
+						<exclusions>
+							<exclusion>
+								<groupId>commons-logging</groupId>
+								<artifactId>commons-logging</artifactId>
+							</exclusion>
+						</exclusions>
+        </dependency>
+				<dependency>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+					<version>1.5.6</version>
+					<scope>compile</scope>
+				</dependency> 		
+				<dependency>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+					<version>1.5.6</version>
+					<scope>compile</scope>
+				</dependency> 		
+				<dependency>
+					<groupId>org.slf4j</groupId>
+					<artifactId>jcl-over-slf4j</artifactId>
+					<version>1.5.6</version>
+					<scope>compile</scope>
+				</dependency> 		
     </dependencies>
+    
+    <build>
+    	<plugins>
+	      <plugin>
+	        <groupId>org.codehaus.mojo.webstart</groupId>
+	        <artifactId>webstart-maven-plugin</artifactId>
+	        <version>1.0-alpha-2</version>
+	        <executions>
+	           <execution>
+	           		<phase>package</phase>
+	              <goals>
+	                 <goal>jnlp-inline</goal>
+	              </goals>
+	           </execution>
+	        </executions>
+	        <configuration>
+	           <!-- JNLP generation -->
+	           <jnlp>
+	             <!-- default values -->
+	             <!--inputTemplateResourcePath>${project.basedir}</inputTemplateResourcePath-->
+	             <!--inputTemplate>src/main/jnlp/template.vm</inputTemplate--> <!-- relative to inputTemplateResourcePath -->
+	             <outputFile>shiro.jnlp.jsp</outputFile> <!-- defaults to launch.jnlp -->
+	
+	             <mainClass>org.apache.shiro.samples.spring.ui.WebStartDriver</mainClass>
+	           </jnlp>
+	
+	
+	           <sign>
+	             <keystore>jsecurity-sample.jks</keystore>
+	             <storepass>jsecurity</storepass> 
+	             <alias>jsecurity</alias>
+	             <verify>false</verify>
+	           </sign>
+	
+	           <!-- BUILDING PROCESS -->
+	           <pack200>true</pack200>
+	           <verbose>false</verbose>
+	
+	        </configuration>
+	      </plugin>
+    	</plugins>
+    </build>
 
 </project>

Added: incubator/shiro/trunk/samples/spring-client/src/main/jnlp/resources/jsecurity-sample.jks
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-client/src/main/jnlp/resources/jsecurity-sample.jks?rev=919576&view=auto
==============================================================================
Binary file - no diff available.

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

Added: incubator/shiro/trunk/samples/spring-client/src/main/jnlp/template.vm
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-client/src/main/jnlp/template.vm?rev=919576&view=auto
==============================================================================
--- incubator/shiro/trunk/samples/spring-client/src/main/jnlp/template.vm (added)
+++ incubator/shiro/trunk/samples/spring-client/src/main/jnlp/template.vm Fri Mar  5 20:05:56 2010
@@ -0,0 +1,48 @@
+<%--
+  ~ 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.
+  --%>
+<%@ page contentType="application/x-java-jnlp-file" %>
+
+<jnlp spec="$jnlpspec" codebase="${codebaseUrl}">
+	<information>
+	<title>$project.Name</title>
+	<vendor>$project.Organization.Name</vendor>
+	<homepage href="$project.Url"/>
+	<description>$project.Description</description>
+	<icon kind="splash" href="logo.png"/>
+	
+	#if($offlineAllowed)
+	<offline-allowed/>
+	#end
+	  
+	</information>
+	
+	#if($allPermissions)
+	
+	<security>
+		<all-permissions/>
+	</security>
+	#end
+	  
+	<resources>
+	<j2se version="$j2seVersion"/>
+	     $dependencies
+	  <property name="shiro.session.id" value="${sessionId}"/>
+	</resources>
+	<application-desc main-class="$mainClass"/>
+</jnlp>
\ No newline at end of file