[portal-commits] JBoss Portal SVN: r11787 - in modules/cms/trunk: cms-jackrabbit and 1 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Tue Sep 2 14:55:16 EDT 2008
Author: thomas.heute at jboss.com
Date: 2008-09-02 14:55:16 -0400 (Tue, 02 Sep 2008)
New Revision: 11787
Modified:
modules/cms/trunk/build/pom.xml
modules/cms/trunk/cms-jackrabbit/installLocalDependencies.sh
modules/cms/trunk/cms-jackrabbit/pom.xml
modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-workflow.xml
modules/cms/trunk/cms-jackrabbit/src/test/resources/jbpm-hibernate.cfg.xml
Log:
Removed some dependencies
Modified: modules/cms/trunk/build/pom.xml
===================================================================
--- modules/cms/trunk/build/pom.xml 2008-09-02 15:04:18 UTC (rev 11786)
+++ modules/cms/trunk/build/pom.xml 2008-09-02 18:55:16 UTC (rev 11787)
@@ -32,8 +32,10 @@
<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>
- <version.jboss.logging>2.0.2.GA</version.jboss.logging>
- <version.jboss.jbossas.core-libs>4.0.4.GA</version.jboss.jbossas.core-libs>
+ <version.jbpm>3.2.2</version.jbpm>
+ <version.jboss.jbossas>4.2.2.GA</version.jboss.jbossas>
+ <version.jboss.jdbc-wrapper>4.0.4.GA</version.jboss.jdbc-wrapper>
+ <version.jboss.logging>2.0.2.GA</version.jboss.logging>
<version.dom4j>1.6.1</version.dom4j>
<version.cglib>2.1_3</version.cglib>
<version.hsqldb>1.8.0.2</version.hsqldb>
@@ -209,6 +211,11 @@
<version>${version.dom4j}</version>
</dependency>
<dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-jpdl</artifactId>
+ <version>${version.jbpm}</version>
+ </dependency>
+ <dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>${version.cglib}</version>
@@ -239,14 +246,34 @@
<version>${version.ehcache}</version>
</dependency>
<dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <version>${version.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbossha</artifactId>
+ <version>${version.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss</artifactId>
+ <version>${version.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
<groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jboss-local-jdbc</artifactId>
- <version>${version.jboss.jbossas.core-libs}</version>
+ <version>${version.jboss.jbossas}</version>
</dependency>
<dependency>
<groupId>jboss.jbossas.core-libs</groupId>
+ <artifactId>jboss-local-jdbc</artifactId>
+ <version>${version.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossas.core-libs</groupId>
<artifactId>jboss-common-jdbc-wrapper</artifactId>
- <version>${version.jboss.jbossas.core-libs}</version>
+ <version>${version.jboss.jdbc-wrapper}</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: modules/cms/trunk/cms-jackrabbit/installLocalDependencies.sh
===================================================================
--- modules/cms/trunk/cms-jackrabbit/installLocalDependencies.sh 2008-09-02 15:04:18 UTC (rev 11786)
+++ modules/cms/trunk/cms-jackrabbit/installLocalDependencies.sh 2008-09-02 18:55:16 UTC (rev 11787)
@@ -4,24 +4,4 @@
mvn install:install-file -DgroupId=local -DartifactId=portal-security-lib -Dversion=2.7 -Dpackaging=jar -Dfile=local/jboss-portal/2.7/portal-security-lib.jar
mvn install:install-file -DgroupId=local -DartifactId=portal-server-lib -Dversion=2.7 -Dpackaging=jar -Dfile=local/jboss-portal/2.7/portal-server-lib.jar
mvn install:install-file -DgroupId=local -DartifactId=portal-workflow-lib -Dversion=2.7 -Dpackaging=jar -Dfile=local/jboss-portal/2.7/portal-workflow-lib.jar
-mvn install:install-file -DgroupId=local -DartifactId=portal-test-generic-lib -Dversion=2.7 -Dpackaging=jar -Dfile=local/jboss-portal/2.7/portal-test-generic-lib.jar
-mvn install:install-file -DgroupId=local -DartifactId=portal-test-jboss-lib -Dversion=2.7 -Dpackaging=jar -Dfile=local/jboss-portal/2.7/portal-test-jboss-lib.jar
-mvn install:install-file -DgroupId=local -DartifactId=portal-test-lib -Dversion=2.7 -Dpackaging=jar -Dfile=local/jboss-portal/2.7/portal-test-lib.jar
-mvn install:install-file -DgroupId=local -DartifactId=jbpm-identity -Dversion=3.2.GA -Dpackaging=jar -Dfile=local/jbpm/3.2.GA/jbpm-identity.jar
-mvn install:install-file -DgroupId=local -DartifactId=jbpm-jpdl -Dversion=3.2.GA -Dpackaging=jar -Dfile=local/jbpm/3.2.GA/jbpm-jpdl.jar
-
-mvn install:install-file -DgroupId=local -DartifactId=jboss -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss.jar
-mvn install:install-file -DgroupId=local -DartifactId=jboss-common -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-common.jar
-mvn install:install-file -DgroupId=local -DartifactId=jboss-common-jdbc-wrapper -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-common-jdbc-wrapper.jar
-mvn install:install-file -DgroupId=local -DartifactId=jboss-container -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-container.jar
-mvn install:install-file -DgroupId=local -DartifactId=jboss-dependency -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-dependency.jar
-mvn install:install-file -DgroupId=local -DartifactId=jbossha -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jbossha.jar
-mvn install:install-file -DgroupId=local -DartifactId=jboss-jca -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-jca.jar
-mvn install:install-file -DgroupId=local -DartifactId=jboss-local-jdbc -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-local-jdbc.jar
-mvn install:install-file -DgroupId=local -DartifactId=jboss-microcontainer -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-microcontainer.jar
-mvn install:install-file -DgroupId=local -DartifactId=jboss-system -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-system.jar
-mvn install:install-file -DgroupId=local -DartifactId=jboss-transaction -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-transaction.jar
-mvn install:install-file -DgroupId=local -DartifactId=jboss-xml-binding -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-xml-binding.jar
-mvn install:install-file -DgroupId=local -DartifactId=jnp-client -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jnp-client.jar
-mvn install:install-file -DgroupId=local -DartifactId=jnpserver -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jnpserver.jar
Modified: modules/cms/trunk/cms-jackrabbit/pom.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/pom.xml 2008-09-02 15:04:18 UTC (rev 11786)
+++ modules/cms/trunk/cms-jackrabbit/pom.xml 2008-09-02 18:55:16 UTC (rev 11787)
@@ -1,5 +1,6 @@
-<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">
+<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.jboss.portal.cms</groupId>
<artifactId>module-parent</artifactId>
@@ -10,82 +11,73 @@
<artifactId>cms-jackrabbit</artifactId>
<packaging>jar</packaging>
<name>JBoss Portal CMS based on JackRabbit 1.4</name>
-
+
<!--
- Deals with dependencies not yet found in remote maven repositories
- TODO: need to clean/sort this out. For now use the installLocalDependencies.sh script
+ Deals with dependencies not yet found in remote maven repositories
+ TODO: need to clean/sort this out. For now use the installLocalDependencies.sh script
-->
<properties>
- <local.version.jboss.portal>2.7</local.version.jboss.portal>
- <local.version.jbpm>3.2.GA</local.version.jbpm>
- <local.version.jboss.as>4.0.4.GA</local.version.jboss.as>
+ <local.version.jboss.portal>2.7</local.version.jboss.portal>
</properties>
<dependencies>
<dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
</dependency>
-
<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>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>
-
-
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ </dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
</dependency>
- <dependency>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</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>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>
+ <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>
+
<!-- local dependencies -->
<dependency>
<groupId>local</groupId>
@@ -112,36 +104,25 @@
<artifactId>portal-server-lib</artifactId>
<version>${local.version.jboss.portal}</version>
</dependency>
-
<dependency>
- <groupId>local</groupId>
- <artifactId>jbpm-identity</artifactId>
- <version>${local.version.jbpm}</version>
- </dependency>
- <dependency>
- <groupId>local</groupId>
+ <groupId>org.jbpm</groupId>
<artifactId>jbpm-jpdl</artifactId>
- <version>${local.version.jbpm}</version>
</dependency>
-
<dependency>
- <groupId>local</groupId>
+ <groupId>jboss</groupId>
<artifactId>jboss-system</artifactId>
- <version>${local.version.jboss.as}</version>
</dependency>
<dependency>
- <groupId>local</groupId>
+ <groupId>jboss</groupId>
+ <artifactId>jbossha</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
<artifactId>jboss</artifactId>
- <version>${local.version.jboss.as}</version>
</dependency>
+
+ <!--TEST SCOPE-->
<dependency>
- <groupId>local</groupId>
- <artifactId>jbossha</artifactId>
- <version>${local.version.jboss.as}</version>
- </dependency>
-
- <!--TEST SCOPE-->
- <dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
<scope>test</scope>
@@ -168,48 +149,46 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>jboss.jbossas.core-libs</groupId>
- <artifactId>jboss-local-jdbc</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.jbossas.core-libs</groupId>
- <artifactId>jboss-common-jdbc-wrapper</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
- <groupId>bsh</groupId>
- <artifactId>bsh</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <scope>test</scope>
- </dependency>
+ <groupId>jboss.jbossas.core-libs</groupId>
+ <artifactId>jboss-local-jdbc</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
+ <groupId>jboss.jbossas.core-libs</groupId>
+ <artifactId>jboss-common-jdbc-wrapper</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>bsh</groupId>
+ <artifactId>bsh</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>local</groupId>
<artifactId>portal-core-lib</artifactId>
<version>${local.version.jboss.portal}</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
-
-
</dependencies>
<build>
@@ -238,13 +217,15 @@
<configuration>
<tasks>
- <property name="compile_classpath" refid="maven.compile.classpath"/>
- <property name="runtime_classpath" refid="maven.runtime.classpath"/>
- <property name="test_classpath" refid="maven.test.classpath"/>
- <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+ <property name="compile_classpath"
+ refid="maven.compile.classpath" />
+ <property name="runtime_classpath"
+ refid="maven.runtime.classpath" />
+ <property name="test_classpath" refid="maven.test.classpath" />
+ <property name="plugin_classpath" refid="maven.plugin.classpath" />
<ant antfile="${basedir}/build.xml">
- <target name="test"/>
+ <target name="test" />
</ant>
</tasks>
@@ -255,50 +236,50 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>testSuiteCleanupBeforeCompile</id>
- <phase>compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <delete dir="repotest"/>
- <delete dir="repotest-hsqldb"/>
- <delete file="test.properties"/>
- <delete file="test.script"/>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>testCleanupAfterTest</id>
- <phase>test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <delete dir="repotest"/>
- <delete dir="repotest-hsqldb"/>
- <delete file="test.properties"/>
- <delete file="test.script"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgument>-nowarn</compilerArgument>
- </configuration>
- </plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>testSuiteCleanupBeforeCompile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete dir="repotest" />
+ <delete dir="repotest-hsqldb" />
+ <delete file="test.properties" />
+ <delete file="test.script" />
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <id>testCleanupAfterTest</id>
+ <phase>test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete dir="repotest" />
+ <delete dir="repotest-hsqldb" />
+ <delete file="test.properties" />
+ <delete file="test.script" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArgument>-nowarn</compilerArgument>
+ </configuration>
+ </plugin>
</plugins>
- </build>
- </project>
+ </build>
+</project>
Modified: modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-workflow.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-workflow.xml 2008-09-02 15:04:18 UTC (rev 11786)
+++ modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-workflow.xml 2008-09-02 18:55:16 UTC (rev 11787)
@@ -65,9 +65,11 @@
<value>domain.hbm.xml</value>
<value>domain-identity.hbm.xml</value>
<value>org/jbpm/graph/action/Script.hbm.xml</value>
+<!--
<value>org/jbpm/identity/User.hbm.xml</value>
<value>org/jbpm/identity/Group.hbm.xml</value>
<value>org/jbpm/identity/Membership.hbm.xml</value>
+ -->
<value>org/jbpm/db/hibernate.queries.hbm.xml</value>
<value>org/jbpm/graph/action/MailAction.hbm.xml</value>
<value>org/jbpm/graph/def/ProcessDefinition.hbm.xml</value>
Modified: modules/cms/trunk/cms-jackrabbit/src/test/resources/jbpm-hibernate.cfg.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/resources/jbpm-hibernate.cfg.xml 2008-09-02 15:04:18 UTC (rev 11786)
+++ modules/cms/trunk/cms-jackrabbit/src/test/resources/jbpm-hibernate.cfg.xml 2008-09-02 18:55:16 UTC (rev 11787)
@@ -43,10 +43,12 @@
<!-- Uncomment the following 3 lines if you -->
<!-- want to use the jBPM identity mgmgt -->
<!-- component. -->
- <!-- identity mappings (begin) -->
+ <!-- identity mappings (begin) -->
+ <!--
<mapping resource="org/jbpm/identity/User.hbm.xml"/>
<mapping resource="org/jbpm/identity/Group.hbm.xml"/>
- <mapping resource="org/jbpm/identity/Membership.hbm.xml"/>
+ <mapping resource="org/jbpm/identity/Membership.hbm.xml"/>
+ -->
<!-- identity mappings (end) -->
<!-- following mapping files have a dependendy on -->
More information about the portal-commits
mailing list