[portal-commits] JBoss Portal SVN: r11798 - in modules/cms/trunk: build and 1 other directories.

portal-commits at lists.jboss.org portal-commits at lists.jboss.org
Wed Sep 3 16:53:39 EDT 2008


Author: sohil.shah at jboss.com
Date: 2008-09-03 16:53:39 -0400 (Wed, 03 Sep 2008)
New Revision: 11798

Modified:
   modules/cms/trunk/.classpath
   modules/cms/trunk/build/pom.xml
   modules/cms/trunk/cms-jackrabbit/pom.xml
   modules/cms/trunk/pom.xml
Log:
changing snapshot name to trunk-SNAPSHOT (clearer)

Modified: modules/cms/trunk/.classpath
===================================================================
--- modules/cms/trunk/.classpath	2008-09-03 13:53:17 UTC (rev 11797)
+++ modules/cms/trunk/.classpath	2008-09-03 20:53:39 UTC (rev 11798)
@@ -1,10 +1,109 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="cms-jackrabbit/target/classes" path="cms-jackrabbit/src/main/java"/>
-	<classpathentry kind="src" output="cms-jackrabbit/target/test-classes" path="cms-jackrabbit/src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="cms-jackrabbit/target/classes" path="cms-jackrabbit/src/main/resources"/>
-	<classpathentry excluding="**" kind="src" output="cms-jackrabbit/target/test-classes" path="cms-jackrabbit/src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+  <classpathentry kind="src" path="cms-jackrabbit/src/main/java"/>
+  <classpathentry kind="src" path="cms-jackrabbit/src/test/java" output="target/test-classes"/>
+  <classpathentry kind="src" path="cms-jackrabbit/src/main/resources" excluding="**/*.java"/>
+  <classpathentry kind="src" path="cms-jackrabbit/src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ant/ant-nodeps/1.6.5/ant-nodeps-1.6.5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/bsh/bsh/1.3.0/bsh-1.3.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/cargo/cargo-core-uberjar/0.8/cargo-core-uberjar-0.8.jar"/>
+  <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/portal/common/common-common/1.2.0/common-common-1.2.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/cargo/core/0.9-portal/core-0.9-portal.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.4.1/ehcache-1.4.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/hibernate/hibernate3/3.2.4.SP1/hibernate3-3.2.4.SP1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/portal/identity/identity-identity/1.0.2/identity-identity-1.0.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss/4.2.2.GA/jboss-4.2.2.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss/4.0.4.GA/jboss-4.0.4.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR1/jboss-aop-2.0.0.CR1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-common-jdbc-wrapper/4.0.4.GA/jboss-common-jdbc-wrapper-4.0.4.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-container/2.0.0.Beta9/jboss-container-2.0.0.Beta9.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta9/jboss-dependency-2.0.0.Beta9.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-j2ee/4.2.0.GA/jboss-j2ee-4.2.0.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-jca/4.0.4.GA/jboss-jca-4.0.4.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.0.GA/jboss-jmx-4.2.0.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta9/jboss-kernel-2.0.0.Beta9.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-local-jdbc/4.2.2.GA/jboss-local-jdbc-4.2.2.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-jdk/2.0.2.GA/jboss-logging-jdk-2.0.2.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-managed/2.0.0.Beta9/jboss-managed-2.0.0.Beta9.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-metatype/2.0.0.Beta9/jboss-metatype-2.0.0.Beta9.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-system/4.2.2.GA/jboss-system-4.2.2.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-transaction/4.0.4.GA/jboss-transaction-4.0.4.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit/1.2.0.Beta2/jboss-unit-1.2.0.Beta2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-mc/1.2.0.Beta2/jboss-unit-mc-1.2.0.Beta2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-tooling-ant/1.2.0.Beta2/jboss-unit-tooling-ant-1.2.0.Beta2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-tooling-core/1.2.0.Beta2/jboss-unit-tooling-core-1.2.0.Beta2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/cache/jbosscache-core/1.4.1.SP3/jbosscache-core-1.4.1.SP3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jbossha/4.2.2.GA/jbossha-4.2.2.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jbpm/jbpm-jpdl/3.2.2/jbpm-jpdl-3.2.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl104-over-slf4j/1.3.0/jcl104-over-slf4j-1.3.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/sleepycat/je/3.0.12/je-3.0.12.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jgroups/jgroups/2.4.1/jgroups-2.4.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jnpserver/4.0.4.GA/jnpserver-4.0.4.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/net/sf/jsr107cache/jsr107cache/1.0/jsr107cache-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/0.9.4/nekohtml-0.9.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/sun-opends/opends-core/legacy/opends-core-legacy.jar"/>
+  <classpathentry kind="var" path="M2_REPO/pdfbox/pdfbox/0.6.4/pdfbox-0.6.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
+  <classpathentry kind="var" path="M2_REPO/local/portal-core-lib/2.7/portal-core-lib-2.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/local/portal-jems-lib/2.7/portal-jems-lib-2.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/local/portal-search-lib/2.7/portal-search-lib-2.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/local/portal-security-lib/2.7/portal-security-lib-2.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/local/portal-server-lib/2.7/portal-server-lib-2.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/unit/portal-test/1.2.0.Beta2/portal-test-1.2.0.Beta2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/local/portal-workflow-lib/2.7/portal-workflow-lib-2.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/textmining/tm-extractors/0.4/tm-extractors-0.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+</classpath>
\ No newline at end of file

