shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lhazlew...@apache.org
Subject svn commit: r792395 - in /incubator/shiro/trunk: pom.xml samples/spring-hibernate/pom.xml samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml
Date Thu, 09 Jul 2009 04:31:38 GMT
Author: lhazlewood
Date: Thu Jul  9 04:31:38 2009
New Revision: 792395

URL: http://svn.apache.org/viewvc?rev=792395&view=rev
Log:
attempted to get the spring-hibernate application running. All dependencies are now resolving
correctly, but there is still a runtime error - will look into it tomorrow when I'm not falling
asleep ;)

Modified:
    incubator/shiro/trunk/pom.xml
    incubator/shiro/trunk/samples/spring-hibernate/pom.xml
    incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml

Modified: incubator/shiro/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/pom.xml?rev=792395&r1=792394&r2=792395&view=diff
==============================================================================
--- incubator/shiro/trunk/pom.xml (original)
+++ incubator/shiro/trunk/pom.xml Thu Jul  9 04:31:38 2009
@@ -228,6 +228,7 @@
                 <groupId>hsqldb</groupId>
                 <artifactId>hsqldb</artifactId>
                 <version>${hsqldbVersion}</version>
+                <scope>runtime</scope>
                 <optional>true</optional>
             </dependency>
             <dependency>
@@ -306,10 +307,6 @@
                         <artifactId>c3p0</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>cglib</groupId>
-                        <artifactId>cglib</artifactId>
-                    </exclusion>
-                    <exclusion>
                         <!--suppress MavenModelInspection -->
                         <groupId>javax.security</groupId>
                         <!--suppress MavenModelInspection -->
@@ -330,19 +327,24 @@
                     </exclusion>
                     <exclusion>
                         <groupId>asm</groupId>
-                        <artifactId>asm</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>asm</groupId>
-                        <artifactId>asm-all</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>asm</groupId>
                         <!--suppress MavenModelInspection -->
                         <artifactId>asm-attrs</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>javax.transaction</groupId>
+                        <artifactId>jta</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
+            <!-- Used to support Hibernate's JTA runtime dependency in the sample application(s)
only.
+                 Not required for Shiro -->
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jta_1.1_spec</artifactId>
+                <version>1.1.1</version>
+                <scope>runtime</scope>
+                <optional>true</optional>
+            </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-annotations</artifactId>

Modified: incubator/shiro/trunk/samples/spring-hibernate/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/pom.xml?rev=792395&r1=792394&r2=792395&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/pom.xml (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/pom.xml Thu Jul  9 04:31:38 2009
@@ -88,6 +88,21 @@
             <artifactId>shiro-web</artifactId>
         </dependency>
         <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <scope>provided</scope>
@@ -104,13 +119,19 @@
             <scope>compile</scope>
             <optional>false</optional>
         </dependency>
+        <!-- needed by Hibernate at runtime: -->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -120,11 +141,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <scope>runtime</scope>
-        </dependency>
     </dependencies>
 
 </project>

Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml?rev=792395&r1=792394&r2=792395&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml
Thu Jul  9 04:31:38 2009
@@ -56,7 +56,7 @@
              DDL is auto-generated based on the *.hbm.xml mapping definitions below. -->
         <property name="schemaUpdate" value="true"/>
         <!-- Scan packages for JPA annotations -->
-        <property name="packagesToScan" value="org.shiro.samples.sprhib.model"/>
+        <property name="packagesToScan" value="org.apache.shiro.samples.sprhib.model"/>
         <property name="hibernateProperties">
             <props>
                 <prop key="hibernate.dialect">org.hibernate.dialect.HSQLDialect</prop>



Mime
View raw message