Update of 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
In directory 
james.mmbase.org:/tmp/cvs-serv29550/demo.cmscontainer.org/war-community

Modified Files:
      Tag: b1_4
        project.xml 
Log Message:
Cleaned up and added default settings for options


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community


Index: project.xml
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- project.xml 17 Jan 2008 09:14:46 -0000      1.4
+++ project.xml 15 Feb 2008 12:29:29 -0000      1.4.2.1
@@ -14,20 +14,6 @@
 
                <dependency>
                        <groupId>finalist</groupId>
-                       <artifactId>cmsc-modules-rssfeed</artifactId>
-                       <version>${cmscmodules.version}</version>
-                       <type>mmbase-module</type>
-               </dependency>
-
-               <dependency>
-                       <groupId>finalist</groupId>
-                       <artifactId>cmsc-modules-tasks</artifactId>
-                       <version>${cmscmodules.version}</version>
-                       <type>mmbase-module</type>
-               </dependency>
-
-               <dependency>
-                       <groupId>finalist</groupId>
                        <artifactId>cmsc-modules-tasks</artifactId>
                        <version>${cmscmodules.version}</version>
                        <type>mmbase-module</type>
@@ -44,6 +30,8 @@
             <version>${cmscmodules.version}</version>
             <type>mmbase-module</type>
         </dependency>
+        
+        
         <dependency>
             <groupId>finalist</groupId>
             <artifactId>cmsc-modules-community</artifactId>
@@ -51,6 +39,7 @@
             <type>mmbase-module</type>
         </dependency>
 
+<!-- Login porlet -->
         <dependency>
             <groupId>finalist</groupId>
             <artifactId>cmsc-portlets-login</artifactId>
@@ -58,7 +47,6 @@
             <type>mmbase-module</type>
         </dependency>
 
-
       <dependency>
          <groupId>finalist</groupId>
          <artifactId>cmsc-portlets-newsletter</artifactId>
@@ -75,7 +63,7 @@
 
 
 
-<!-- Hibernate dependencies -->
+<!-- Hibernate dependencies (for Community Module) -->
                <dependency>
                  <groupId>asm</groupId>
                  <artifactId>asm</artifactId>
@@ -85,41 +73,28 @@
                                <war.bundle>${war.bundle}</war.bundle>
                        </properties>
                </dependency>
-
                <dependency>
-                 <groupId>cglib</groupId>
-                 <artifactId>cglib</artifactId>
-                 <version>2.1_3</version>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>2.7.6</version>
                  <type>jar</type>
                        <properties>
                                <war.bundle>${war.bundle}</war.bundle>
                        </properties>
                </dependency>
-
                <dependency>
-                 <groupId>commons-dbcp</groupId>
-                 <artifactId>commons-dbcp</artifactId>
-                 <version>1.2.2</version>
-                 <type>jar</type>
-                       <properties>
-                               <war.bundle>${war.bundle}</war.bundle>
-                       </properties>
-               </dependency>
-
-               <dependency>
-                 <groupId>commons-pool</groupId>
-                 <artifactId>commons-pool</artifactId>
-                 <version>1.3</version>
+                 <groupId>cglib</groupId>
+                 <artifactId>cglib</artifactId>
+                 <version>2.1.3</version>
                  <type>jar</type>
                        <properties>
                                <war.bundle>${war.bundle}</war.bundle>
                        </properties>
                </dependency>
-
                <dependency>
                  <groupId>dom4j</groupId>
                  <artifactId>dom4j</artifactId>
-                 <version>1.5</version>
+                 <version>1.6.1</version>
                  <type>jar</type>
                        <properties>
                                <war.bundle>${war.bundle}</war.bundle>
@@ -127,9 +102,9 @@
                </dependency>
 
                <dependency>
-                 <groupId>ejb-persistence</groupId>
+            <groupId>hibernate</groupId>
           <artifactId>ejb3-persistence</artifactId>
-          <version>3.1beta4</version>
+            <version>3.0</version>
                  <type>jar</type>
                        <properties>
                                <war.bundle>${war.bundle}</war.bundle>
@@ -139,175 +114,89 @@
                <dependency>
                  <groupId>hibernate</groupId>
                  <artifactId>hibernate</artifactId>
-                 <version>3.1</version>
+            <version>3.2.5.GA</version>
                  <type>jar</type>
                        <properties>
                                <war.bundle>${war.bundle}</war.bundle>
                        </properties>
                </dependency>
-
                <dependency>
                  <groupId>hibernate</groupId>
-                 <artifactId>hibernate-annotations</artifactId>
-                 <version>3.1beta7</version>
-                 <type>jar</type>
-                       <properties>
-                               <war.bundle>${war.bundle}</war.bundle>
-                       </properties>
-               </dependency>
-
-               <dependency>
-                 <groupId>javax.transaction</groupId>
-                 <artifactId>jta</artifactId>
-                 <version>1.0.1B</version>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>3.3.1.GA</version>
                  <type>jar</type>
                        <properties>
                                <war.bundle>${war.bundle}</war.bundle>
                        </properties>
                </dependency>