Modified: modules/cms/trunk/build/pom.xml
===================================================================
--- modules/cms/trunk/build/pom.xml	2008-09-03 13:53:17 UTC (rev 11797)
+++ modules/cms/trunk/build/pom.xml	2008-09-03 20:53:39 UTC (rev 11798)
@@ -18,7 +18,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.jboss.portal.cms</groupId>
    <artifactId>module-parent</artifactId>
-   <version>1.1.0-SNAPSHOT</version>
+   <version>trunk-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>JBoss Portal CMS</name>
    <url>http://www.jboss.com/products/jbossmc</url>
@@ -27,8 +27,7 @@
    <properties>
    	  <version.junit>3.8.2</version.junit>
    	  <version.log4j>1.2.14</version.log4j>   	  
-   	  <version.slf4j.api>1.3.0</version.slf4j.api>
-   	  <version.slf4j.simple>1.3.0</version.slf4j.simple>
+   	  <version.slf4j>1.3.0</version.slf4j>
    	  <version.jboss.cache>1.4.1.SP3</version.jboss.cache>
    	  <version.jgroups>2.4.1</version.jgroups>
    	  <version.jboss.hibernate>3.2.4.SP1</version.jboss.hibernate>   	  
@@ -158,14 +157,19 @@
          <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${version.slf4j.api}</version>
+            <version>${version.slf4j}</version>
          </dependency>
          <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>${version.slf4j.simple}</version>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${version.slf4j}</version>
          </dependency>
          <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
+            <version>${version.slf4j}</version>
+         </dependency>
+         <dependency>
             <groupId>org.jboss.cache</groupId>
             <artifactId>jbosscache-core</artifactId>
             <version>${version.jboss.cache}</version>

Modified: modules/cms/trunk/cms-jackrabbit/pom.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/pom.xml	2008-09-03 13:53:17 UTC (rev 11797)
+++ modules/cms/trunk/cms-jackrabbit/pom.xml	2008-09-03 20:53:39 UTC (rev 11798)
@@ -5,7 +5,7 @@
       <groupId>org.jboss.portal.cms</groupId>
       <artifactId>module-parent</artifactId>
       <relativePath>../build/pom.xml</relativePath>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>trunk-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>cms-jackrabbit</artifactId>
@@ -30,18 +30,56 @@
          <artifactId>jackrabbit-core</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.cache</groupId>
-         <artifactId>jbosscache-core</artifactId>
-      </dependency>
+        <groupId>org.jboss.cache</groupId>
+        <artifactId>jbosscache-core</artifactId>        
+     </dependency>
+     <dependency>
+        <groupId>jgroups</groupId>
+        <artifactId>jgroups</artifactId>        
+     </dependency>     
+     <dependency>
+     	<groupId>hibernate</groupId>
+     	<artifactId>hibernate3</artifactId>            
+     </dependency>     
+     <dependency>
+     	<groupId>commons-logging</groupId>
+       	<artifactId>commons-logging</artifactId>        
+     </dependency>                                       
+     <dependency>
+        <groupId>org.jboss.portal.common</groupId>
+        <artifactId>common-common</artifactId>        
+     </dependency>
+     <dependency>
+        <groupId>org.jboss.portal.identity</groupId>
+        <artifactId>identity-identity</artifactId>        
+     </dependency>     
+     <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>        
+     </dependency>
+     <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>        
+     </dependency>
+     <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl104-over-slf4j</artifactId>        
+     </dependency>     
+     <dependency>
+        <groupId>jboss</groupId>
+        <artifactId>jboss-logging-spi</artifactId>        
+     </dependency>
+     <dependency>
+        <groupId>jboss</groupId>
+        <artifactId>jboss-logging-jdk</artifactId>        
+     </dependency>
+     <dependency>
+        <groupId>jboss</groupId>
+        <artifactId>jboss-logging-log4j</artifactId>        
+     </dependency>
+                      
+      <!-- local dependencies -->
       <dependency>
-         <groupId>jgroups</groupId>
-         <artifactId>jgroups</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>hibernate</groupId>
-         <artifactId>hibernate3</artifactId>
-      </dependency>
-      <dependency>
          <groupId>commons-logging</groupId>
          <artifactId>commons-logging</artifactId>
       </dependency>
@@ -64,16 +102,8 @@
       <dependency>
          <groupId>jboss</groupId>
          <artifactId>jboss-logging-log4j</artifactId>
-      </dependency>
+      </dependency>      
       <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-api</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-simple</artifactId>
-      </dependency>
-      <dependency>
          <groupId>apache-log4j</groupId>
          <artifactId>log4j</artifactId>
       </dependency>

Modified: modules/cms/trunk/pom.xml
===================================================================
--- modules/cms/trunk/pom.xml	2008-09-03 13:53:17 UTC (rev 11797)
+++ modules/cms/trunk/pom.xml	2008-09-03 20:53:39 UTC (rev 11798)
@@ -5,7 +5,7 @@
    <artifactId>module-aggregator</artifactId>
    <packaging>pom</packaging>
    <name>JBoss Portal CMS Module</name>
-   <version>1.1.0-SNAPSHOT</version>
+   <version>trunk-SNAPSHOT</version>
    <url>http://labs.jboss.com/jbossportal</url>
 
    <dependencies/>




More information about the portal-commits mailing list