exo-jcr SVN: r4107 - parent/tags.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-03-17 09:37:26 -0400 (Thu, 17 Mar 2011)
New Revision: 4107
Added:
parent/tags/8/
Log:
[maven-scm] copy for tag 8
15 years, 1 month
exo-jcr SVN: r4106 - parent/trunk.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-03-17 09:37:04 -0400 (Thu, 17 Mar 2011)
New Revision: 4106
Modified:
parent/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 8
Modified: parent/trunk/pom.xml
===================================================================
--- parent/trunk/pom.xml 2011-03-17 11:52:36 UTC (rev 4105)
+++ parent/trunk/pom.xml 2011-03-17 13:37:04 UTC (rev 4106)
@@ -1,565 +1,565 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>5</version>
- </parent>
- <groupId>org.exoplatform</groupId>
- <artifactId>foundation-parent</artifactId>
- <version>8-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>eXo JBoss Parent</name>
-
- <organization>
- <name>eXo Platform SAS</name>
- <url>http://www.exoplatform.com</url>
- </organization>
-
- <licenses>
- <license>
- <name>LGPL, version 2.1</name>
- <url>http://www.opensource.org/licenses/lgpl-license.php</url>
- </license>
- </licenses>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/parent/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/parent/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/parent/trunk</url>
- </scm>
-
- <!-- Hudson to parse poms before the build do not use our settings -->
- <repositories>
- <repository>
- <id>repository.jboss.com</id>
- <url>http://repository.jboss.com/maven2</url>
- </repository>
- <repository>
- <id>exo-int</id>
- <name>exoplatform.org internal repository</name>
- <url>http://maven2.exoplatform.org/rest/maven2</url>
- </repository>
- <repository>
- <id>repo.jfrog.org-releases</id>
- <name>repo.jfrog.org-releases</name>
- <url>http://repo.jfrog.org/artifactory/plugins-releases-local</url>
- </repository>
- <repository>
- <id>download.java.net</id>
- <name>download.java.net repository</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.com</id>
- <url>http://repository.jboss.com/maven2</url>
- </pluginRepository>
- <pluginRepository>
- <id>exo-int</id>
- <name>exoplatform.org internal repository</name>
- <url>http://maven2.exoplatform.org/rest/maven2</url>
- </pluginRepository>
- <pluginRepository>
- <id>repo.jfrog.org-releases</id>
- <name>repo.jfrog.org-releases</name>
- <url>http://repo.jfrog.org/artifactory/plugins-releases-local</url>
- </pluginRepository>
- <pluginRepository>
- <id>download.java.net</id>
- <name>download.java.net repository</name>
- <url>http://download.java.net/maven/2</url>
- </pluginRepository>
- <!-- Used for maven-license-plugin -->
- <pluginRepository>
- <id>mc-release</id>
- <name>Local Maven repository of releases</name>
- <url>http://mc-repo.googlecode.com/svn/maven2/releases</url>
- </pluginRepository>
- </pluginRepositories>
-
- <properties>
- <exo.projects.directory.base>D:/java</exo.projects.directory.base>
- <exo.projects.directory.dependencies>${exo.projects.directory.base}/exo-dependencies</exo.projects.directory.dependencies>
- <exo.projects.directory.working>${exo.projects.directory.base}/exo-working</exo.projects.directory.working>
-
- <exo.projects.app.mvn.repo>${exo.projects.directory.dependencies}/repository</exo.projects.app.mvn.repo>
-
- <exo.projects.app.tomcat.version>tomcat-6.0.24</exo.projects.app.tomcat.version>
- <exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version>
- <exo.projects.app.jonas.version>JONAS_4_8_5</exo.projects.app.jonas.version>
-
- <exo.dev.resources.version>1.2.0</exo.dev.resources.version>
-
- <exo.product.name>eXo Platform</exo.product.name>
- <exo.product.specification>N/A</exo.product.specification>
-
- <!-- Default tests settings -->
- <maven.test.skip>false</maven.test.skip>
- <forkMode>once</forkMode>
- <maven.test.failure.ignore>false</maven.test.failure.ignore>
- <surefire.useFile>true</surefire.useFile>
- <!-- maven-clover2-plugin -->
- <!-- where snapshots are stored to use clover optimization -->
- <maven.clover.snapshot>${user.home}/.clover/${project.groupId}-${project.artifactId}/clover.snapshot</maven.clover.snapshot>
- <!-- where historical data are stored -->
- <maven.clover.historyDir>${user.home}/.clover/${project.groupId}-${project.artifactId}/clover.history</maven.clover.historyDir>
- <!-- Defaut compiler settings -->
- <maven.compiler.optimize>true</maven.compiler.optimize>
- <maven.compiler.source>1.5</maven.compiler.source>
- <maven.compiler.target>1.5</maven.compiler.target>
- <!-- maven-enforcer-plugin -->
- <!-- Java 6 is required to build our projects -->
- <jdk.min.version>1.6</jdk.min.version>
-
- <!-- Encoding used for files in the project -->
- <!-- Standard property supported by many plugins : compiler, resources, ... -->
- <!-- Will be an entry in the POM in the future -->
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <!-- maven-release-plugin settings -->
- <arguments>-Prelease -DskipTests</arguments>
- <autoVersionSubmodules>true</autoVersionSubmodules>
-
- <!-- Plugins versions are defined in properties to reuse them between build and reporting parts if necessary -->
- <version.animalsniffer.plugin>1.2</version.animalsniffer.plugin>
- <version.clover2.plugin>2.6.3</version.clover2.plugin>
- <version.jibx.plugin>1.2.2</version.jibx.plugin>
- <version.javacc.plugin>2.5</version.javacc.plugin>
- <version.jaxb2.plugin>0.1</version.jaxb2.plugin>
-
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <!-- Use the same version of JUnit everywhere -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.jvnet</groupId>
- <artifactId>animal-sniffer</artifactId>
- <version>${version.animalsniffer.plugin}</version>
- </plugin>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>${version.clover2.plugin}</version>
- </plugin>
- <plugin>
- <groupId>org.jibx</groupId>
- <artifactId>maven-jibx-plugin</artifactId>
- <version>${version.jibx.plugin}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <SCM-URL>${project.scm.connection}</SCM-URL>
- <Specification-Title>${exo.product.name}</Specification-Title>
- <Specification-Version>${exo.product.specification}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>${version.javacc.plugin}</version>
- </plugin>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <version>${version.jaxb2.plugin}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <SCM-URL>${project.scm.connection}</SCM-URL>
- <Specification-Title>${exo.product.name}</Specification-Title>
- <Specification-Version>${exo.product.specification}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <!-- Override default reports from JBoss to use properties for plugins versions -->
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${version.pir.plugin}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${version.javadoc.plugin}</version>
- <configuration>
- <aggregate>true</aggregate>
- <reportOutputDirectory>${project.build.directory}/javadoc</reportOutputDirectory>
- <maxmemory>512m</maxmemory>
- <minmemory>256m</minmemory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${version.surefire.plugin}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>${version.taglist.plugin}</version>
- </plugin>
- </plugins>
- </reporting>
-
- <profiles>
- <profile>
- <id>checkstyle</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${version.checkstyle.plugin}</version>
- <dependencies>
- <dependency>
- <groupId>org.exoplatform.tool</groupId>
- <artifactId>dev-resources</artifactId>
- <version>${exo.dev.resources.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${version.checkstyle.plugin}</version>
- <configuration>
- <violationSeverity>warning</violationSeverity>
- <configLocation>checkstyle/codestyle.xml</configLocation>
- <headerLocation>checkstyle/java.header</headerLocation>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- <profile>
- <id>release</id>
- <build>
- <pluginManagement>
- <plugins>
- <!-- Manifest management -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <SCM-Revision>${buildNumber}</SCM-Revision>
- <SCM-URL>${project.scm.connection}</SCM-URL>
- <Specification-Title>${exo.product.name}</Specification-Title>
- <Specification-Version>${exo.product.specification}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
-
- <!-- Manifest management -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <SCM-Revision>${buildNumber}</SCM-Revision>
- <SCM-URL>${project.scm.connection}</SCM-URL>
- <Specification-Title>${exo.product.name}</Specification-Title>
- <Specification-Version>${exo.product.specification}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-enforcer-rule</artifactId>
- <version>1.5</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>check-java15</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <checkSignatureRule implementation="org.codehaus.mojo.animal_sniffer.enforcer.CheckSignatureRule">
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java15</artifactId>
- <version>1.0</version>
- </signature>
- <ignoreDependencies>true</ignoreDependencies>
- </checkSignatureRule>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>tomcat-server</id>
- <activation>
- <property>
- <name>tomcat</name>
- </property>
- <activeByDefault>false</activeByDefault>
- </activation>
- </profile>
- <profile>
- <id>jboss-server</id>
- <activation>
- <property>
- <name>jboss-server</name>
- </property>
- <activeByDefault>false</activeByDefault>
- </activation>
- </profile>
- <profile>
- <id>jonas-server</id>
- <activation>
- <property>
- <name>jonas-server</name>
- </property>
- <activeByDefault>false</activeByDefault>
- </activation>
- </profile>
- <profile>
- <id>jmeter-perftest</id>
- <activation>
- <property>
- <name>jmeter-perftest</name>
- </property>
- <activeByDefault>false</activeByDefault>
- </activation>
- </profile>
-
- <!-- Tests coverage with emma -->
- <profile>
- <id>emma</id>
- <properties>
- <maven.test.failure.ignore>true</maven.test.failure.ignore>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>emma.coverage.out.file</name>
- <value>target/emma/coverage.ec</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>emma1</id>
- <phase>test-compile</phase>
- <configuration>
- <tasks if="emma.run">
- <echo message="[EMMA] Start classes instrumentation ..." />
- <taskdef resource="emma_ant.properties" classpathref="maven.dependency.classpath" />
- <mkdir dir="target" />
- <mkdir dir="target/classes" />
- <mkdir dir="target/emma/classes" />
- <!-- Do nothing if the directory already exist-->
- <copy todir="target/emma/classes" verbose="false" overwrite="true">
- <fileset dir="target/classes" />
- </copy>
- <emma enabled="true">
- <instr mode="overwrite" metadatafile="target/emma/metadata.em">
- <filter excludes="*.xml.*" />
- <filter excludes="*JiBX*" />
- <filter excludes="*Entry*" />
- <filter excludes="*Value*" />
- <filter excludes="*RepositoryServiceConfiguration*" />
- <filter excludes="*.query*" />
-
- <instrpath>
- <dirset dir="target">
- <include name="emma/classes" />
- </dirset>
- </instrpath>
- </instr>
- </emma>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>emma2</id>
- <phase>test</phase>
- <configuration>
- <tasks if="emma.run">
- <echo message="[EMMA] Start report generation..." />
- <taskdef resource="emma_ant.properties" classpathref="maven.dependency.classpath" />
- <emma enabled="true">
- <!-- merged file will be rewritted by last project -->
- <merge outfile="target/coverage.es">
- <fileset dir=".">
- <include name="**/target/emma/*.e*" />
- <include name="**/target/emma/*.e*" />
- </fileset>
- </merge>
- <report>
- <sourcepath>
- <dirset dir=".">
- <include name="**/src/**/java" />
- </dirset>
- </sourcepath>
- <fileset dir="target/">
- <include name="*.es" />
- </fileset>
- <html outfile="target/coverage.html" />
- <xml outfile="target/coverage.xml" />
- </report>
- </emma>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>emma</groupId>
- <artifactId>emma</artifactId>
- <version>2.0.5312</version>
- </dependency>
- <dependency>
- <groupId>emma</groupId>
- <artifactId>emma_ant</artifactId>
- <version>2.0.5312</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>emma</groupId>
- <artifactId>emma</artifactId>
- <version>2.0.5312</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-</project>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>5</version>
+ </parent>
+ <groupId>org.exoplatform</groupId>
+ <artifactId>foundation-parent</artifactId>
+ <version>8</version>
+ <packaging>pom</packaging>
+
+ <name>eXo JBoss Parent</name>
+
+ <organization>
+ <name>eXo Platform SAS</name>
+ <url>http://www.exoplatform.com</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>LGPL, version 2.1</name>
+ <url>http://www.opensource.org/licenses/lgpl-license.php</url>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/parent/tags/8</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/parent/tags/8</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/parent/tags/8</url>
+ </scm>
+
+ <!-- Hudson to parse poms before the build do not use our settings -->
+ <repositories>
+ <repository>
+ <id>repository.jboss.com</id>
+ <url>http://repository.jboss.com/maven2</url>
+ </repository>
+ <repository>
+ <id>exo-int</id>
+ <name>exoplatform.org internal repository</name>
+ <url>http://maven2.exoplatform.org/rest/maven2</url>
+ </repository>
+ <repository>
+ <id>repo.jfrog.org-releases</id>
+ <name>repo.jfrog.org-releases</name>
+ <url>http://repo.jfrog.org/artifactory/plugins-releases-local</url>
+ </repository>
+ <repository>
+ <id>download.java.net</id>
+ <name>download.java.net repository</name>
+ <url>http://download.java.net/maven/2</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repository.jboss.com</id>
+ <url>http://repository.jboss.com/maven2</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>exo-int</id>
+ <name>exoplatform.org internal repository</name>
+ <url>http://maven2.exoplatform.org/rest/maven2</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>repo.jfrog.org-releases</id>
+ <name>repo.jfrog.org-releases</name>
+ <url>http://repo.jfrog.org/artifactory/plugins-releases-local</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>download.java.net</id>
+ <name>download.java.net repository</name>
+ <url>http://download.java.net/maven/2</url>
+ </pluginRepository>
+ <!-- Used for maven-license-plugin -->
+ <pluginRepository>
+ <id>mc-release</id>
+ <name>Local Maven repository of releases</name>
+ <url>http://mc-repo.googlecode.com/svn/maven2/releases</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <properties>
+ <exo.projects.directory.base>D:/java</exo.projects.directory.base>
+ <exo.projects.directory.dependencies>${exo.projects.directory.base}/exo-dependencies</exo.projects.directory.dependencies>
+ <exo.projects.directory.working>${exo.projects.directory.base}/exo-working</exo.projects.directory.working>
+
+ <exo.projects.app.mvn.repo>${exo.projects.directory.dependencies}/repository</exo.projects.app.mvn.repo>
+
+ <exo.projects.app.tomcat.version>tomcat-6.0.24</exo.projects.app.tomcat.version>
+ <exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version>
+ <exo.projects.app.jonas.version>JONAS_4_8_5</exo.projects.app.jonas.version>
+
+ <exo.dev.resources.version>1.2.0</exo.dev.resources.version>
+
+ <exo.product.name>eXo Platform</exo.product.name>
+ <exo.product.specification>N/A</exo.product.specification>
+
+ <!-- Default tests settings -->
+ <maven.test.skip>false</maven.test.skip>
+ <forkMode>once</forkMode>
+ <maven.test.failure.ignore>false</maven.test.failure.ignore>
+ <surefire.useFile>true</surefire.useFile>
+ <!-- maven-clover2-plugin -->
+ <!-- where snapshots are stored to use clover optimization -->
+ <maven.clover.snapshot>${user.home}/.clover/${project.groupId}-${project.artifactId}/clover.snapshot</maven.clover.snapshot>
+ <!-- where historical data are stored -->
+ <maven.clover.historyDir>${user.home}/.clover/${project.groupId}-${project.artifactId}/clover.history</maven.clover.historyDir>
+ <!-- Defaut compiler settings -->
+ <maven.compiler.optimize>true</maven.compiler.optimize>
+ <maven.compiler.source>1.5</maven.compiler.source>
+ <maven.compiler.target>1.5</maven.compiler.target>
+ <!-- maven-enforcer-plugin -->
+ <!-- Java 6 is required to build our projects -->
+ <jdk.min.version>1.6</jdk.min.version>
+
+ <!-- Encoding used for files in the project -->
+ <!-- Standard property supported by many plugins : compiler, resources, ... -->
+ <!-- Will be an entry in the POM in the future -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <!-- maven-release-plugin settings -->
+ <arguments>-Prelease -DskipTests</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+
+ <!-- Plugins versions are defined in properties to reuse them between build and reporting parts if necessary -->
+ <version.animalsniffer.plugin>1.2</version.animalsniffer.plugin>
+ <version.clover2.plugin>2.6.3</version.clover2.plugin>
+ <version.jibx.plugin>1.2.2</version.jibx.plugin>
+ <version.javacc.plugin>2.5</version.javacc.plugin>
+ <version.jaxb2.plugin>0.1</version.jaxb2.plugin>
+
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Use the same version of JUnit everywhere -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.jvnet</groupId>
+ <artifactId>animal-sniffer</artifactId>
+ <version>${version.animalsniffer.plugin}</version>
+ </plugin>
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <version>${version.clover2.plugin}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.jibx</groupId>
+ <artifactId>maven-jibx-plugin</artifactId>
+ <version>${version.jibx.plugin}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <SCM-URL>${project.scm.connection}</SCM-URL>
+ <Specification-Title>${exo.product.name}</Specification-Title>
+ <Specification-Version>${exo.product.specification}</Specification-Version>
+ <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>${version.javacc.plugin}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ <version>${version.jaxb2.plugin}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <SCM-URL>${project.scm.connection}</SCM-URL>
+ <Specification-Title>${exo.product.name}</Specification-Title>
+ <Specification-Version>${exo.product.specification}</Specification-Version>
+ <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <!-- Override default reports from JBoss to use properties for plugins versions -->
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${version.pir.plugin}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${version.javadoc.plugin}</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ <reportOutputDirectory>${project.build.directory}/javadoc</reportOutputDirectory>
+ <maxmemory>512m</maxmemory>
+ <minmemory>256m</minmemory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${version.surefire.plugin}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>${version.taglist.plugin}</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>checkstyle</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${version.checkstyle.plugin}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.exoplatform.tool</groupId>
+ <artifactId>dev-resources</artifactId>
+ <version>${exo.dev.resources.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${version.checkstyle.plugin}</version>
+ <configuration>
+ <violationSeverity>warning</violationSeverity>
+ <configLocation>checkstyle/codestyle.xml</configLocation>
+ <headerLocation>checkstyle/java.header</headerLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ <profile>
+ <id>release</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- Manifest management -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <SCM-Revision>${buildNumber}</SCM-Revision>
+ <SCM-URL>${project.scm.connection}</SCM-URL>
+ <Specification-Title>${exo.product.name}</Specification-Title>
+ <Specification-Version>${exo.product.specification}</Specification-Version>
+ <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <!-- Manifest management -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <SCM-Revision>${buildNumber}</SCM-Revision>
+ <SCM-URL>${project.scm.connection}</SCM-URL>
+ <Specification-Title>${exo.product.name}</Specification-Title>
+ <Specification-Version>${exo.product.specification}</Specification-Version>
+ <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-enforcer-rule</artifactId>
+ <version>1.5</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>check-java15</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <checkSignatureRule implementation="org.codehaus.mojo.animal_sniffer.enforcer.CheckSignatureRule">
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>java15</artifactId>
+ <version>1.0</version>
+ </signature>
+ <ignoreDependencies>true</ignoreDependencies>
+ </checkSignatureRule>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>tomcat-server</id>
+ <activation>
+ <property>
+ <name>tomcat</name>
+ </property>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>jboss-server</id>
+ <activation>
+ <property>
+ <name>jboss-server</name>
+ </property>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>jonas-server</id>
+ <activation>
+ <property>
+ <name>jonas-server</name>
+ </property>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>jmeter-perftest</id>
+ <activation>
+ <property>
+ <name>jmeter-perftest</name>
+ </property>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ </profile>
+
+ <!-- Tests coverage with emma -->
+ <profile>
+ <id>emma</id>
+ <properties>
+ <maven.test.failure.ignore>true</maven.test.failure.ignore>
+ </properties>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>emma.coverage.out.file</name>
+ <value>target/emma/coverage.ec</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>emma1</id>
+ <phase>test-compile</phase>
+ <configuration>
+ <tasks if="emma.run">
+ <echo message="[EMMA] Start classes instrumentation ..." />
+ <taskdef resource="emma_ant.properties" classpathref="maven.dependency.classpath" />
+ <mkdir dir="target" />
+ <mkdir dir="target/classes" />
+ <mkdir dir="target/emma/classes" />
+ <!-- Do nothing if the directory already exist-->
+ <copy todir="target/emma/classes" verbose="false" overwrite="true">
+ <fileset dir="target/classes" />
+ </copy>
+ <emma enabled="true">
+ <instr mode="overwrite" metadatafile="target/emma/metadata.em">
+ <filter excludes="*.xml.*" />
+ <filter excludes="*JiBX*" />
+ <filter excludes="*Entry*" />
+ <filter excludes="*Value*" />
+ <filter excludes="*RepositoryServiceConfiguration*" />
+ <filter excludes="*.query*" />
+
+ <instrpath>
+ <dirset dir="target">
+ <include name="emma/classes" />
+ </dirset>
+ </instrpath>
+ </instr>
+ </emma>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>emma2</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks if="emma.run">
+ <echo message="[EMMA] Start report generation..." />
+ <taskdef resource="emma_ant.properties" classpathref="maven.dependency.classpath" />
+ <emma enabled="true">
+ <!-- merged file will be rewritted by last project -->
+ <merge outfile="target/coverage.es">
+ <fileset dir=".">
+ <include name="**/target/emma/*.e*" />
+ <include name="**/target/emma/*.e*" />
+ </fileset>
+ </merge>
+ <report>
+ <sourcepath>
+ <dirset dir=".">
+ <include name="**/src/**/java" />
+ </dirset>
+ </sourcepath>
+ <fileset dir="target/">
+ <include name="*.es" />
+ </fileset>
+ <html outfile="target/coverage.html" />
+ <xml outfile="target/coverage.xml" />
+ </report>
+ </emma>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>emma</groupId>
+ <artifactId>emma</artifactId>
+ <version>2.0.5312</version>
+ </dependency>
+ <dependency>
+ <groupId>emma</groupId>
+ <artifactId>emma_ant</artifactId>
+ <version>2.0.5312</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>emma</groupId>
+ <artifactId>emma</artifactId>
+ <version>2.0.5312</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+</project>
15 years, 1 month
exo-jcr SVN: r4105 - in jcr/trunk: exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration and 1 other directory.
by do-not-reply@jboss.org
Author: nfilotto
Date: 2011-03-17 07:52:36 -0400 (Thu, 17 Mar 2011)
New Revision: 4105
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml
Log:
EXOJCR-1254: Add a mode that throws an Exception when we use a session that is not alive anymore.
To enable the mode simply set the system property exo.jcr.prohibit.closed.session.usage to true
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java 2011-03-17 10:14:45 UTC (rev 4104)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java 2011-03-17 11:52:36 UTC (rev 4105)
@@ -108,6 +108,19 @@
*/
private static Log log = ExoLogger.getLogger("exo.jcr.component.core.SessionImpl");
+ /**
+ * Indicates if it must fail in case we use a closed session.
+ */
+ private static final boolean PROHIBIT_CLOSED_SESSION_USAGE =
+ Boolean.valueOf(PropertyManager.getProperty("exo.jcr.prohibit.closed.session.usage"));
+ static
+ {
+ if (PROHIBIT_CLOSED_SESSION_USAGE)
+ {
+ log.info("The JCR will throw an exception anytime we will try to use a dead session.");
+ }
+ }
+
public static final int DEFAULT_LAZY_READ_THRESHOLD = 100;
private final RepositoryImpl repository;
@@ -135,6 +148,8 @@
protected final String workspaceName;
private boolean live;
+
+ private Exception closedByCallStack;
private final List<SessionLifecycleListener> lifecycleListeners;
@@ -877,13 +892,17 @@
{
if (!live)
{
+ if (PROHIBIT_CLOSED_SESSION_USAGE)
+ {
+ throw new RepositoryException("This kind of operation is forbidden after a session.logout().", closedByCallStack);
+ }
// warn in debug mode only
- if (PropertyManager.isDevelopping())
+ else if (PropertyManager.isDevelopping())
{
log
.warn(
"This kind of operation is forbidden after a session.logout(), please note that an exception will be raised in the next jcr version.",
- new Exception());
+ new Exception(closedByCallStack));
}
}
}
@@ -917,6 +936,10 @@
}
this.sessionRegistry.unregisterSession(getId());
this.live = false;
+ if (PROHIBIT_CLOSED_SESSION_USAGE || PropertyManager.isDevelopping())
+ {
+ this.closedByCallStack = new Exception("The session has been closed by the following call stack");
+ }
}
/**
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml 2011-03-17 10:14:45 UTC (rev 4104)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml 2011-03-17 11:52:36 UTC (rev 4105)
@@ -434,4 +434,42 @@
<!ELEMENT properties (property+)>
<!ELEMENT property EMPTY></programlisting>
</section>
+
+ <section>
+ <title>Help application to prohibit the use of closed sessions</title>
+
+ <para>Products that use eXo JCR, sometimes missuse it since they continue
+ to use a session that has been closed through a method call on a node, a
+ property or even the session itself. To prevent bad practices we propose
+ three modes which are the folllowing:</para>
+
+ <orderedlist>
+ <listitem>
+ <para>If the system property
+ <emphasis>exo.jcr.prohibit.closed.session.usage</emphasis> has been
+ set to <emphasis>true</emphasis>, then a RepositoryException will be
+ thrown any time an application will try to access to a closed session.
+ In the stack trace, you will be able to know the call stack that
+ closes the session.</para>
+ </listitem>
+
+ <listitem>
+ <para>If the system property
+ <emphasis>exo.jcr.prohibit.closed.session.usage</emphasis> has not
+ been set and the system property
+ <emphasis>exo.product.developing</emphasis> has been set to
+ <emphasis>true</emphasis>, then a warning will be logged in the log
+ file with the full stack trace in order to help identifying the root
+ cause of the issue. In the stack trace, you will be able to know the
+ call stack that closes the session.</para>
+ </listitem>
+
+ <listitem>
+ <para>If none of the previous system properties have been set, then we
+ will ignore that the issue and let the application use the closed
+ session as it was possible before without doing anything in order to
+ allow applications to migrate step by step.</para>
+ </listitem>
+ </orderedlist>
+ </section>
</chapter>
15 years, 1 month
exo-jcr SVN: r4104 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn.
by do-not-reply@jboss.org
Author: nzamosenchuk
Date: 2011-03-17 06:14:45 -0400 (Thu, 17 Mar 2011)
New Revision: 4104
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/LocalIndexChangesFilter.java
Log:
EXOJCR-834 : Fixed Indexer issue (replication timeout and locking issue)
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java 2011-03-16 19:15:31 UTC (rev 4103)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/AbstractIndexerCacheStore.java 2011-03-17 10:14:45 UTC (rev 4104)
@@ -28,6 +28,7 @@
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.infinispan.container.entries.InternalCacheEntry;
+import org.infinispan.context.Flag;
import org.infinispan.loaders.AbstractCacheStore;
import org.infinispan.loaders.AbstractCacheStoreConfig;
import org.infinispan.loaders.CacheLoaderConfig;
@@ -116,7 +117,8 @@
if (getModeHandler().getMode() == IndexerIoMode.READ_WRITE)
{
// remove the data from the cache
- cache.remove(key);
+ cache.getAdvancedCache().withFlags(Flag.SKIP_LOCKING);
+ cache.removeAsync(key);
}
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java 2011-03-16 19:15:31 UTC (rev 4103)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java 2011-03-17 10:14:45 UTC (rev 4104)
@@ -35,7 +35,7 @@
import org.exoplatform.services.log.Log;
import org.infinispan.Cache;
import org.infinispan.CacheException;
-import org.infinispan.config.Configuration.CacheMode;
+import org.infinispan.context.Flag;
import org.infinispan.loaders.CacheLoaderManager;
import java.io.IOException;
@@ -129,6 +129,7 @@
ChangesKey changesKey = new ChangesKey(wsId, IdGenerator.generate());
try
{
+ cache.getAdvancedCache().withFlags(Flag.SKIP_LOCKING);
PrivilegedISPNCacheHelper.put(cache, changesKey, new ChangesFilterListsWrapper(changes, parentChanges));
}
catch (CacheException e)
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/LocalIndexChangesFilter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/LocalIndexChangesFilter.java 2011-03-16 19:15:31 UTC (rev 4103)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/LocalIndexChangesFilter.java 2011-03-17 10:14:45 UTC (rev 4104)
@@ -35,6 +35,7 @@
import org.exoplatform.services.log.Log;
import org.infinispan.Cache;
import org.infinispan.CacheException;
+import org.infinispan.context.Flag;
import org.infinispan.loaders.CacheLoaderManager;
import java.io.IOException;
@@ -122,6 +123,7 @@
ChangesKey changesKey = new ChangesKey(wsId, IdGenerator.generate());
try
{
+ cache.getAdvancedCache().withFlags(Flag.SKIP_LOCKING);
PrivilegedISPNCacheHelper.put(cache, changesKey, new ChangesFilterListsWrapper(changes, parentChanges));
}
catch (CacheException e)
15 years, 1 month
exo-jcr SVN: r4103 - jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-03-16 15:15:31 -0400 (Wed, 16 Mar 2011)
New Revision: 4103
Removed:
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRDBMSRepositoryRestore.java
Log:
EXOJCR-1210: remove dublicated test
Deleted: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRDBMSRepositoryRestore.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRDBMSRepositoryRestore.java 2011-03-16 17:14:27 UTC (rev 4102)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRDBMSRepositoryRestore.java 2011-03-16 19:15:31 UTC (rev 4103)
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2003-2011 eXo Platform SAS.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
- */
-package org.exoplatform.services.jcr.ext.backup;
-
-import org.exoplatform.services.database.creator.DBCreator;
-import org.exoplatform.services.jcr.RepositoryService;
-import org.exoplatform.services.jcr.config.RepositoryEntry;
-import org.exoplatform.services.jcr.core.ManageableRepository;
-import org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationService;
-import org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationServiceImpl;
-import org.exoplatform.services.jcr.impl.core.RepositoryImpl;
-import org.exoplatform.services.jcr.impl.core.SessionImpl;
-import org.exoplatform.services.naming.InitialContextInitializer;
-
-import java.io.File;
-
-import javax.jcr.Node;
-
-/**
- * Created by The eXo Platform SAS.
- *
- * <br/>Date:
- *
- * @author <a href="karpenko.sergiy(a)gmail.com">Karpenko Sergiy</a>
- * @version $Id: TestRDBMSRepositoryRestore.java 111 2011-03-16 11:11:11Z serg $
- */
-public class TestRDBMSRepositoryRestore extends BaseRDBMSBackupTest
-{
- public void testCreateRepositoryFromBackup() throws Exception
- {
- // backup
- File backDir = new File("target/backup");
- backDir.mkdirs();
-
- RepositoryImpl repository = getReposityToBackup();
-
- RepositoryBackupConfig config = new RepositoryBackupConfig();
- config.setRepository(repository.getName());
- config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
- config.setBackupDir(backDir);
-
- backup.startBackup(config);
-
- RepositoryBackupChain bch = backup.findRepositoryBackup(repository.getName());
-
- backup.getRepositoryBackupsLogs();
-
- // wait till full backup will be stopped
- while (bch.getState() != RepositoryBackupChain.FINISHED)
- {
- Thread.yield();
- Thread.sleep(50);
- }
-
- // stop fullBackup
- if (bch != null)
- backup.stopBackup(bch);
- else
- fail("Can't get fullBackup chain");
-
- DBCreator dbCreator = (DBCreator)container.getComponentInstanceOfType(DBCreator.class);
- InitialContextInitializer initialContextInitializer =
- (InitialContextInitializer)container.getComponentInstanceOfType(InitialContextInitializer.class);
-
- RepositoryCreationService creatorService =
- new RepositoryCreationServiceImpl(repositoryService, backup, dbCreator, initialContextInitializer);
-
- String tenantName = "new_rdbms_repository";
-
- String repoToken = creatorService.reserveRepositoryName(tenantName);
-
- // restore
- RepositoryEntry baseRE =
- (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
-
- RepositoryEntry rEntry = makeRepositoryEntry(tenantName, baseRE, "new_rdbms_repository_source", null);
-
- creatorService.createRepository(bch.getBackupId(), rEntry, repoToken);
-
- // check
- ManageableRepository restoredRepository = repositoryService.getRepository(tenantName);
- assertNotNull(restoredRepository);
-
- for (String wsName : restoredRepository.getWorkspaceNames())
- {
- SessionImpl back = null;
- try
- {
- back = (SessionImpl)restoredRepository.login(credentials, wsName);
- Node ws1backTestRoot = back.getRootNode().getNode("backupTest");
- assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
- }
- catch (Exception e)
- {
- e.printStackTrace();
- fail(e.getMessage());
- }
- finally
- {
- if (back != null)
- back.logout();
- }
- }
- //check repositoryConfiguration
- RepositoryService repoService = (RepositoryService)this.container.getComponentInstance(RepositoryService.class);
- assertNotNull(repoService.getConfig().getRepositoryConfiguration(tenantName));
- }
-}
15 years, 1 month
exo-jcr SVN: r4102 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms.
by do-not-reply@jboss.org
Author: tolusha
Date: 2011-03-16 13:14:27 -0400 (Wed, 16 Mar 2011)
New Revision: 4102
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
Log:
EXOJCR-1210: DBCleanService - MySQL non-MyISAM engined catalogs will be cleaned with clean helper.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-03-16 16:39:17 UTC (rev 4101)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-03-16 17:14:27 UTC (rev 4102)
@@ -132,16 +132,21 @@
String dialect = DialectDetecter.detect(jdbcConn.getMetaData());
boolean cleanWithHelper = false;
- if (dialect.equals(DBConstants.DB_DIALECT_MYSQL) || dialect.equals(DBConstants.DB_DIALECT_MYSQL_UTF8))
+ if (dialect.equals(DBConstants.DB_DIALECT_HSQLDB))
{
cleanWithHelper = true;
+ }
+ else if (dialect.equals(DBConstants.DB_DIALECT_MYSQL) || dialect.equals(DBConstants.DB_DIALECT_MYSQL_UTF8))
+ {
+ cleanWithHelper = true;
+
Statement st = jdbcConn.createStatement();
st.execute("SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA='" + jdbcConn.getCatalog()
+ "' and (TABLE_NAME='JCR_SITEM' or TABLE_NAME='JCR_MITEM')");
ResultSet result = st.getResultSet();
if (result.next())
{
- String engine = result.getString(1);
+ String engine = result.getString("ENGINE");
if (engine.equalsIgnoreCase("MyISAM"))
{
cleanWithHelper = false;
@@ -155,7 +160,7 @@
cleanScripts.add("delete from JCR_MVALUE");
cleanScripts.add("delete from JCR_MREF");
- if (dialect.equals(DBConstants.DB_DIALECT_HSQLDB) || cleanWithHelper)
+ if (cleanWithHelper)
{
cleanScripts.add("delete from JCR_MITEM where I_CLASS=2");
@@ -176,7 +181,7 @@
.add("delete from JCR_SREF where exists(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SREF.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME='"
+ containerName + "')");
- if (dialect.equals(DBConstants.DB_DIALECT_HSQLDB) || cleanWithHelper)
+ if (cleanWithHelper)
{
cleanScripts.add("delete from JCR_SITEM where I_CLASS=2 and CONTAINER_NAME='" + containerName + "'");
15 years, 1 month
exo-jcr SVN: r4101 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms.
by do-not-reply@jboss.org
Author: sergiykarpenko
Date: 2011-03-16 12:39:17 -0400 (Wed, 16 Mar 2011)
New Revision: 4101
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
Log:
EXOJCR-1210: DBCleanService - MySQL non-MyISAM engined catalogs will be cleaned with clean helper.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-03-16 14:12:31 UTC (rev 4100)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-03-16 16:39:17 UTC (rev 4101)
@@ -27,7 +27,9 @@
import java.security.PrivilegedExceptionAction;
import java.sql.Connection;
+import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
@@ -127,16 +129,33 @@
Boolean.parseBoolean(wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.MULTIDB));
String containerName = wsEntry.getName();
-
String dialect = DialectDetecter.detect(jdbcConn.getMetaData());
+ boolean cleanWithHelper = false;
+ if (dialect.equals(DBConstants.DB_DIALECT_MYSQL) || dialect.equals(DBConstants.DB_DIALECT_MYSQL_UTF8))
+ {
+ cleanWithHelper = true;
+ Statement st = jdbcConn.createStatement();
+ st.execute("SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA='" + jdbcConn.getCatalog()
+ + "' and (TABLE_NAME='JCR_SITEM' or TABLE_NAME='JCR_MITEM')");
+ ResultSet result = st.getResultSet();
+ if (result.next())
+ {
+ String engine = result.getString(1);
+ if (engine.equalsIgnoreCase("MyISAM"))
+ {
+ cleanWithHelper = false;
+ }
+ }
+ }
+
List<String> cleanScripts = new ArrayList<String>();
if (multiDb)
{
cleanScripts.add("delete from JCR_MVALUE");
cleanScripts.add("delete from JCR_MREF");
- if (dialect.equals(DBConstants.DB_DIALECT_HSQLDB))
+ if (dialect.equals(DBConstants.DB_DIALECT_HSQLDB) || cleanWithHelper)
{
cleanScripts.add("delete from JCR_MITEM where I_CLASS=2");
@@ -157,7 +176,7 @@
.add("delete from JCR_SREF where exists(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SREF.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME='"
+ containerName + "')");
- if (dialect.equals(DBConstants.DB_DIALECT_HSQLDB))
+ if (dialect.equals(DBConstants.DB_DIALECT_HSQLDB) || cleanWithHelper)
{
cleanScripts.add("delete from JCR_SITEM where I_CLASS=2 and CONTAINER_NAME='" + containerName + "'");
15 years, 1 month
exo-jcr SVN: r4100 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.
by do-not-reply@jboss.org
Author: nzamosenchuk
Date: 2011-03-16 10:12:31 -0400 (Wed, 16 Mar 2011)
New Revision: 4100
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
Log:
EXOJCR-834 : Take lastIndexReader in a more safe way. Skip exception for lastIndexReader retrieval to do the best to index data, skipping any kind of errors related to unnecessary lastIndexReader.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2011-03-16 13:23:52 UTC (rev 4099)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2011-03-16 14:12:31 UTC (rev 4100)
@@ -20,6 +20,7 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermDocs;
+import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
import org.exoplatform.commons.utils.PrivilegedFileHelper;
import org.exoplatform.commons.utils.SecurityHelper;
@@ -587,9 +588,17 @@
// try to avoid getting index reader for each doc
int lastIndexReaderId = indexes.size() - 1;
// check, index list can be empty
- lastIndexReader =
- (lastIndexReaderId >= 0) ? ((PersistentIndex)indexes.get(lastIndexReaderId)).getReadOnlyIndexReader()
- : null;
+ try
+ {
+ lastIndexReader =
+ (lastIndexReaderId >= 0) ? ((PersistentIndex)indexes.get(lastIndexReaderId))
+ .getReadOnlyIndexReader() : null;
+ }
+ catch (Throwable e)
+ {
+ // this is safe index reader retrieval. The last index already closed, possibly merged or any other exception that occurs here
+ }
+
for (Iterator it = add.iterator(); it.hasNext();)
{
Document doc = (Document)it.next();
@@ -616,7 +625,17 @@
lastIndexReader.release();
}
lastIndexReaderId = indexes.size() - 1;
- lastIndexReader = ((PersistentIndex)indexes.get(lastIndexReaderId)).getReadOnlyIndexReader();
+ try
+ {
+ lastIndexReader =
+ ((PersistentIndex)indexes.get(lastIndexReaderId)).getReadOnlyIndexReader();
+ }
+ catch (Throwable e)
+ {
+ // this is safe index reader retrieval. The last index already closed, possibly merged or any other exception that occurs here
+ lastIndexReader = null;
+ lastIndexReaderId = -1;
+ }
}
// if indexReader exists (it is possible that no persisted indexes exists on start)
if (lastIndexReader != null)
15 years, 1 month
exo-jcr SVN: r4099 - in jcr/trunk: exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup and 1 other directory.
by do-not-reply@jboss.org
Author: sergiykarpenko
Date: 2011-03-16 09:23:52 -0400 (Wed, 16 Mar 2011)
New Revision: 4099
Added:
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRDBMSRepositoryRestore.java
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java
Log:
EXOJCR-1210: RDBMS restore at MySQL InnoDB fixed
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java 2011-03-16 12:25:05 UTC (rev 4098)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java 2011-03-16 13:23:52 UTC (rev 4099)
@@ -166,8 +166,7 @@
String constraint = null;
if (tableName.equals("JCR_SITEM") || tableName.equals("JCR_MITEM"))
{
- if (dialect != DBBackup.DB_DIALECT_MYSQL && dialect != DBBackup.DB_DIALECT_MYSQL_UTF8
- && dialect != DBBackup.DB_DIALECT_SYBASE)
+ if (dialect != DBBackup.DB_DIALECT_SYBASE)
{
// resolve constraint name depends on database
String constraintName;
@@ -184,7 +183,15 @@
// drop constraint
st = jdbcConn.createStatement();
- st.execute("ALTER TABLE " + tableName + " DROP CONSTRAINT " + constraintName);
+
+ if (dialect == DBBackup.DB_DIALECT_MYSQL || dialect == DBBackup.DB_DIALECT_MYSQL_UTF8)
+ {
+ st.execute("ALTER TABLE " + tableName + " DROP FOREIGN KEY " + constraintName);
+ }
+ else
+ {
+ st.execute("ALTER TABLE " + tableName + " DROP CONSTRAINT " + constraintName);
+ }
}
}
Added: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRDBMSRepositoryRestore.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRDBMSRepositoryRestore.java (rev 0)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRDBMSRepositoryRestore.java 2011-03-16 13:23:52 UTC (rev 4099)
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2003-2011 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.exoplatform.services.jcr.ext.backup;
+
+import org.exoplatform.services.database.creator.DBCreator;
+import org.exoplatform.services.jcr.RepositoryService;
+import org.exoplatform.services.jcr.config.RepositoryEntry;
+import org.exoplatform.services.jcr.core.ManageableRepository;
+import org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationService;
+import org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationServiceImpl;
+import org.exoplatform.services.jcr.impl.core.RepositoryImpl;
+import org.exoplatform.services.jcr.impl.core.SessionImpl;
+import org.exoplatform.services.naming.InitialContextInitializer;
+
+import java.io.File;
+
+import javax.jcr.Node;
+
+/**
+ * Created by The eXo Platform SAS.
+ *
+ * <br/>Date:
+ *
+ * @author <a href="karpenko.sergiy(a)gmail.com">Karpenko Sergiy</a>
+ * @version $Id: TestRDBMSRepositoryRestore.java 111 2011-03-16 11:11:11Z serg $
+ */
+public class TestRDBMSRepositoryRestore extends BaseRDBMSBackupTest
+{
+ public void testCreateRepositoryFromBackup() throws Exception
+ {
+ // backup
+ File backDir = new File("target/backup");
+ backDir.mkdirs();
+
+ RepositoryImpl repository = getReposityToBackup();
+
+ RepositoryBackupConfig config = new RepositoryBackupConfig();
+ config.setRepository(repository.getName());
+ config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
+ config.setBackupDir(backDir);
+
+ backup.startBackup(config);
+
+ RepositoryBackupChain bch = backup.findRepositoryBackup(repository.getName());
+
+ backup.getRepositoryBackupsLogs();
+
+ // wait till full backup will be stopped
+ while (bch.getState() != RepositoryBackupChain.FINISHED)
+ {
+ Thread.yield();
+ Thread.sleep(50);
+ }
+
+ // stop fullBackup
+ if (bch != null)
+ backup.stopBackup(bch);
+ else
+ fail("Can't get fullBackup chain");
+
+ DBCreator dbCreator = (DBCreator)container.getComponentInstanceOfType(DBCreator.class);
+ InitialContextInitializer initialContextInitializer =
+ (InitialContextInitializer)container.getComponentInstanceOfType(InitialContextInitializer.class);
+
+ RepositoryCreationService creatorService =
+ new RepositoryCreationServiceImpl(repositoryService, backup, dbCreator, initialContextInitializer);
+
+ String tenantName = "new_rdbms_repository";
+
+ String repoToken = creatorService.reserveRepositoryName(tenantName);
+
+ // restore
+ RepositoryEntry baseRE =
+ (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+
+ RepositoryEntry rEntry = makeRepositoryEntry(tenantName, baseRE, "new_rdbms_repository_source", null);
+
+ creatorService.createRepository(bch.getBackupId(), rEntry, repoToken);
+
+ // check
+ ManageableRepository restoredRepository = repositoryService.getRepository(tenantName);
+ assertNotNull(restoredRepository);
+
+ for (String wsName : restoredRepository.getWorkspaceNames())
+ {
+ SessionImpl back = null;
+ try
+ {
+ back = (SessionImpl)restoredRepository.login(credentials, wsName);
+ Node ws1backTestRoot = back.getRootNode().getNode("backupTest");
+ assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
+ .getProperty("exo:data").getString());
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ finally
+ {
+ if (back != null)
+ back.logout();
+ }
+ }
+ //check repositoryConfiguration
+ RepositoryService repoService = (RepositoryService)this.container.getComponentInstance(RepositoryService.class);
+ assertNotNull(repoService.getConfig().getRepositoryConfiguration(tenantName));
+ }
+}
15 years, 1 month
exo-jcr SVN: r4098 - core/trunk/packaging/module/src/main/javascript.
by do-not-reply@jboss.org
Author: nfilotto
Date: 2011-03-16 08:25:05 -0400 (Wed, 16 Mar 2011)
New Revision: 4098
Modified:
core/trunk/packaging/module/src/main/javascript/core.packaging.module.js
Log:
EXOJCR-1253: PDFBox dependencies not complete in Core packaging
Modified: core/trunk/packaging/module/src/main/javascript/core.packaging.module.js
===================================================================
--- core/trunk/packaging/module/src/main/javascript/core.packaging.module.js 2011-03-16 11:11:38 UTC (rev 4097)
+++ core/trunk/packaging/module/src/main/javascript/core.packaging.module.js 2011-03-16 12:25:05 UTC (rev 4098)
@@ -30,7 +30,9 @@
module.component.documents =
new Project("org.exoplatform.core", "exo.core.component.document", "jar", module.version).
- addDependency(new Project("org.apache.pdfbox", "pdfbox", "jar", "1.4.0")).
+ addDependency(new Project("org.apache.pdfbox", "pdfbox", "jar", "1.4.0")).
+ addDependency(new Project("org.apache.pdfbox", "fontbox", "jar", "1.4.0")).
+ addDependency(new Project("org.apache.pdfbox", "jempbox", "jar", "1.4.0")).
addDependency(new Project("bouncycastle", "bcmail-jdk14", "jar", "136")).
addDependency(new Project("bouncycastle", "bcprov-jdk14", "jar", "136")).
addDependency(new Project("html-parser", "html-parser", "jar", "1.6")).
15 years, 1 month