-
-               <dependency>
-                 <groupId>lucene</groupId>
-                 <artifactId>lucene</artifactId>
-                 <version>1.4.3</version>
-                 <type>jar</type>
-                       <properties>
-                               <war.bundle>${war.bundle}</war.bundle>
-                       </properties>
-               </dependency>
-
                <dependency>
-                 <groupId>springframework</groupId>
-                 <artifactId>spring</artifactId>
-                 <version>1.2.7</version>
-                 <type>jar</type>
-                       <properties>
-                               <war.bundle>${war.bundle}</war.bundle>
-                       </properties>
-               </dependency>
-
-               <dependency>
-                 <groupId>springframework</groupId>
-                 <artifactId>spring-aop</artifactId>
-                 <version>1.2.7</version>
-                 <type>jar</type>
-                       <properties>
-                               <war.bundle>${war.bundle}</war.bundle>
-                       </properties>
-               </dependency>
-
-               <dependency>
-                 <groupId>springframework</groupId>
-                 <artifactId>spring-beans</artifactId>
-                 <version>1.2.7</version>
-                 <type>jar</type>
-                       <properties>
-                               <war.bundle>${war.bundle}</war.bundle>
-                       </properties>
-               </dependency>
-
-               <dependency>
-                 <groupId>springframework</groupId>
-                 <artifactId>spring-context</artifactId>
-                 <version>1.2.7</version>
-                 <type>jar</type>
-                       <properties>
-                               <war.bundle>${war.bundle}</war.bundle>
-                       </properties>
-               </dependency>
-
-               <dependency>
-                 <groupId>springframework</groupId>
-                 <artifactId>spring-core</artifactId>
-                 <version>1.2.7</version>
-                 <type>jar</type>
-                       <properties>
-                               <war.bundle>${war.bundle}</war.bundle>
-                       </properties>
-               </dependency>
-
-               <dependency>
-                 <groupId>springframework</groupId>
-                 <artifactId>spring-dao</artifactId>
-                 <version>1.2.7</version>
+                 <groupId>hibernate</groupId>
+                 <artifactId>hibernate-annotations</artifactId>
+            <version>3.3.0.GA</version>
                  <type>jar</type>
                        <properties>
                                <war.bundle>${war.bundle}</war.bundle>
                        </properties>
                </dependency>
-
                <dependency>
-                 <groupId>springframework</groupId>
-                 <artifactId>spring-hibernate</artifactId>
-                 <version>1.2.7</version>
-                 <type>jar</type>
-                       <properties>
-                               <war.bundle>${war.bundle}</war.bundle>
-                       </properties>
-               </dependency>
-
-               <dependency>
-                 <groupId>springframework</groupId>
-                 <artifactId>spring-jdbc</artifactId>
-                 <version>1.2.7</version>
+            <groupId>hibernate</groupId>
+            <artifactId>hibernate-commons-annotations</artifactId>
+            <version>3.0.0.GA</version>
                  <type>jar</type>
                        <properties>
                                <war.bundle>${war.bundle}</war.bundle>
                        </properties>
                </dependency>
-
                <dependency>
-                 <groupId>springframework</groupId>
-                 <artifactId>spring-mock</artifactId>
-                 <version>1.2.7</version>
+                 <groupId>javax.transaction</groupId>
+                 <artifactId>jta</artifactId>
+                 <version>1.0.1B</version>
                  <type>jar</type>
                        <properties>
                                <war.bundle>${war.bundle}</war.bundle>
                        </properties>
                </dependency>
 
+<!-- Spring dependencies (for Community Module) -->
                <dependency>
                  <groupId>springframework</groupId>
-                 <artifactId>spring-orm</artifactId>
-                 <version>1.2.7</version>
+                 <artifactId>spring</artifactId>
+          <version>2.5.1</version>
                  <type>jar</type>
                        <properties>
                                <war.bundle>${war.bundle}</war.bundle>
                        </properties>
                </dependency>
-
                <dependency>
                  <groupId>springframework</groupId>
-                 <artifactId>spring-remoting</artifactId>
-                 <version>1.2.7</version>
+            <artifactId>spring-test</artifactId>
+            <version>2.5.1</version>
                  <type>jar</type>
                        <properties>
                                <war.bundle>${war.bundle}</war.bundle>
                        </properties>
                </dependency>
-
                <dependency>
                  <groupId>springframework</groupId>
-                 <artifactId>spring-support</artifactId>
-                 <version>1.2.7</version>
+            <artifactId>spring-webmvc-struts</artifactId>
+            <version>2.5.1</version>
                  <type>jar</type>
                        <properties>
                                <war.bundle>${war.bundle}</war.bundle>
                        </properties>
                </dependency>
 
+<!-- Ageci Security dependencies (for Community Module) -->
                <dependency>
-                 <groupId>springframework</groupId>
-                 <artifactId>spring-web</artifactId>
-                 <version>1.2.7</version>
+            <groupId>acegisecurity</groupId>
+            <artifactId>acegi-security</artifactId>
+            <version>1.0.6</version>
                  <type>jar</type>
                        <properties>
                                <war.bundle>${war.bundle}</war.bundle>
                        </properties>
                </dependency>
 
-
-
         <!--begin dependency by JForum portlet.-->
         <dependency>
             <groupId>freemarker</groupId>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to